commit b58dfba76f2d34d8401130137705f2ab1f9bf8c9
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu Aug 20 18:42:20 2015 -0400
Rename EVENT_SIGNAL -> EVENT_GOT_SIGNAL
This avoids a conflict with a macro decl from libevent 1.x.
Fixes bug 16867; bug not in any released Tor.
---
src/or/control.c | 6 +++---
src/or/control.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/or/control.c b/src/or/control.c
index 3638bd2..ed2feda 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1130,7 +1130,7 @@ static const struct control_event_t control_event_table[] = {
{ EVENT_CLIENTS_SEEN, "CLIENTS_SEEN" },
{ EVENT_NEWCONSENSUS, "NEWCONSENSUS" },
{ EVENT_BUILDTIMEOUT_SET, "BUILDTIMEOUT_SET" },
- { EVENT_SIGNAL, "SIGNAL" },
+ { EVENT_GOT_SIGNAL, "SIGNAL" },
{ EVENT_CONF_CHANGED, "CONF_CHANGED"},
{ EVENT_CONN_BW, "CONN_BW" },
{ EVENT_CELL_STATS, "CELL_STATS" },
@@ -5464,7 +5464,7 @@ control_event_signal(uintptr_t signal)
{
const char *signal_string = NULL;
- if (!control_event_is_interesting(EVENT_SIGNAL))
+ if (!control_event_is_interesting(EVENT_GOT_SIGNAL))
return 0;
switch (signal) {
@@ -5492,7 +5492,7 @@ control_event_signal(uintptr_t signal)
return -1;
}
- send_control_event(EVENT_SIGNAL, "650 SIGNAL %s\r\n",
+ send_control_event(EVENT_GOT_SIGNAL, "650 SIGNAL %s\r\n",
signal_string);
return 0;
}
diff --git a/src/or/control.h b/src/or/control.h
index 574dd85..fdf7903 100644
--- a/src/or/control.h
+++ b/src/or/control.h
@@ -176,7 +176,7 @@ void control_free_all(void);
#define EVENT_CLIENTS_SEEN 0x0015
#define EVENT_NEWCONSENSUS 0x0016
#define EVENT_BUILDTIMEOUT_SET 0x0017
-#define EVENT_SIGNAL 0x0018
+#define EVENT_GOT_SIGNAL 0x0018
#define EVENT_CONF_CHANGED 0x0019
#define EVENT_CONN_BW 0x001A
#define EVENT_CELL_STATS 0x001B