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

[tor/master] expose routerstatus_has_changed to unit tests.
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 60a0d7d1e89df47a12c806585ef41e0b98c5d675 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 16 12:14:12 2020 -0500 expose routerstatus_has_changed to unit tests. --- src/feature/nodelist/networkstatus.c | 3 +-- src/feature/nodelist/networkstatus.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index df035ef1b..208efcef6 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1611,8 +1611,7 @@ networkstatus_consensus_has_ipv6(const or_options_t* options) * and the printing function routerstatus_format_entry in * NS_CONTROL_PORT mode. **/ - -static int +STATIC int routerstatus_has_changed(const routerstatus_t *a, const routerstatus_t *b) { tor_assert(tor_memeq(a->identity_digest, b->identity_digest, DIGEST_LEN)); diff --git a/src/feature/nodelist/networkstatus.h b/src/feature/nodelist/networkstatus.h index b8430088c..7b63e30e9 100644 --- a/src/feature/nodelist/networkstatus.h +++ b/src/feature/nodelist/networkstatus.h @@ -164,6 +164,8 @@ STATIC void warn_early_consensus(const networkstatus_t *c, const char *flavor, extern networkstatus_t *current_ns_consensus; extern networkstatus_t *current_md_consensus; #endif /* defined(TOR_UNIT_TESTS) */ +STATIC int routerstatus_has_changed(const routerstatus_t *a, + const routerstatus_t *b); #endif /* defined(NETWORKSTATUS_PRIVATE) */ #endif /* !defined(TOR_NETWORKSTATUS_H) */

1 0

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

20 Jan '20

commit eef021e12d5ad2fbc86d7bf058eacc40ae6f1757 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 17 08:39:56 2020 -0500 Revert "Use tor_api.h entry points in ntmain.c." This reverts commit dca2629480f143ed8deb71b73b15c7c5ff890571. --- changes/bug32883 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/changes/bug32883 b/changes/bug32883 deleted file mode 100644 index 6a15e0221..000000000 --- a/changes/bug32883 +++ /dev/null @@ -1,5 +0,0 @@ - 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] add_c_file: Improve script documentation
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 2c75d4a8d0bea2e9c0ebd5ef07b6f9149ce135cb Author: teor <teor(a)torproject.org> Date: Mon Jan 20 13:20:14 2020 +1000 add_c_file: Improve script documentation Part of 32962. --- scripts/maint/add_c_file.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/maint/add_c_file.py b/scripts/maint/add_c_file.py index a7478cbec..75e1f556b 100755 --- a/scripts/maint/add_c_file.py +++ b/scripts/maint/add_c_file.py @@ -4,16 +4,20 @@ Add a C file with matching header to the Tor codebase. Creates both files from templates, and adds them to the right include.am file. - This script takes paths relative to the top-level tor directory. - It creates files, and inserts them into include.am, also relative to - the top-level tor directory. + This script takes paths relative to the top-level tor directory. It + expects to be run from that directory. + + This script creates files, and inserts them into include.am, also + relative to the top-level tor directory. But the template content in those files is relative to tor's src directory. (This script strips "src" from the paths used to create templated comments and macros.) This script expects posix paths, so it should be run with a python - where os.path is posixpath. (Rather than ntpath.) + where os.path is posixpath. (Rather than ntpath.) This probably means + Linux, macOS, or BSD, although it might work on Windows if your python + was compiled with mingw, MSYS, or cygwin. Example usage:

1 0

[tor/master] Initialize publish/subscribe code when running as an NT service.
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit c8b6392b4e2edbaa188ea71594cb2f985149bd88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 08:45:29 2020 -0500 Initialize publish/subscribe code when running as an NT service. Fixes bug 32778; bugfix on 0.4.1.1-alpha. --- changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++-- src/app/main/main.h | 3 +++ src/app/main/ntmain.c | 7 +++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/changes/bug32778 b/changes/bug32778 new file mode 100644 index 000000000..ccb610469 --- /dev/null +++ b/changes/bug32778 @@ -0,0 +1,3 @@ + o Minor bugfixes (windows service): + - Initialize publish/subscribe system when running as a windows service. + Fixes bug 32778; bugfix on 0.4.1.1-alpha. diff --git a/src/app/main/main.c b/src/app/main/main.c index dad977726..689bc526a 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1191,7 +1191,7 @@ run_tor_main_loop(void) } /** Install the publish/subscribe relationships for all the subsystems. */ -static void +void pubsub_install(void) { pubsub_builder_t *builder = pubsub_builder_new(); @@ -1203,7 +1203,7 @@ pubsub_install(void) /** Connect the mainloop to its publish/subscribe message delivery events if * appropriate, and configure the global channels appropriately. */ -static void +void pubsub_connect(void) { if (get_options()->command == CMD_RUN_TOR) { diff --git a/src/app/main/main.h b/src/app/main/main.h index 209d419f0..e6ed978c6 100644 --- a/src/app/main/main.h +++ b/src/app/main/main.h @@ -25,4 +25,7 @@ int tor_init(int argc, char **argv); int run_tor_main_loop(void); +void pubsub_install(void); +void pubsub_connect(void); + #endif /* !defined(TOR_MAIN_H) */ diff --git a/src/app/main/ntmain.c b/src/app/main/ntmain.c index ced158e68..494119975 100644 --- a/src/app/main/ntmain.c +++ b/src/app/main/ntmain.c @@ -283,7 +283,9 @@ nt_service_body(int argc, char **argv) return; } + pubsub_install(); r = tor_init(backup_argc, backup_argv); + if (r) { /* Failed to start the Tor service */ r = NT_SERVICE_ERROR_TORINIT_FAILED; @@ -294,6 +296,8 @@ nt_service_body(int argc, char **argv) return; } + pubsub_connect(); + /* Set the service's status to SERVICE_RUNNING and start the main * event loop */ service_status.dwCurrentState = SERVICE_RUNNING; @@ -322,9 +326,12 @@ nt_service_main(void) errmsg = format_win32_error(result); printf("Service error %d : %s\n", (int) result, errmsg); tor_free(errmsg); + + pubsub_install(); if (result == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) { if (tor_init(backup_argc, backup_argv)) return; + pubsub_connect(); switch (get_options()->command) { case CMD_RUN_TOR: run_tor_main_loop();

1 0

[tor/master] add_c_file: Fix "control line not preceded by a blank line"
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 5ad1efa0626263a63481191d3b19fccab9c427e1 Author: teor <teor(a)torproject.org> Date: Thu Jan 16 09:38:26 2020 +1000 add_c_file: Fix "control line not preceded by a blank line" Fix dirauth and relay module include.am add_c_file.py "control line not preceded by a blank line" errors. Also remove a duplicate ADD_C_FILE: SOURCES in the relay module. Obviously correct fixes to already-reviewed code. --- src/feature/dirauth/include.am | 1 + src/feature/relay/include.am | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/feature/dirauth/include.am b/src/feature/dirauth/include.am index ec7b3b296..2ef629ae3 100644 --- a/src/feature/dirauth/include.am +++ b/src/feature/dirauth/include.am @@ -1,5 +1,6 @@ # The Directory Authority module. + # ADD_C_FILE: INSERT SOURCES HERE. MODULE_DIRAUTH_SOURCES = \ src/feature/dirauth/authmode.c \ diff --git a/src/feature/relay/include.am b/src/feature/relay/include.am index aa9aa3adf..a4c025ae1 100644 --- a/src/feature/relay/include.am +++ b/src/feature/relay/include.am @@ -1,5 +1,5 @@ -# ADD_C_FILE: INSERT SOURCES HERE. +# Legacy shared relay code: migrate to the relay module over time LIBTOR_APP_A_SOURCES += \ src/feature/relay/dns.c \ src/feature/relay/ext_orport.c \ @@ -9,6 +9,7 @@ LIBTOR_APP_A_SOURCES += \ src/feature/relay/selftest.c # The Relay module. + # ADD_C_FILE: INSERT SOURCES HERE. MODULE_RELAY_SOURCES = \ src/feature/relay/routermode.c \

1 0

[tor/master] add_c_file: Replace asserts with exceptions
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 28c8c63de96f82818b3ce40c027beb73519000da Author: teor <teor(a)torproject.org> Date: Mon Jan 20 13:20:42 2020 +1000 add_c_file: Replace asserts with exceptions Closes 32962. --- scripts/maint/add_c_file.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/maint/add_c_file.py b/scripts/maint/add_c_file.py index 75e1f556b..e1e224d8d 100755 --- a/scripts/maint/add_c_file.py +++ b/scripts/maint/add_c_file.py @@ -268,15 +268,26 @@ def run(fname): # Make sure we're in the top-level tor directory, # which contains the src directory - assert(os.path.isdir("src")) + if not os.path.isdir("src"): + raise RuntimeError("Could not find './src/'. " + "Run this script from the top-level tor source " + "directory.") + # And it looks like a tor/src directory - assert(os.path.isfile("src/include.am")) + if not os.path.isfile("src/include.am"): + raise RuntimeError("Could not find './src/include.am'. " + "Run this script from the top-level tor source " + "directory.") # Make the file name relative to the top-level tor directory tor_fname = tordir_file(fname) # And check that we're adding files to the "src" directory, # with canonical paths - assert(tor_fname[:4] == "src/") + if tor_fname[:4] != "src/": + raise ValueError("Requested file path '{}' canonicalized to '{}', " + "but the canonical path did not start with 'src/'. " + "Please add files to the src directory." + .format(fname, tor_fname)) c_tor_fname = makeext(tor_fname, "c") h_tor_fname = makeext(tor_fname, "h")

1 0

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

20 Jan '20

commit d7a22160f54dfa90702cfd6d6f83a0a75909edcb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 17 08:39:49 2020 -0500 Revert "Restore feature where nt-services detect non-"run_tor" modes." This reverts commit 5c240db0bf7751d74ba438a1ca4ef0d051a53df7. --- src/app/main/main.c | 7 ----- src/app/main/ntmain.c | 52 +++++++++++++++++++++++++------------- src/feature/api/tor_api_internal.h | 5 ---- 3 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index b533406ea..dad977726 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1274,13 +1274,6 @@ 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: nt_service_set_state(SERVICE_RUNNING); diff --git a/src/app/main/ntmain.c b/src/app/main/ntmain.c index 96da1690f..ced158e68 100644 --- a/src/app/main/ntmain.c +++ b/src/app/main/ntmain.c @@ -29,8 +29,6 @@ #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" @@ -265,6 +263,7 @@ 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(); @@ -284,20 +283,24 @@ nt_service_body(int argc, char **argv) return; } - 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) + 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); 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); - - tor_run_main(cfg); - - tor_main_configuration_free(cfg); + set_main_thread(); + run_tor_main_loop(); + tor_cleanup(); } /** Main service entry point. Starts the service control dispatcher and waits @@ -320,14 +323,29 @@ nt_service_main(void) printf("Service error %d : %s\n", (int) result, errmsg); tor_free(errmsg); if (result == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) { - 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) + if (tor_init(backup_argc, backup_argv)) return; - - tor_run_main(cfg); - tor_main_configuration_free(cfg); + 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(); } } } diff --git a/src/feature/api/tor_api_internal.h b/src/feature/api/tor_api_internal.h index ef06cd7e6..d52b2caf4 100644 --- a/src/feature/api/tor_api_internal.h +++ b/src/feature/api/tor_api_internal.h @@ -29,11 +29,6 @@ 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] Merge remote-tracking branch 'tor-github/pr/1667'
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 697527764921d95f2ef03f0c0418e2c0e88f5187 Merge: 4f88eb849 5ad1efa06 Author: teor <teor(a)torproject.org> Date: Mon Jan 20 15:40:08 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1667' scripts/maint/add_c_file.py | 200 +++++++++++++++++++++++++++++++------------- 1 file changed, 141 insertions(+), 59 deletions(-)

1 0

[tor/master] Rename routerstatus_has_changed to routerstatus_has_visibly_changed
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 152cbf2a5987128efc708f99b10cd6c8ad9862d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 17 09:22:12 2020 -0500 Rename routerstatus_has_changed to routerstatus_has_visibly_changed This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ routerstatus_has_changed routerstatus_has_visibly_changed It was generated with --no-verify, since it introduces a wide line. I'll fix it in a subsequent commit. --- src/feature/nodelist/fmt_routerstatus.c | 2 +- src/feature/nodelist/networkstatus.c | 4 ++-- src/feature/nodelist/networkstatus.h | 2 +- src/feature/nodelist/routerstatus_st.h | 2 +- src/test/test_nodelist.c | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/feature/nodelist/fmt_routerstatus.c b/src/feature/nodelist/fmt_routerstatus.c index dc44a6ef9..2026d0c58 100644 --- a/src/feature/nodelist/fmt_routerstatus.c +++ b/src/feature/nodelist/fmt_routerstatus.c @@ -125,7 +125,7 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, /* Blow up more or less nicely if we didn't get anything or not the * thing we expected. * This should be kept in sync with the function - * routerstatus_has_changed and the struct routerstatus_t + * routerstatus_has_visibly_changed and the struct routerstatus_t */ if (!desc) { char id[HEX_DIGEST_LEN+1]; diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 208efcef6..03edfe62b 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1612,7 +1612,7 @@ networkstatus_consensus_has_ipv6(const or_options_t* options) * NS_CONTROL_PORT mode. **/ STATIC int -routerstatus_has_changed(const routerstatus_t *a, const routerstatus_t *b) +routerstatus_has_visibly_changed(const routerstatus_t *a, const routerstatus_t *b) { tor_assert(tor_memeq(a->identity_digest, b->identity_digest, DIGEST_LEN)); @@ -1670,7 +1670,7 @@ notify_control_networkstatus_changed(const networkstatus_t *old_c, tor_memcmp(rs_old->identity_digest, rs_new->identity_digest, DIGEST_LEN), smartlist_add(changed, (void*) rs_new)) { - if (routerstatus_has_changed(rs_old, rs_new)) + if (routerstatus_has_visibly_changed(rs_old, rs_new)) smartlist_add(changed, (void*)rs_new); } SMARTLIST_FOREACH_JOIN_END(rs_old, rs_new); diff --git a/src/feature/nodelist/networkstatus.h b/src/feature/nodelist/networkstatus.h index 7b63e30e9..705bb12b8 100644 --- a/src/feature/nodelist/networkstatus.h +++ b/src/feature/nodelist/networkstatus.h @@ -164,7 +164,7 @@ STATIC void warn_early_consensus(const networkstatus_t *c, const char *flavor, extern networkstatus_t *current_ns_consensus; extern networkstatus_t *current_md_consensus; #endif /* defined(TOR_UNIT_TESTS) */ -STATIC int routerstatus_has_changed(const routerstatus_t *a, +STATIC int routerstatus_has_visibly_changed(const routerstatus_t *a, const routerstatus_t *b); #endif /* defined(NETWORKSTATUS_PRIVATE) */ diff --git a/src/feature/nodelist/routerstatus_st.h b/src/feature/nodelist/routerstatus_st.h index eb6c3e5cf..735c754b3 100644 --- a/src/feature/nodelist/routerstatus_st.h +++ b/src/feature/nodelist/routerstatus_st.h @@ -18,7 +18,7 @@ */ struct routerstatus_t { /* This should be kept in sync with the function - * routerstatus_has_changed and the printing function + * routerstatus_has_visibly_changed and the printing function * routerstatus_format_entry in NS_CONTROL_PORT mode. */ time_t published_on; /**< When was this router published? */ diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c index d47cfc090..c568e3698 100644 --- a/src/test/test_nodelist.c +++ b/src/test/test_nodelist.c @@ -1282,21 +1282,21 @@ test_nodelist_routerstatus_has_changed(void *arg) STMT_END #define ASSERT_SAME() \ STMT_BEGIN \ - tt_assert(! routerstatus_has_changed(&rs_orig, &rs)); \ + tt_assert(! routerstatus_has_visibly_changed(&rs_orig, &rs)); \ FORMAT(); \ tt_str_op(fmt_orig, OP_EQ, fmt); \ COPY(); \ STMT_END #define ASSERT_CHANGED() \ STMT_BEGIN \ - tt_assert(routerstatus_has_changed(&rs_orig, &rs)); \ + tt_assert(routerstatus_has_visibly_changed(&rs_orig, &rs)); \ FORMAT(); \ tt_str_op(fmt_orig, OP_NE, fmt); \ COPY(); \ STMT_END #define ASSERT_CHANGED_NO_FORMAT() \ STMT_BEGIN \ - tt_assert(routerstatus_has_changed(&rs_orig, &rs)); \ + tt_assert(routerstatus_has_visibly_changed(&rs_orig, &rs)); \ COPY(); \ STMT_END @@ -1432,6 +1432,6 @@ struct testcase_t nodelist_tests[] = { NODE(routerstatus_describe, 0), NODE(extend_info_describe, 0), NODE(router_get_verbose_nickname, 0), - NODE(routerstatus_has_changed, 0), + NODE(routerstatus_has_visibly_changed, 0), END_OF_TESTCASES };

1 0

[tor/master] Add unit test for routerstatus_has_changed()
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 702a753cf310cd214df2fd1b72d974923514a0a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 16 12:14:14 2020 -0500 Add unit test for routerstatus_has_changed() --- src/test/test_nodelist.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c index dc7faee5b..8a36de58d 100644 --- a/src/test/test_nodelist.c +++ b/src/test/test_nodelist.c @@ -7,6 +7,7 @@ **/ #define NODELIST_PRIVATE +#define NETWORKSTATUS_PRIVATE #include "core/or/or.h" #include "lib/crypt_ops/crypto_rand.h" @@ -1246,6 +1247,136 @@ test_nodelist_router_get_verbose_nickname(void *arg) return; } +static void +test_nodelist_routerstatus_has_changed(void *arg) +{ + (void)arg; + routerstatus_t rs_orig, rs; + memset(&rs_orig, 0, sizeof(rs_orig)); + strlcpy(rs_orig.nickname, "friendly", sizeof(rs_orig.nickname)); + memcpy(rs_orig.identity_digest, "abcdefghijklmnopqrst", 20); + memcpy(rs_orig.descriptor_digest, "abcdefghijklmnopqrst", 20); + rs_orig.addr = 0x7f000001; + rs_orig.or_port = 3; + rs_orig.published_on = time(NULL); + +#define COPY() memcpy(&rs, &rs_orig, sizeof(rs)) +#define ASSERT_SAME() \ + STMT_BEGIN \ + tt_assert(! routerstatus_has_changed(&rs_orig, &rs)); \ + COPY(); \ + STMT_END +#define ASSERT_CHANGED() \ + STMT_BEGIN \ + tt_assert(routerstatus_has_changed(&rs_orig, &rs)); \ + COPY(); \ + STMT_END + + COPY(); + ASSERT_SAME(); + + rs.addr = 0x7f000002; + ASSERT_CHANGED(); + + strlcpy(rs.descriptor_digest, "hello world", sizeof(rs.descriptor_digest)); + ASSERT_CHANGED(); + + strlcpy(rs.nickname, "fr1end1y", sizeof(rs.nickname)); + ASSERT_CHANGED(); + + rs.published_on += 3600; + ASSERT_CHANGED(); + + rs.or_port = 55; + ASSERT_CHANGED(); + + rs.dir_port = 9999; + ASSERT_CHANGED(); + + tor_addr_parse(&rs.ipv6_addr, "1234::56"); + ASSERT_CHANGED(); + + rs.ipv6_orport = 22; + ASSERT_CHANGED(); + + rs.is_authority = 1; + ASSERT_CHANGED(); + + rs.is_exit = 1; + ASSERT_CHANGED(); + + rs.is_stable = 1; + ASSERT_CHANGED(); + + rs.is_fast = 1; + ASSERT_CHANGED(); + + rs.is_flagged_running = 1; + ASSERT_CHANGED(); + + // Isn't this obsolete? + rs.is_named = 1; + ASSERT_CHANGED(); + + // Isn't this obsolete? + rs.is_unnamed = 1; + ASSERT_CHANGED(); + + rs.is_valid = 1; + ASSERT_CHANGED(); + + rs.is_possible_guard = 1; + ASSERT_CHANGED(); + + rs.is_bad_exit = 1; + ASSERT_CHANGED(); + + rs.is_hs_dir = 1; + ASSERT_CHANGED(); + + rs.is_v2_dir = 1; + ASSERT_CHANGED(); + + rs.is_staledesc = 1; + ASSERT_CHANGED(); + + rs.has_bandwidth = 1; + ASSERT_CHANGED(); + + // Does not actually matter unless exitsummary changes. + rs.has_exitsummary = 1; + ASSERT_SAME(); + + // Does not actually matter; not visible to the controller. + rs.bw_is_unmeasured = 1; + ASSERT_SAME(); + + rs.bandwidth_kb = 2000; + ASSERT_CHANGED(); + + // not visible to the controller. + rs.has_guardfraction = 1; + rs.guardfraction_percentage = 22; + ASSERT_SAME(); + + // not visible to the controller. + rs_orig.has_guardfraction = 1; + rs_orig.guardfraction_percentage = 20; + COPY(); + rs.guardfraction_percentage = 25; + ASSERT_SAME(); + + // not visible to the controller. + rs.exitsummary = (char*)"accept 1-2"; + ASSERT_SAME(); + + done: +#undef COPY +#undef ASSERT_SAME +#undef ASSERT_CHANGED + return; +} + #define NODE(name, flags) \ { #name, test_nodelist_##name, (flags), NULL, NULL } @@ -1266,5 +1397,6 @@ struct testcase_t nodelist_tests[] = { NODE(routerstatus_describe, 0), NODE(extend_info_describe, 0), NODE(router_get_verbose_nickname, 0), + NODE(routerstatus_has_changed, 0), END_OF_TESTCASES };

1 0