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

[tor/master] dirparse: reject votes with invalid recommended/required protocols
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit 8d89aa5eeaef2c009c7fc8250eacc0ed32ebde64 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Feb 8 21:11:44 2020 +0000 dirparse: reject votes with invalid recommended/required protocols --- src/feature/dirparse/ns_parse.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index ce548b221e..6172a57bbb 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -1168,16 +1168,25 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, } } + // Reject the vote if any of the protocols lines are malformed. if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_CLIENT_PROTOCOLS))) { + if (protover_contains_long_protocol_names(tok->args[0])) + goto err; ns->recommended_client_protocols = tor_strdup(tok->args[0]); } if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_RELAY_PROTOCOLS))) { + if (protover_contains_long_protocol_names(tok->args[0])) + goto err; ns->recommended_relay_protocols = tor_strdup(tok->args[0]); } if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_CLIENT_PROTOCOLS))) { + if (protover_contains_long_protocol_names(tok->args[0])) + goto err; ns->required_client_protocols = tor_strdup(tok->args[0]); } if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_RELAY_PROTOCOLS))) { + if (protover_contains_long_protocol_names(tok->args[0])) + goto err; ns->required_relay_protocols = tor_strdup(tok->args[0]); }

1 0

[tor/master] dirparse: curlybraceify if statements
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit ad1b378e87c4f2e000909abed41b80a1ec166113 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Feb 8 20:45:24 2020 +0000 dirparse: curlybraceify if statements --- src/feature/dirparse/ns_parse.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index 2354ebf440..ce548b221e 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -1168,14 +1168,18 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, } } - if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_CLIENT_PROTOCOLS))) + if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_CLIENT_PROTOCOLS))) { ns->recommended_client_protocols = tor_strdup(tok->args[0]); - if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_RELAY_PROTOCOLS))) + } + if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_RELAY_PROTOCOLS))) { ns->recommended_relay_protocols = tor_strdup(tok->args[0]); - if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_CLIENT_PROTOCOLS))) + } + if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_CLIENT_PROTOCOLS))) { ns->required_client_protocols = tor_strdup(tok->args[0]); - if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_RELAY_PROTOCOLS))) + } + if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_RELAY_PROTOCOLS))) { ns->required_relay_protocols = tor_strdup(tok->args[0]); + } tok = find_by_keyword(tokens, K_VALID_AFTER); if (parse_iso_time(tok->args[0], &ns->valid_after))

1 0

[tor/master] dirparse: add helper for recommended/required protocols
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit c2b95da4d49504281f7c30c8f523cd492be932a7 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Feb 8 21:16:26 2020 +0000 dirparse: add helper for recommended/required protocols --- src/feature/dirparse/ns_parse.c | 44 ++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index 6172a57bbb..5ba87176aa 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -1053,6 +1053,19 @@ extract_shared_random_srvs(networkstatus_t *ns, smartlist_t *tokens) } } +/** Allocate a copy of a protover line, if present. If present but malformed, + * set *error to true. */ +static char * +dup_protocols_string(smartlist_t *tokens, bool *error, directory_keyword kw) +{ + directory_token_t *tok = find_opt_by_keyword(tokens, kw); + if (!tok) + return NULL; + if (protover_contains_long_protocol_names(tok->args[0])) + *error = true; + return tor_strdup(tok->args[0]); +} + /** Parse a v3 networkstatus vote, opinion, or consensus (depending on * ns_type), from s, and return the result. Return NULL on failure. */ networkstatus_t * @@ -1169,26 +1182,17 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, } // Reject the vote if any of the protocols lines are malformed. - if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_CLIENT_PROTOCOLS))) { - if (protover_contains_long_protocol_names(tok->args[0])) - goto err; - ns->recommended_client_protocols = tor_strdup(tok->args[0]); - } - if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_RELAY_PROTOCOLS))) { - if (protover_contains_long_protocol_names(tok->args[0])) - goto err; - ns->recommended_relay_protocols = tor_strdup(tok->args[0]); - } - if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_CLIENT_PROTOCOLS))) { - if (protover_contains_long_protocol_names(tok->args[0])) - goto err; - ns->required_client_protocols = tor_strdup(tok->args[0]); - } - if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_RELAY_PROTOCOLS))) { - if (protover_contains_long_protocol_names(tok->args[0])) - goto err; - ns->required_relay_protocols = tor_strdup(tok->args[0]); - } + bool unparseable = false; + ns->recommended_client_protocols = dup_protocols_string(tokens, &unparseable, + K_RECOMMENDED_CLIENT_PROTOCOLS); + ns->recommended_relay_protocols = dup_protocols_string(tokens, &unparseable, + K_RECOMMENDED_RELAY_PROTOCOLS); + ns->required_client_protocols = dup_protocols_string(tokens, &unparseable, + K_REQUIRED_CLIENT_PROTOCOLS); + ns->required_relay_protocols = dup_protocols_string(tokens, &unparseable, + K_REQUIRED_RELAY_PROTOCOLS); + if (unparseable) + goto err; tok = find_by_keyword(tokens, K_VALID_AFTER); if (parse_iso_time(tok->args[0], &ns->valid_after))

