Commit 4fdec27a authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Remove extraneous EVENT_CONTROLLER_WAIT 

This turned into a new StreamStatus value.

Closes #40092. Bug not in any released Tor.
parent b56985f0

src/feature/control/control_events.c

+0 −1
Original line number Diff line number Diff line
@@ -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 },

};

src/feature/control/control_events.h

+1 −2
Original line number Diff line number Diff line
@@ -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