diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-10-23 05:51:46 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-10-23 05:51:46 +0000 |
| commit | 2a1c2947172998278e38050f17ad4857079e17e7 (patch) | |
| tree | a182e4ac1be32a0b553ba6a624b933ab20195343 /src | |
| parent | c804eea39dd91cdbeacba5698adafc0295a949bb (diff) | |
| download | tor-2a1c2947172998278e38050f17ad4857079e17e7.tar.gz tor-2a1c2947172998278e38050f17ad4857079e17e7.zip | |
implement a few status events, so we can make sure they work,
and so vidalia can start handling them if it wants.
svn:r8802
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuitbuild.c | 1 | ||||
| -rw-r--r-- | src/or/control.c | 2 | ||||
| -rw-r--r-- | src/or/main.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 239c4e198c..3b33bdfba7 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -608,6 +608,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) log(LOG_NOTICE, LD_GENERAL, "Tor has successfully opened a circuit. " "Looks like client functionality is working."); + control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED"); if (server_mode(options) && !check_whether_orport_reachable()) { inform_testing_reachability(); consider_testing_reachability(1, 1); diff --git a/src/or/control.c b/src/or/control.c index 502c38a6c0..8d099ffc87 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2420,7 +2420,7 @@ handle_control_usefeature(control_connection_t *conn, /* remove this in 0.1.2.4; EXTENDED_FORMAT only ever worked for a * little while during 0.1.2.2-alpha-dev. */ log_warn(LD_GENERAL, - "EXTENDED_FORMAT is deprecated; use EXTENDED_EVENTS instead."); + "EXTENDED_FORMAT is deprecated; use EXTENDED_EVENTS instead."); extended_events = 1; } else { connection_printf_to_buf(conn, "552 Unrecognized feature \"%s\"\r\n", diff --git a/src/or/main.c b/src/or/main.c index b51028ca80..87dd579b21 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -140,6 +140,8 @@ connection_add(connection_t *conn) if (n_conns >= get_options()->_ConnLimit-1) { log_warn(LD_NET,"Failing because we have %d connections already. Please " "raise your ulimit -n.", n_conns); + control_event_general_status(LOG_WARN, "TOO_MANY_CONNECTIONS CURRENT=%d", + n_conns); return -1; } |