1 0

[tor/master] Fix comment on protover_list_is_invalid
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit ce57404a429b2505f5832954d8a66935a592461a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 3 08:57:12 2020 -0400 Fix comment on protover_list_is_invalid --- src/core/or/protover.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/or/protover.c b/src/core/or/protover.c index 485f7b3736..26fcefe8ac 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -299,8 +299,9 @@ parse_protocol_list(const char *s) } /** - * Return true if the unparsed protover in s would contain a protocol - * name longer than MAX_PROTOCOL_NAME_LENGTH, and false otherwise. + * Return true if the unparsed protover list in s contains a + * parsing error, such as extra commas, a bad number, or an over-long + * name. */ bool protover_list_is_invalid(const char *s)

1 0

[tor/master] protover: reject unexpected commas
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit 32b33c0d21ce471d735abbedc26d26998238c380 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Aug 17 22:45:33 2018 +0000 protover: reject unexpected commas Consistently reject extra commas, instead of only rejecting leading commas. Fix on b2b2e1c7f24d9b65059e3d089768d6c49ba4f58f. Fixes #27194; bugfix on 0.2.9.4-alpha. --- changes/bug27194 | 3 +++ src/core/or/protover.c | 3 ++- src/test/test_protover.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug27194 b/changes/bug27194 new file mode 100644 index 0000000000..a1919c6c49 --- /dev/null +++ b/changes/bug27194 @@ -0,0 +1,3 @@ + o Minor bugfixes (protover): + - Consistently reject extra commas, instead of only rejecting leading commas. + Fixes bug 27194; bugfix on 0.2.9.4-alpha. diff --git a/src/core/or/protover.c b/src/core/or/protover.c index 17979d04ea..763eadadf9 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -245,7 +245,8 @@ parse_single_entry(const char *s, const char *end_of_entry) } s = comma; - while (*s == ',' && s < end_of_entry) + // Skip the comma separator between ranges. Don't ignore a trailing comma. + if (s < (end_of_entry - 1)) ++s; } diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 63c508bd13..664576f625 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -572,6 +572,10 @@ test_protover_vote_roundtrip(void *args) { "N-1=1,2", "N-1=1-2" }, { "-1=4294967295", NULL }, { "-1=3", "-1=3" }, + { "Foo=,", NULL }, + { "Foo=,1", NULL }, + { "Foo=1,,3", NULL }, + { "Foo=1,3,", NULL }, /* junk. */ { "!!3@*", NULL }, /* Missing equals sign */

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/94'
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit d1fda62d11139830b0d81d56d0dfd372237d0be6 Merge: 3e3b0b0443 32b33c0d21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 3 08:54:03 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/94' changes/bug27194 | 3 +++ src/core/or/protover.c | 3 ++- src/feature/dirparse/ns_parse.c | 41 +++++++++++++++++++++++++++++-------- src/rust/protover/protover.rs | 17 +++++++++------ src/rust/protover/tests/protover.rs | 13 ------------ src/test/test_protover.c | 4 ++++ 6 files changed, 53 insertions(+), 28 deletions(-)

1 0

