diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-08-11 18:41:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-08-11 18:41:15 -0400 |
| commit | 4fdec27a12d4fd51c91bb82c133b4b8bee2133df (patch) | |
| tree | e2c418dbd4a50dda83b0bb269502cb49bbff5db7 /src/feature/control | |
| parent | b56985f02294ec7c087c457ed17c658e9ea32eb0 (diff) | |
| download | tor-4fdec27a12d4fd51c91bb82c133b4b8bee2133df.tar.gz tor-4fdec27a12d4fd51c91bb82c133b4b8bee2133df.zip | |
Remove extraneous EVENT_CONTROLLER_WAIT
This turned into a new StreamStatus value.
Closes #40092. Bug not in any released Tor.
Diffstat (limited to 'src/feature/control')
| -rw-r--r-- | src/feature/control/control_events.c | 1 | ||||
| -rw-r--r-- | src/feature/control/control_events.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index f97130d020..2970745ca0 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -109,7 +109,6 @@ 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 }, }; diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h index 82c665ac71..6e3cfef4e9 100644 --- a/src/feature/control/control_events.h +++ b/src/feature/control/control_events.h @@ -287,8 +287,7 @@ typedef uint64_t event_mask_t; #define EVENT_NETWORK_LIVENESS 0x0023 #define EVENT_PT_LOG 0x0024 #define EVENT_PT_STATUS 0x0025 -#define EVENT_CONTROLLER_WAIT 0x0026 -#define EVENT_MAX_ 0x0026 +#define EVENT_MAX_ 0x0025 /* sizeof(control_connection_t.event_mask) in bits, currently a uint64_t */ #define EVENT_CAPACITY_ 0x0040 |