diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:19:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:19:04 -0400 |
| commit | b80a8bba199b9adfb9c893641ba770566fa548e1 (patch) | |
| tree | 2fba8dea9940d46863834f139ed350f7c0eaeffb /src/or/control.h | |
| parent | 1ba1bdee4bd8f3c00e603fe9b0fd2f14eeb60466 (diff) | |
| parent | 1e69c60dccc358a7146c2b5e7825ea729498b41b (diff) | |
| download | tor-b80a8bba199b9adfb9c893641ba770566fa548e1.tar.gz tor-b80a8bba199b9adfb9c893641ba770566fa548e1.zip | |
Merge branch 'feature3049-v2' into maint-0.2.2
Conflicts:
src/common/Makefile.am
Diffstat (limited to 'src/or/control.h')
| -rw-r--r-- | src/or/control.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/control.h b/src/or/control.h index a73ed5d3c1..ddea4cd548 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -27,6 +27,8 @@ void control_ports_write_to_file(void); int connection_control_finished_flushing(control_connection_t *conn); int connection_control_reached_eof(control_connection_t *conn); +void connection_control_closed(control_connection_t *conn); + int connection_control_process_inbuf(control_connection_t *conn); #define EVENT_AUTHDIR_NEWDESCS 0x000D @@ -72,6 +74,8 @@ smartlist_t *decode_hashed_passwords(config_line_t *passwords); void disable_control_logging(void); void enable_control_logging(void); +void monitor_owning_controller_process(const char *process_spec); + void control_event_bootstrap(bootstrap_status_t status, int progress); void control_event_bootstrap_problem(const char *warn, int reason); |