[tor/master] Rename protover_contains_long_protocol_names to protover_list_is_invalid
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit efc969e86214fc53d3387c646ef0eab80ce15981 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 3 08:55:17 2020 -0400 Rename protover_contains_long_protocol_names to protover_list_is_invalid This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ protover_contains_long_protocol_names protover_list_is_invalid --- src/core/or/protover.c | 2 +- src/core/or/protover.h | 2 +- src/core/or/protover_rust.c | 2 +- src/feature/dirauth/dirvote.c | 2 +- src/feature/dirparse/ns_parse.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/or/protover.c b/src/core/or/protover.c index 22128dff18..485f7b3736 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -303,7 +303,7 @@ parse_protocol_list(const char *s) * name longer than MAX_PROTOCOL_NAME_LENGTH, and false otherwise. */ bool -protover_contains_long_protocol_names(const char *s) +protover_list_is_invalid(const char *s) { smartlist_t *list = parse_protocol_list(s); if (!list) diff --git a/src/core/or/protover.h b/src/core/or/protover.h index 2950147d1b..24008f46b9 100644 --- a/src/core/or/protover.h +++ b/src/core/or/protover.h @@ -69,7 +69,7 @@ typedef enum protocol_type_t { PRT_FLOWCTRL = 11, } protocol_type_t; -bool protover_contains_long_protocol_names(const char *s); +bool protover_list_is_invalid(const char *s); int protover_all_supported(const char *s, char **missing); int protover_is_supported_here(protocol_type_t pr, uint32_t ver); const char *protover_get_supported_protocols(void); diff --git a/src/core/or/protover_rust.c b/src/core/or/protover_rust.c index f44746b6da..99f3aa7f69 100644 --- a/src/core/or/protover_rust.c +++ b/src/core/or/protover_rust.c @@ -25,7 +25,7 @@ int protover_contains_long_protocol_names_(const char *s); * name longer than MAX_PROTOCOL_NAME_LENGTH, and false otherwise. */ bool -protover_contains_long_protocol_names(const char *s) +protover_list_is_invalid(const char *s) { return protover_contains_long_protocol_names_(s) != 0; } diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 080edd92f1..8676df76ab 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4567,7 +4567,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, /* If it has a protover list and contains a protocol name greater than * MAX_PROTOCOL_NAME_LENGTH, skip it. */ if (ri->protocol_list && - protover_contains_long_protocol_names(ri->protocol_list)) { + protover_list_is_invalid(ri->protocol_list)) { continue; } if (ri->cache_info.published_on >= cutoff) { diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index 726da8a64c..927870c4aa 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -468,7 +468,7 @@ routerstatus_parse_entry_from_string(memarea_t *area, } // If the protover line is malformed, reject this routerstatus. - if (protocols && protover_contains_long_protocol_names(protocols)) { + if (protocols && protover_list_is_invalid(protocols)) { goto err; } summarize_protover_flags(&rs->pv, protocols, version); @@ -1076,7 +1076,7 @@ dup_protocols_string(smartlist_t *tokens, bool *error, directory_keyword kw) directory_token_t *tok = find_opt_by_keyword(tokens, kw); if (!tok) return NULL; - if (protover_contains_long_protocol_names(tok->args[0])) + if (protover_list_is_invalid(tok->args[0])) *error = true; return tor_strdup(tok->args[0]); }

1 0

[torspec/master] Document CONTROLLER_WAIT stream status.
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit 8761aa05d50b7609ecc5d7fc487d452c3aa00f19 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 3 08:36:53 2020 -0400 Document CONTROLLER_WAIT stream status. --- control-spec.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index b9fa729..fb35d94 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2305,7 +2305,9 @@ "SUCCEEDED" / ; Received a reply; stream established "FAILED" / ; Stream failed and not retriable "CLOSED" / ; Stream closed - "DETACHED" ; Detached from circuit; still retriable + "DETACHED" / ; Detached from circuit; still retriable + "CONTROLLER_WAIT" ; Waiting for controller to use ATTACHSTREAM + ; (new in 0.4.5.1-alpha) Target = TargetAddress ":" Port Port = an integer from 0 to 65535 inclusive

1 0

[tor/master] Code simplifications for AP_CONN_STATE_CONTROLLER_WAIT
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit 837e0c4dc93bd035298551c35db5be2ed18ee5dc Author: Neel Chauhan <neel(a)neelc.org> Date: Fri Jul 31 09:21:43 2020 -0700 Code simplifications for AP_CONN_STATE_CONTROLLER_WAIT --- src/core/or/connection_edge.c | 2 +- src/feature/control/control_events.c | 10 +--------- src/feature/control/control_events.h | 3 ++- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 5fc5f1176a..6c02d6b122 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -1511,7 +1511,7 @@ connection_entry_set_controller_wait(entry_connection_t *conn) { CONNECTION_AP_EXPECT_NONPENDING(conn); ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_CONTROLLER_WAIT; - control_event_enter_controller_wait(); + control_event_stream_status(conn, STREAM_EVENT_CONTROLLER_WAIT, 0); } /** The AP connection conn has just failed while attaching or diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 85936aa722..f97130d020 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -819,6 +819,7 @@ control_event_stream_status(entry_connection_t *conn, stream_status_event_t tp, case STREAM_EVENT_NEW_RESOLVE: status = "NEWRESOLVE"; break; case STREAM_EVENT_FAILED_RETRIABLE: status = "DETACHED"; break; case STREAM_EVENT_REMAP: status = "REMAP"; break; + case STREAM_EVENT_CONTROLLER_WAIT: status = "CONTROLLER_WAIT"; break; default: log_warn(LD_BUG, "Unrecognized status code %d", (int)tp); return 0; @@ -2364,15 +2365,6 @@ control_events_free_all(void) disable_log_messages = 0; } -/** Our own router descriptor has changed; tell any controllers that care. - */ -int -control_event_enter_controller_wait(void) -{ - send_control_event(EVENT_CONTROLLER_WAIT, "650 CONTROLLER_WAIT\r\n"); - return 0; -} - #ifdef TOR_UNIT_TESTS /* For testing: change the value of global_event_mask */ void diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h index cd84fb0850..82c665ac71 100644 --- a/src/feature/control/control_events.h +++ b/src/feature/control/control_events.h @@ -36,7 +36,8 @@ typedef enum stream_status_event_t { STREAM_EVENT_NEW = 5, STREAM_EVENT_NEW_RESOLVE = 6, STREAM_EVENT_FAILED_RETRIABLE = 7, - STREAM_EVENT_REMAP = 8 + STREAM_EVENT_REMAP = 8, + STREAM_EVENT_CONTROLLER_WAIT = 9 } stream_status_event_t; /** Used to indicate the type of a buildtime event */

1 0

[tor/master] Send a control port event when a stream enters the AP_CONN_STATE_CONTROLLER_WAIT state
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit 60f699c859875b92602819c47c4a673343bee5fb Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Jul 8 20:12:56 2020 -0700 Send a control port event when a stream enters the AP_CONN_STATE_CONTROLLER_WAIT state --- changes/ticket32190 | 4 ++++ src/core/or/connection_edge.c | 16 ++++++++++++---- src/core/or/connection_edge.h | 2 ++ src/feature/control/control_cmd.c | 3 +-- src/feature/control/control_events.c | 10 ++++++++++ src/feature/control/control_events.h | 5 ++++- 6 files changed, 33 insertions(+), 7 deletions(-) diff --git a/changes/ticket32190 b/changes/ticket32190 new file mode 100644 index 0000000000..a34fd51c60 --- /dev/null +++ b/changes/ticket32190 @@ -0,0 +1,4 @@ + o Minor features (control port): + - When a stream enters the AP_CONN_STATE_CONTROLLER_WAIT status, + send a control port event CONTROLLER_WAIT. Closes ticket 32190. + Patch by Neel Chauhan. diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 2826a99249..5fc5f1176a 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -1504,6 +1504,16 @@ circuit_discard_optional_exit_enclaves(extend_info_t *info) } SMARTLIST_FOREACH_END(conn); } +/** Set the connection state to CONTROLLER_WAIT and send an control port event. + */ +void +connection_entry_set_controller_wait(entry_connection_t *conn) +{ + CONNECTION_AP_EXPECT_NONPENDING(conn); + ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_CONTROLLER_WAIT; + control_event_enter_controller_wait(); +} + /** The AP connection conn has just failed while attaching or * sending a BEGIN or resolving on circ, but another circuit * might work. Detach the circuit, and either reattach it, launch a @@ -1535,8 +1545,7 @@ connection_ap_detach_retriable(entry_connection_t *conn, circuit_detach_stream(TO_CIRCUIT(circ),ENTRY_TO_EDGE_CONN(conn)); connection_ap_mark_as_pending_circuit(conn); } else { - CONNECTION_AP_EXPECT_NONPENDING(conn); - ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_CONTROLLER_WAIT; + connection_entry_set_controller_wait(conn); circuit_detach_stream(TO_CIRCUIT(circ),ENTRY_TO_EDGE_CONN(conn)); } return 0; @@ -1686,8 +1695,7 @@ connection_ap_rewrite_and_attach_if_allowed,(entry_connection_t *conn, const or_options_t *options = get_options(); if (options->LeaveStreamsUnattached) { - CONNECTION_AP_EXPECT_NONPENDING(conn); - ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_CONTROLLER_WAIT; + connection_entry_set_controller_wait(conn); return 0; } return connection_ap_handshake_rewrite_and_attach(conn, circ, cpath); diff --git a/src/core/or/connection_edge.h b/src/core/or/connection_edge.h index 8c06af5664..12bc314b70 100644 --- a/src/core/or/connection_edge.h +++ b/src/core/or/connection_edge.h @@ -94,6 +94,8 @@ int connection_edge_flushed_some(edge_connection_t *conn); int connection_edge_finished_flushing(edge_connection_t *conn); int connection_edge_finished_connecting(edge_connection_t *conn); +void connection_entry_set_controller_wait(entry_connection_t *conn); + void connection_ap_about_to_close(entry_connection_t *edge_conn); void connection_exit_about_to_close(edge_connection_t *edge_conn); diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index a8926c0b79..6dc556a579 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -982,8 +982,7 @@ handle_control_attachstream(control_connection_t *conn, edge_conn->end_reason = 0; if (tmpcirc) circuit_detach_stream(tmpcirc, edge_conn); - CONNECTION_AP_EXPECT_NONPENDING(ap_conn); - TO_CONN(edge_conn)->state = AP_CONN_STATE_CONTROLLER_WAIT; + connection_entry_set_controller_wait(ap_conn); } if (circ && (circ->base_.state != CIRCUIT_STATE_OPEN)) { diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 8e69c772f6..85936aa722 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -109,6 +109,7 @@ const struct control_event_t control_event_table[] = { { EVENT_HS_DESC, "HS_DESC" }, { EVENT_HS_DESC_CONTENT, "HS_DESC_CONTENT" }, { EVENT_NETWORK_LIVENESS, "NETWORK_LIVENESS" }, + { EVENT_CONTROLLER_WAIT, "CONTROLLER_WAIT" }, { 0, NULL }, }; @@ -2363,6 +2364,15 @@ control_events_free_all(void) disable_log_messages = 0; } +/** Our own router descriptor has changed; tell any controllers that care. + */ +int +control_event_enter_controller_wait(void) +{ + send_control_event(EVENT_CONTROLLER_WAIT, "650 CONTROLLER_WAIT\r\n"); + return 0; +} + #ifdef TOR_UNIT_TESTS /* For testing: change the value of global_event_mask */ void diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h index 0c8448e0f8..cd84fb0850 100644 --- a/src/feature/control/control_events.h +++ b/src/feature/control/control_events.h @@ -226,6 +226,8 @@ void control_event_hs_descriptor_content(const char *onion_address, void cbt_control_event_buildtimeout_set(const circuit_build_times_t *cbt, buildtimeout_set_event_t type); +int control_event_enter_controller_wait(void); + void control_events_free_all(void); #ifdef CONTROL_MODULE_PRIVATE @@ -284,7 +286,8 @@ typedef uint64_t event_mask_t; #define EVENT_NETWORK_LIVENESS 0x0023 #define EVENT_PT_LOG 0x0024 #define EVENT_PT_STATUS 0x0025 -#define EVENT_MAX_ 0x0025 +#define EVENT_CONTROLLER_WAIT 0x0026 +#define EVENT_MAX_ 0x0026 /* sizeof(control_connection_t.event_mask) in bits, currently a uint64_t */ #define EVENT_CAPACITY_ 0x0040

1 0