From 4b266c6e72254d848b2ca4f594c0b41770104d81 Mon Sep 17 00:00:00 2001 From: Robert Ransom Date: Sun, 15 May 2011 08:23:04 -0700 Subject: Implement __OwningControllerProcess option Implements part of feature 3049. --- src/or/control.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/or/control.h') diff --git a/src/or/control.h b/src/or/control.h index 2ae96b4b8..81c23010d 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -70,6 +70,8 @@ smartlist_t *decode_hashed_passwords(config_line_t *passwords); void disable_control_logging(void); void enable_control_logging(void); +int 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); -- cgit v1.2.3 From b3133d1cadec0540105a855b1fd2eb741d4eec9d Mon Sep 17 00:00:00 2001 From: Robert Ransom Date: Mon, 16 May 2011 10:25:59 -0700 Subject: Exit immediately if we can't monitor our owning controller process tor_process_monitor_new can't currently return NULL, but if it ever can, we want that to be an explicitly fatal error, without relying on the fact that monitor_owning_controller_process's chain of caller will exit if it fails. --- src/or/control.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/or/control.h') diff --git a/src/or/control.h b/src/or/control.h index 81c23010d..a83e3747e 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -70,7 +70,7 @@ smartlist_t *decode_hashed_passwords(config_line_t *passwords); void disable_control_logging(void); void enable_control_logging(void); -int monitor_owning_controller_process(const char *process_spec); +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); -- cgit v1.2.3 From 338a0266101e3addecbaf5771f62a860244896b3 Mon Sep 17 00:00:00 2001 From: Robert Ransom Date: Thu, 19 May 2011 16:27:51 -0700 Subject: Split control connection cleanup out of connection_free --- src/or/control.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/or/control.h') diff --git a/src/or/control.h b/src/or/control.h index a83e3747e..6694c9643 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -25,6 +25,8 @@ void control_adjust_event_log_severity(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 -- cgit v1.2.3