January 2020 - tor-commits - lists.torproject.org

[tor/master] chan: Remove dead var cell handler from channel_t
by nickm＠torproject.org 14 Jan '20

14 Jan '20

commit 59dac38ebe4e6489c2a06d07470023ed5fbdd0aa Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jan 7 15:03:24 2020 -0500 chan: Remove dead var cell handler from channel_t The variable lenght cells are handled directly by channel_tls_handle_var_cell() from an OR connection reading its inbuf. The channel var cell handler (agnostic) was never used. Closes #32892 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket32892 | 3 +++ src/core/or/channel.c | 25 +------------------------ src/core/or/channel.h | 9 +-------- src/core/or/command.c | 20 +------------------- src/core/or/command.h | 1 - src/test/test_channel.c | 27 ++------------------------- 6 files changed, 8 insertions(+), 77 deletions(-) diff --git a/changes/ticket32892 b/changes/ticket32892 new file mode 100644 index 000000000..f6360d288 --- /dev/null +++ b/changes/ticket32892 @@ -0,0 +1,3 @@ + o Code simplification and refactoring (channel): + - Channel layer had a variable length cell handler that was not used and + thus removed. Closes ticket 32892. diff --git a/src/core/or/channel.c b/src/core/or/channel.c index 2faf63875..eaf2ce311 100644 --- a/src/core/or/channel.c +++ b/src/core/or/channel.c @@ -1067,23 +1067,6 @@ channel_get_cell_handler(channel_t *chan) } /** - * Return the variable-length cell handler for a channel. - * - * This function gets the handler for incoming variable-length cells - * installed on a channel. - */ -channel_var_cell_handler_fn_ptr -channel_get_var_cell_handler(channel_t *chan) -{ - tor_assert(chan); - - if (CHANNEL_CAN_HANDLE_CELLS(chan)) - return chan->var_cell_handler; - - return NULL; -} - -/** * Set both cell handlers for a channel. * * This function sets both the fixed-length and variable length cell handlers @@ -1091,9 +1074,7 @@ channel_get_var_cell_handler(channel_t *chan) */ void channel_set_cell_handlers(channel_t *chan, - channel_cell_handler_fn_ptr cell_handler, - channel_var_cell_handler_fn_ptr - var_cell_handler) + channel_cell_handler_fn_ptr cell_handler) { tor_assert(chan); tor_assert(CHANNEL_CAN_HANDLE_CELLS(chan)); @@ -1101,13 +1082,9 @@ channel_set_cell_handlers(channel_t *chan, log_debug(LD_CHANNEL, "Setting cell_handler callback for channel %p to %p", chan, cell_handler); - log_debug(LD_CHANNEL, - "Setting var_cell_handler callback for channel %p to %p", - chan, var_cell_handler); /* Change them */ chan->cell_handler = cell_handler; - chan->var_cell_handler = var_cell_handler; } /* diff --git a/src/core/or/channel.h b/src/core/or/channel.h index 0f6fa228d..6360cf3f4 100644 --- a/src/core/or/channel.h +++ b/src/core/or/channel.h @@ -22,7 +22,6 @@ struct tor_timer_t; /* Channel handler function pointer typedefs */ typedef void (*channel_listener_fn_ptr)(channel_listener_t *, channel_t *); typedef void (*channel_cell_handler_fn_ptr)(channel_t *, cell_t *); -typedef void (*channel_var_cell_handler_fn_ptr)(channel_t *, var_cell_t *); /** * This enum is used by channelpadding to decide when to pad channels. @@ -320,7 +319,6 @@ struct channel_t { /** Registered handlers for incoming cells */ channel_cell_handler_fn_ptr cell_handler; - channel_var_cell_handler_fn_ptr var_cell_handler; /* Methods implemented by the lower layer */ @@ -542,13 +540,8 @@ void channel_listener_set_listener_fn(channel_listener_t *chan, /* Incoming cell callbacks */ channel_cell_handler_fn_ptr channel_get_cell_handler(channel_t *chan); -channel_var_cell_handler_fn_ptr -channel_get_var_cell_handler(channel_t *chan); - void channel_set_cell_handlers(channel_t *chan, - channel_cell_handler_fn_ptr cell_handler, - channel_var_cell_handler_fn_ptr - var_cell_handler); + channel_cell_handler_fn_ptr cell_handler); /* Clean up closed channels and channel listeners periodically; these are * called from run_scheduled_events() in main.c. diff --git a/src/core/or/command.c b/src/core/or/command.c index 1c9743776..2f3459f1e 100644 --- a/src/core/or/command.c +++ b/src/core/or/command.c @@ -217,23 +217,6 @@ command_process_cell(channel_t *chan, cell_t *cell) } } -/** Process an incoming var_cell from a channel; in the current protocol all - * the var_cells are handshake-related and handled below the channel layer, - * so this just logs a warning and drops the cell. - */ - -void -command_process_var_cell(channel_t *chan, var_cell_t *var_cell) -{ - tor_assert(chan); - tor_assert(var_cell); - - log_info(LD_PROTOCOL, - "Received unexpected var_cell above the channel layer of type %d" - "; dropping it.", - var_cell->command); -} - /** Process a 'create' <b>cell</b> that just arrived from <b>chan</b>. Make a * new circuit with the p_circ_id specified in cell. Put the circuit in state * onionskin_pending, and pass the onionskin to the cpuworker. Circ will get @@ -685,8 +668,7 @@ command_setup_channel(channel_t *chan) tor_assert(chan); channel_set_cell_handlers(chan, - command_process_cell, - command_process_var_cell); + command_process_cell); } /** Given a listener, install the right handler to process incoming diff --git a/src/core/or/command.h b/src/core/or/command.h index 8c90e1de6..c0af6f26d 100644 --- a/src/core/or/command.h +++ b/src/core/or/command.h @@ -15,7 +15,6 @@ #include "core/or/channel.h" void command_process_cell(channel_t *chan, cell_t *cell); -void command_process_var_cell(channel_t *chan, var_cell_t *cell); void command_setup_channel(channel_t *chan); void command_setup_listener(channel_listener_t *chan_l); diff --git a/src/test/test_channel.c b/src/test/test_channel.c index 035303279..c66170c46 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -34,8 +34,6 @@ static int test_chan_accept_cells = 0; static int test_chan_fixed_cells_recved = 0; static cell_t * test_chan_last_seen_fixed_cell_ptr = NULL; -static int test_chan_var_cells_recved = 0; -static var_cell_t * test_chan_last_seen_var_cell_ptr = NULL; static int test_cells_written = 0; static int test_doesnt_want_writes_count = 0; static int test_dumpstats_calls = 0; @@ -113,24 +111,6 @@ chan_test_dumpstats(channel_t *ch, int severity) return; } -/* - * Handle an incoming variable-size cell for unit tests - */ - -static void -chan_test_var_cell_handler(channel_t *ch, - var_cell_t *var_cell) -{ - tt_assert(ch); - tt_assert(var_cell); - - test_chan_last_seen_var_cell_ptr = var_cell; - ++test_chan_var_cells_recved; - - done: - return; -} - static void chan_test_close(channel_t *ch) { @@ -492,11 +472,8 @@ test_channel_dumpstats(void *arg) /* Receive path */ channel_set_cell_handlers(ch, - chan_test_cell_handler, - chan_test_var_cell_handler); + chan_test_cell_handler); tt_ptr_op(channel_get_cell_handler(ch), OP_EQ, chan_test_cell_handler); - tt_ptr_op(channel_get_var_cell_handler(ch), OP_EQ, - chan_test_var_cell_handler); cell = tor_malloc_zero(sizeof(*cell)); old_count = test_chan_fixed_cells_recved; channel_process_cell(ch, cell); @@ -722,7 +699,7 @@ test_channel_inbound_cell(void *arg) /* Setup incoming cell handlers. We don't care about var cell, the channel * layers is not handling those. */ - channel_set_cell_handlers(chan, chan_test_cell_handler, NULL); + channel_set_cell_handlers(chan, chan_test_cell_handler); tt_ptr_op(chan->cell_handler, OP_EQ, chan_test_cell_handler); /* Now process the cell, we should see it. */ old_count = test_chan_fixed_cells_recved;

