diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:23:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:23:53 -0400 |
| commit | 2527acb2dc8b71515ac0c882e3af4fc034ab1b48 (patch) | |
| tree | 48bdb4a6919a11fdb337969bb46353701895ad54 /src/or/control.h | |
| parent | cb7fff193e2749f241e646b155de3ee33623606e (diff) | |
| parent | b80a8bba199b9adfb9c893641ba770566fa548e1 (diff) | |
| download | tor-2527acb2dc8b71515ac0c882e3af4fc034ab1b48.tar.gz tor-2527acb2dc8b71515ac0c882e3af4fc034ab1b48.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/Makefile.am
src/or/control.c
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 f8b8a990a5..147a5af0bb 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 @@ -73,6 +75,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); |