diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-05-18 14:44:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-05-18 14:44:28 -0400 |
| commit | 2308f917f99384640c5b0d1ddc9f2a3dffc68e5a (patch) | |
| tree | 2b1caf0f5e3a0a35f086dd3fe997ebf60746ec8b /src/or/control.h | |
| parent | 0d3b3a4a2308c955f75825a145a22997b7008552 (diff) | |
| parent | 79f7721a7e339783d6d0005def77abe3d7e23e95 (diff) | |
| download | tor-2308f917f99384640c5b0d1ddc9f2a3dffc68e5a.tar.gz tor-2308f917f99384640c5b0d1ddc9f2a3dffc68e5a.zip | |
Merge remote-tracking branch 'andrea/ticket15358_squashed_2'
Diffstat (limited to 'src/or/control.h')
| -rw-r--r-- | src/or/control.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/control.h b/src/or/control.h index a9f2725878..2d02443834 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -67,6 +67,7 @@ int control_event_or_authdir_new_descriptor(const char *action, size_t desclen, const char *msg); int control_event_my_descriptor_changed(void); +int control_event_network_liveness_update(int liveness); int control_event_networkstatus_changed(smartlist_t *statuses); int control_event_newconsensus(const networkstatus_t *consensus); @@ -174,7 +175,8 @@ void control_free_all(void); #define EVENT_TRANSPORT_LAUNCHED 0x0020 #define EVENT_HS_DESC 0x0021 #define EVENT_HS_DESC_CONTENT 0x0022 -#define EVENT_MAX_ 0x0022 +#define EVENT_NETWORK_LIVENESS 0x0023 +#define EVENT_MAX_ 0x0023 /* sizeof(control_connection_t.event_mask) in bits, currently a uint64_t */ #define EVENT_CAPACITY_ 0x0040 |