1 0

[tor/master] Merge branch 'ticket32892_043_01_squashed'
by nickm＠torproject.org 14 Jan '20

14 Jan '20

commit 08bbb6b8d921233e8d4780b4bc544022b91f1087 Merge: c948db425 59dac38eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 14 13:31:20 2020 -0500 Merge branch 'ticket32892_043_01_squashed' changes/ticket32892 | 3 +++ src/core/or/channel.c | 25 +------------------------ src/core/or/channel.h | 9 +-------- src/core/or/command.c | 20 +------------------- src/core/or/command.h | 1 - src/test/test_channel.c | 27 ++------------------------- 6 files changed, 8 insertions(+), 77 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1636'
by nickm＠torproject.org 14 Jan '20

14 Jan '20

commit c948db425280f6d132fe0415617e73c63607d904 Merge: c2dc94d8e 4f6901d7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 14 12:46:14 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1636' changes/bug32884 | 5 +++++ src/lib/thread/compat_pthreads.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] When initializing pthreads, always set the main thread.
by nickm＠torproject.org 14 Jan '20

14 Jan '20

commit 4f6901d7cc827e5bfa98467b7a568f725ce7fa9f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 09:37:12 2020 -0500 When initializing pthreads, always set the main thread. Fixes bug 32884. This is a bugfix on 0.3.3.1-alpha, when we started allowing restart-in-process with tor_api.h. --- changes/bug32884 | 5 +++++ src/lib/thread/compat_pthreads.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug32884 b/changes/bug32884 new file mode 100644 index 000000000..9ab1d2446 --- /dev/null +++ b/changes/bug32884 @@ -0,0 +1,5 @@ + o Minor bugfixes (embedded Tor): + - When starting Tor any time after the first time in a process, register + the thread in which it is running as the main thread. Previously, we + only did this on Windows, which could lead to bugs like 23081 on + non-Windows platforms. Fixes bug 32884; bugfix on 0.3.3.1-alpha. diff --git a/src/lib/thread/compat_pthreads.c b/src/lib/thread/compat_pthreads.c index 05efe9cfd..6f7ecd17d 100644 --- a/src/lib/thread/compat_pthreads.c +++ b/src/lib/thread/compat_pthreads.c @@ -265,6 +265,6 @@ tor_threads_init(void) pthread_attr_setdetachstate(&attr_detached, PTHREAD_CREATE_DETACHED); tor_assert(ret2 == 0); threads_initialized = 1; - set_main_thread(); } + set_main_thread(); }

