diff options
author | Neel Chauhan <neel@neelc.org> | 2020-07-31 09:21:43 -0700 |
---|---|---|
committer | Neel Chauhan <neel@neelc.org> | 2020-07-31 09:21:43 -0700 |
commit | 837e0c4dc93bd035298551c35db5be2ed18ee5dc (patch) | |
tree | dbc1d83cbd9a7c2b5a9712a510548bfcacc84c85 /src/feature/control | |
parent | 60f699c859875b92602819c47c4a673343bee5fb (diff) | |
download | tor-837e0c4dc93bd035298551c35db5be2ed18ee5dc.tar.gz tor-837e0c4dc93bd035298551c35db5be2ed18ee5dc.zip |
Code simplifications for AP_CONN_STATE_CONTROLLER_WAIT
Diffstat (limited to 'src/feature/control')
-rw-r--r-- | src/feature/control/control_events.c | 10 | ||||
-rw-r--r-- | src/feature/control/control_events.h | 3 |
2 files changed, 3 insertions, 10 deletions
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 */ |