nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

control: Remove an unnecessary header in control_events.h

Browse Source 
And replace it with a struct forward declaration.

Also, move all the headers in the file before the forward
declaration.

Cleanup after 31531.
This commit is contained in:
teor 2019-11-29 10:50:09 +10:00
parent 99cf3f99c0
commit 7572988ea9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/feature/control/control_events.h
View File

@ -13,7 +13,9 @@
#define TOR_CONTROL_EVENTS_H #define TOR_CONTROL_EVENTS_H
#include "core/or/ocirc_event.h" #include "core/or/ocirc_event.h"
#include "lib/encoding/confline.h" #include "core/or/orconn_event.h"
struct config_line_t;
/** Used to indicate the type of a CIRC_MINOR event passed to the controller. /** Used to indicate the type of a CIRC_MINOR event passed to the controller.
* The various types are defined in control-spec.txt . */ * The various types are defined in control-spec.txt . */
@ -22,8 +24,6 @@ typedef enum circuit_status_minor_event_t {
CIRC_MINOR_EVENT_CANNIBALIZED, CIRC_MINOR_EVENT_CANNIBALIZED,
} circuit_status_minor_event_t; } circuit_status_minor_event_t;
#include "core/or/orconn_event.h"
/** Used to indicate the type of a stream event passed to the controller. /** Used to indicate the type of a stream event passed to the controller.
* The various types are defined in control-spec.txt */ * The various types are defined in control-spec.txt */
typedef enum stream_status_event_t { typedef enum stream_status_event_t {
@ -158,7 +158,7 @@ int control_event_server_error(const char *format, ...)
int control_event_guard(const char *nickname, const char *digest, int control_event_guard(const char *nickname, const char *digest,
const char *status); const char *status);
int control_event_conf_changed(const config_line_t *elements); int control_event_conf_changed(const struct config_line_t *elements);
int control_event_buildtimeout_set(buildtimeout_set_event_t type, int control_event_buildtimeout_set(buildtimeout_set_event_t type,
const char *args); const char *args);
int control_event_signal(uintptr_t signal); int control_event_signal(uintptr_t signal);