1 0

[tor/master] Restore feature where nt-services detect non-"run_tor" modes.
by nickm＠torproject.org 14 Jan '20

14 Jan '20

commit 5c240db0bf7751d74ba438a1ca4ef0d051a53df7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 09:14:22 2020 -0500 Restore feature where nt-services detect non-"run_tor" modes. Followup for #32883. --- src/app/main/main.c | 7 +++++ src/app/main/ntmain.c | 52 +++++++++++++------------------------- src/feature/api/tor_api_internal.h | 5 ++++ 3 files changed, 29 insertions(+), 35 deletions(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index 4275a98bd..2a5cb4aa0 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1279,6 +1279,13 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) #endif } + if (tor_cfg->run_tor_only && get_options()->command != CMD_RUN_TOR) { + log_err(LD_CONFIG, "Unsupported command when running as an NT service."); + result = -1; + tor_cleanup(); + goto done; + } + switch (get_options()->command) { case CMD_RUN_TOR: #ifdef NT_SERVICE diff --git a/src/app/main/ntmain.c b/src/app/main/ntmain.c index a49dfdbbc..3d923edf5 100644 --- a/src/app/main/ntmain.c +++ b/src/app/main/ntmain.c @@ -29,6 +29,8 @@ #include "lib/evloop/compat_libevent.h" #include "lib/fs/winlib.h" #include "lib/log/win32err.h" +#include "feature/api/tor_api.h" +#include "feature/api/tor_api_internal.h" #include <windows.h> #define GENSRV_SERVICENAME "tor" @@ -263,7 +265,6 @@ nt_service_control(DWORD request) static void nt_service_body(int argc, char **argv) { - int r; (void) argc; /* unused */ (void) argv; /* unused */ nt_service_loadlibrary(); @@ -283,24 +284,20 @@ nt_service_body(int argc, char **argv) return; } - r = tor_init(backup_argc, backup_argv); - if (r) { - /* Failed to start the Tor service */ - r = NT_SERVICE_ERROR_TORINIT_FAILED; - service_status.dwCurrentState = SERVICE_STOPPED; - service_status.dwWin32ExitCode = r; - service_status.dwServiceSpecificExitCode = r; - service_fns.SetServiceStatus_fn(hStatus, &service_status); + tor_main_configuration_t *cfg = tor_main_configuration_new(); + cfg->run_tor_only = 1; + if (tor_main_configuration_set_command_line(cfg, backup_argc, + backup_argv) < 0) return; - } /* Set the service's status to SERVICE_RUNNING and start the main * event loop */ service_status.dwCurrentState = SERVICE_RUNNING; service_fns.SetServiceStatus_fn(hStatus, &service_status); - set_main_thread(); - run_tor_main_loop(); - tor_cleanup(); + + tor_run_main(cfg); + + tor_main_configuration_free(cfg); } /** Main service entry point. Starts the service control dispatcher and waits @@ -323,29 +320,14 @@ nt_service_main(void) printf("Service error %d : %s\n", (int) result, errmsg); tor_free(errmsg); if (result == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) { - if (tor_init(backup_argc, backup_argv)) + tor_main_configuration_t *cfg = tor_main_configuration_new(); + cfg->run_tor_only = 1; + if (tor_main_configuration_set_command_line(cfg, backup_argc, + backup_argv) < 0) return; - switch (get_options()->command) { - case CMD_RUN_TOR: - run_tor_main_loop(); - break; - case CMD_LIST_FINGERPRINT: - case CMD_HASH_PASSWORD: - case CMD_VERIFY_CONFIG: - case CMD_DUMP_CONFIG: - case CMD_KEYGEN: - case CMD_KEY_EXPIRATION: - log_err(LD_CONFIG, "Unsupported command (--list-fingerprint, " - "--hash-password, --keygen, --dump-config, --verify-config, " - "or --key-expiration) in NT service."); - break; - case CMD_RUN_UNITTESTS: - case CMD_IMMEDIATE: - default: - log_err(LD_CONFIG, "Illegal command number %d: internal error.", - get_options()->command); - } - tor_cleanup(); + + tor_run_main(cfg); + tor_main_configuration_free(cfg); } } } diff --git a/src/feature/api/tor_api_internal.h b/src/feature/api/tor_api_internal.h index 115d33d58..40c64e1ab 100644 --- a/src/feature/api/tor_api_internal.h +++ b/src/feature/api/tor_api_internal.h @@ -29,6 +29,11 @@ struct tor_main_configuration_t { /** Socket that Tor will use as an owning control socket. Owned. */ tor_socket_t owning_controller_socket; + + /** Disable commands other than "run tor". Not for use from outside Tor + * itself; if you need to use this for embedding, please contact the tor + * developers. */ + int run_tor_only; }; #endif /* !defined(TOR_API_INTERNAL_H) */

1 0

[tor/master] Use tor_api.h entry points in ntmain.c.
by nickm＠torproject.org 14 Jan '20

14 Jan '20

commit dca2629480f143ed8deb71b73b15c7c5ff890571 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 09:02:49 2020 -0500 Use tor_api.h entry points in ntmain.c. When we updated main.c to use the same entry points as tor_api.h, we didn't update ntmain.c. This led to bugs as the two got out of sync. There are two calls that we drop in this patch: first, I drop the call to set_main_thread(), since that's redundant with the init function in compat_winthreads.c (but see #32884). Second, I drop the check for CMD_RUN_TOR: I'll add that back with a subsequent commit. Closes ticket 32883. --- changes/bug32883 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug32883 b/changes/bug32883 new file mode 100644 index 000000000..6a15e0221 --- /dev/null +++ b/changes/bug32883 @@ -0,0 +1,5 @@ + o Code simplification and refactoring (windows services): + - The windows service logic now uses the tor_api.h entry points, to + avoid needless code duplication, and to prevent bugs related to + the different entry points getting out of sync. Closes ticket + 32883.

1 0

[tor/master] Make ntmain.h functions stubs when NT_SERVICE not enabled.
by nickm＠torproject.org 14 Jan '20

14 Jan '20

commit b6f099672b90cb606d89bfcb0cae01ea49e46b9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 09:19:09 2020 -0500 Make ntmain.h functions stubs when NT_SERVICE not enabled. This lets us simplify main.c a little, and avoid a practracker exception. Followup from #32883. --- src/app/main/main.c | 15 ++++----------- src/app/main/ntmain.h | 3 ++- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index 2a5cb4aa0..9c60d3c0f 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1238,15 +1238,10 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) memcpy(argv + tor_cfg->argc, tor_cfg->argv_owned, tor_cfg->argc_owned*sizeof(char*)); -#ifdef NT_SERVICE - { - int done = 0; - result = nt_service_parse_options(argc, argv, &done); - if (done) { - goto done; - } - } -#endif /* defined(NT_SERVICE) */ + int done = 0; + result = nt_service_parse_options(argc, argv, &done); + if (done) + goto done; pubsub_install(); @@ -1288,9 +1283,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) switch (get_options()->command) { case CMD_RUN_TOR: -#ifdef NT_SERVICE nt_service_set_state(SERVICE_RUNNING); -#endif result = run_tor_main_loop(); break; case CMD_KEYGEN: diff --git a/src/app/main/ntmain.h b/src/app/main/ntmain.h index c39386c05..e23641bff 100644 --- a/src/app/main/ntmain.h +++ b/src/app/main/ntmain.h @@ -22,7 +22,8 @@ int nt_service_is_stopping(void); void nt_service_set_state(DWORD state); #else #define nt_service_is_stopping() 0 +#define nt_service_parse_options(a, b, c) (0) +#define nt_service_set_state(s) STMT_NIL #endif /* defined(NT_SERVICE) */ #endif /* !defined(TOR_NTMAIN_H) */ -

1 0

[tor/master] Merge branch 'ticket32883'
by nickm＠torproject.org 14 Jan '20

14 Jan '20

commit c2dc94d8ebcd5fdd1076abb41ff0ecee6c092f4f Merge: dec11793b b6f099672 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 14 12:42:41 2020 -0500 Merge branch 'ticket32883' changes/bug32883 | 5 ++++ src/app/main/main.c | 22 ++++++++-------- src/app/main/ntmain.c | 52 +++++++++++++------------------------- src/app/main/ntmain.h | 3 ++- src/feature/api/tor_api_internal.h | 5 ++++ 5 files changed, 40 insertions(+), 47 deletions(-)

1 0

[tor/master] Rename UTIL_TEST_NO_WIN to reflect intent
by nickm＠torproject.org 14 Jan '20

14 Jan '20

commit ac7d6f3c05c47e1ca2e4d65d9b849ee2907b0f55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 20 10:04:56 2019 -0500 Rename UTIL_TEST_NO_WIN to reflect intent Now that these tests are skipped on windows _and_ android, we should name the macro that skips them after the functionality that the tests depend on. Closes last part of 32825. --- src/test/test_util.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index cd745c442..b9450b29f 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -72,6 +72,11 @@ #include <ctype.h> #include <float.h> +/* These platforms don't have meaningful pwdb or homedirs. */ +#if defined(_WIN32) || defined(__ANDROID__) +#define DISABLE_PWDB_TESTS +#endif + #define INFINITY_DBL ((double)INFINITY) #define NAN_DBL ((double)NAN) @@ -1845,7 +1850,7 @@ test_util_config_line_crlf(void *arg) tor_free(k); tor_free(v); } -#ifndef _WIN32 +#ifndef DISABLE_PWDB_TESTS static void test_util_expand_filename(void *arg) { @@ -5653,7 +5658,7 @@ test_util_touch_file(void *arg) ; } -#if !(defined(_WIN32) || defined (__ANDROID__)) +#ifndef DISABLE_PWDB_TESTS static void test_util_pwdb(void *arg) { @@ -6293,15 +6298,16 @@ test_util_map_anon_nofork(void *arg) #endif /* !defined(COCCI) */ #ifdef _WIN32 -#define UTIL_TEST_NO_WIN(n, f) { #n, NULL, TT_SKIP, NULL, NULL } #define UTIL_TEST_WIN_ONLY(n, f) UTIL_TEST(n, (f)) -#elif defined(__ANDROID__) -#define UTIL_TEST_NO_WIN(n, f) { #n, NULL, TT_SKIP, NULL, NULL } -#define UTIL_TEST_WIN_ONLY(n, f) { #n, NULL, TT_SKIP, NULL, NULL } #else -#define UTIL_TEST_NO_WIN(n, f) UTIL_TEST(n, (f)) #define UTIL_TEST_WIN_ONLY(n, f) { #n, NULL, TT_SKIP, NULL, NULL } -#endif /* defined(_WIN32) */ +#endif + +#ifdef DISABLE_PWDB_TESTS +#define UTIL_TEST_PWDB(n, f) { #n, NULL, TT_SKIP, NULL, NULL } +#else +#define UTIL_TEST_PWDB(n, f) UTIL_TEST(n, (f)) +#endif struct testcase_t util_tests[] = { UTIL_LEGACY(time), @@ -6311,7 +6317,7 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(config_line_comment_character), UTIL_LEGACY(config_line_escaped_content), UTIL_LEGACY(config_line_crlf), - UTIL_TEST_NO_WIN(expand_filename, 0), + UTIL_TEST_PWDB(expand_filename, 0), UTIL_LEGACY(escape_string_socks), UTIL_LEGACY(string_is_key_value), UTIL_LEGACY(strmisc), @@ -6396,7 +6402,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(writepid, 0), UTIL_TEST(get_avail_disk_space, 0), UTIL_TEST(touch_file, 0), - UTIL_TEST_NO_WIN(pwdb, TT_FORK), + UTIL_TEST_PWDB(pwdb, TT_FORK), UTIL_TEST(calloc_check, 0), UTIL_TEST(monotonic_time, 0), UTIL_TEST(monotonic_time_ratchet, TT_FORK),

1 0

[tor/master] Merge branch 'ticket32825_squashed'
by nickm＠torproject.org 14 Jan '20

14 Jan '20

commit dec11793ba2fdaeb975e1566b68846431fb85110 Merge: 75741c6b3 8ab9f9399 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 14 12:42:19 2020 -0500 Merge branch 'ticket32825_squashed' changes/bug32825 | 4 ++++ src/test/test_util.c | 27 +++++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-)

1 0