[or-cvs] r9279: control-spec: upcase arguments in status events; note unimpl (in tor/trunk: . doc src/or)
nickm at seul.org
nickm at seul.org
Sat Jan 6 05:42:35 UTC 2007
Author: nickm
Date: 2007-01-06 00:42:31 -0500 (Sat, 06 Jan 2007)
New Revision: 9279
Modified:
tor/trunk/
tor/trunk/ChangeLog
tor/trunk/doc/control-spec.txt
tor/trunk/src/or/buffers.c
tor/trunk/src/or/circuituse.c
tor/trunk/src/or/config.c
tor/trunk/src/or/control.c
tor/trunk/src/or/directory.c
tor/trunk/src/or/or.h
tor/trunk/src/or/router.c
tor/trunk/src/or/routerlist.c
Log:
r11824 at Kushana: nickm | 2007-01-03 17:15:28 -0500
control-spec: upcase arguments in status events; note unimplemented events individually
r11825 at Kushana: nickm | 2007-01-03 17:41:43 -0500
Implement EXTERNAL IP server status event.
r11826 at Kushana: nickm | 2007-01-03 17:47:10 -0500
Implement BAD_SERVER_DESCRIPTOR server status event.
r11827 at Kushana: nickm | 2007-01-03 18:01:56 -0500
Implement SOCKS_UNKNOWN_PROTOCOL and DANGEROUS_SOCKS client events.
r11828 at Kushana: nickm | 2007-01-03 18:23:22 -0500
Implement BUG controller events. Also, flush ERR-level status events just like ERR-level log messages.
r11829 at Kushana: nickm | 2007-01-03 23:37:27 -0500
Yet more status events: CLOCK_SKEW, GOOD/ACCEPTED_SERVER_DESCRIPTOR, {CHECKING_}REACHABILITY_{SUCCEEDED|FAILED}
r11833 at Kushana: nickm | 2007-01-05 16:56:37 -0500
Note some unimplementedness in control-spec.txt
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r11858] on c95137ef-5f19-0410-b913-86e773d04f59
Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog 2007-01-06 05:41:01 UTC (rev 9278)
+++ tor/trunk/ChangeLog 2007-01-06 05:42:31 UTC (rev 9279)
@@ -1,3 +1,26 @@
+Changes in version 0.1.2.6-alpha - 2007-??-??
+ o Minor features (controller):
+ - Implement EXTERNAL_ADDRESS server status event so controllers can
+ learn when our address changes.
+ - Implement BAD_SERVER_DESCRIPTOR server status event so controllers
+ can learn when directories reject our descriptor.
+ - Implement SOCKS_UNKNOWN_PROTOCOL client status event so controllers
+ can learn when a client application is speaking a non-socks protocol
+ to our SocksPort.
+ - Implement DANGEROUS_SOCKS client status event so controllers
+ can learn when a client application is leaking DNS addresses.
+ - Implement BUG general status event so controllers can learn when
+ Tor is unhappy about its internal invariants.
+ - Implement CLOCK_SKEW general status event so controllers can learn
+ when Tor thinks the system clock is set incorrectly.
+ - Implement GOOD_SERVER_DESCRIPTOR and ACCEPTED_SERVER_DESCRIPTOR
+ server status events so controllers can learn when their descriptors
+ are accepted by a directory.
+ - Implement CHECKING_REACHABILITY and REACHABILITY_{SUCCEEDED|FAILED}
+ server status events so controllers can learn about Tor's progress in
+ deciding whether it's reachable from the outside.
+
+
Changes in version 0.1.2.5-alpha - 2007-01-06
o Major features:
- Enable write limiting as well as read limiting. Now we sacrifice
@@ -159,6 +182,9 @@
when the last second's write or read exceeds the allotted bandwidth.
- Report "unrecognized key" rather than an empty string when the
controller tries to fetch a networkstatus that doesn't exist.
+ - Flush ERR-level status events just like we currently flush ERR-level
+ log events, so that a Tor shutdown doesn't prevent the controller from
+ learning about current events.
Changes in version 0.1.2.4-alpha - 2006-12-03
Modified: tor/trunk/doc/control-spec.txt
===================================================================
--- tor/trunk/doc/control-spec.txt 2007-01-06 05:41:01 UTC (rev 9278)
+++ tor/trunk/doc/control-spec.txt 2007-01-06 05:42:31 UTC (rev 9279)
@@ -962,7 +962,8 @@
Severity = "NOTICE" / "WARN" / "ERR"
Action is a string, and Arguments is a series of keyword=value
- pairs on the same line.
+ pairs on the same line. Values may be space-terminated strings,
+ or quoted strings.
These events are always produced with EXTENDED_EVENTS and
VERBOSE_NAMES; see the explanations in the USEFEATURE section
@@ -971,7 +972,7 @@
Actions for STATUS_GENERAL events can be as follows:
CLOCK_JUMPED
- "time=NUM"
+ "TIME=NUM"
Tor spent enough time without CPU cycles that it has closed all
its circuits and will establish them anew. This typically
happens when a laptop goes to sleep and then wakes up again. It
@@ -995,20 +996,19 @@
typically severity WARN events:
DANGEROUS_VERSION
- "current=version"
- "reason=new/old/unrecommended"
- "recommended=\"version, version, ...\""
+ "CURRENT=version"
+ "REASON=NEW/OLD/UNRECOMMENDED"
+ "RECOMMENDED=\"version, version, ...\""
TOO_MANY_CONNECTIONS
- "current=NUM"
+ "CURRENT=NUM"
Tor has reached its ulimit -n or whatever the native limit is on
file descriptors or sockets. The user should really do something
about this. The "current" argument shows the number of connections
currently open.
- [rest not implemented yet]
BUG
- "reason=STRING"
+ "REASON=STRING"
Tor has encountered a situation that its developers never expected,
and the developers would like to learn that it happened. Perhaps
the controller can explain this to the user and encourage her to
@@ -1018,19 +1018,24 @@
not DIR_ALL_UNREACHABLE, else as ERRs:]
BAD_DIR_RESPONSE
+ [unimplemented]
// unexpected dir response. behind a hotel/airport firewall?
CLOCK_SKEWED
- // (either from talking to a dir authority, or from perusing a
- // network-status timestamp)
+ SKEW="+" / "-" SECONDS
+ SOURCE="DIRSERV:IP:Port" / "NETWORKSTATUS:IP:PORT"
+ If "SKEW" is present, it's an estimate of how far we are from the
+ time declared in the source. If the source is a DIRSERV, we got
+ the current time from a connection to a dirserver. If the source is
+ a NETWORKSTATUS, we decided we're skewed because we got a
+ networkstatus from far in the future.
Actions for STATUS_GENERAL severity ERR events can be as follows:
-[unimplemented]
BAD_PROXY
+ [unimplemented]
// bad http or https proxy?
-[implemented]
DIR_ALL_UNREACHABLE
Tor believes that none of the known directory servers are
reachable -- this is most likely because the local network is
@@ -1038,7 +1043,6 @@
user why Tor appears to be broken.
Actions for STATUS_CLIENT severity NOTICE events can be as follows:
- [all implemented]
ENOUGH_DIR_INFO
Tor now knows enough network-status documents and enough server
@@ -1063,7 +1067,7 @@
if it can identify the problem.]
CIRCUIT_NOT_ESTABLISHED
- "reason=" "EXTERNAL_ADDRESS" / "DIR_ALL_UNREACHABLE" / "CLOCK_JUMPED"
+ "REASON=" "EXTERNAL_ADDRESS" / "DIR_ALL_UNREACHABLE" / "CLOCK_JUMPED"
We are no longer confident that we can build circuits. The "reason"
keyword provides an explanation: which other status event type caused
our lack of confidence.
@@ -1072,19 +1076,23 @@
[Note: only REASON=CLOCK_JUMPED is implemented currently.]
Actions for STATUS_CLIENT severity WARN events can be as follows:
- [none implemented yet]
DANGEROUS_SOCKS
- "protocol=socks4/socks4a/socks5"
- "address=IP:port"
+ "PROTOCOL=SOCKS4/SOCKS4a/SOCKS5"
+ "ADDRESS=IP:port"
+ A connection was made to Tor's SOCKS port that used a raw IP
+ address. If the client application got this address from
+ gethostbyname(), it's leaking target addresses via DNS.
SOCKS_UNKNOWN_PROTOCOL
+ "DATA=string"
A connection was made to Tor's SOCKS port that tried to use it
for something other than the SOCKS protocol. Perhaps the user is
- using Tor as an HTTP proxy?
+ using Tor as an HTTP proxy? The DATA is the first few characters
+ sent to Tor on the SOCKS port.
BAD_HOSTNAME
-
+ [unimplemented]
// a nickname we asked for is unavailable. no need for this
// quite yet, since no end-user controllers let you configure that.
@@ -1093,47 +1101,73 @@
[none yet]
Actions for STATUS_SERVER severity NOTICE events can be as follows:
- [none implemented yet]
EXTERNAL_ADDRESS
- "address=IP"
- "method=guessed/resolved/..."
+ "ADDRESS=IP"
+ "HOSTNAME=NAME"
+ "METHOD=CONFIGURED/DIRSERV/RESOLVED/INTERFACE/GETHOSTNAME"
+ Our best idea for our externally visible IP has changed to 'IP'.
+ If 'NAME' is present, we got the new IP by resolving 'NAME'. If the
+ method is 'CONFIGURED', the IP was given verbatim as a configuration
+ option. If the method is 'RESOLVED', we resolved the Address
+ configuration option to get the IP. If the method is 'GETHOSTNAME',
+ we resolved our hostname to get the IP. If the method is 'INTERFACE',
+ we got the address of one of our network interfaces to get the IP. If
+ the method is 'DIRSERV', a directory server told us a guess for what
+ our IP might be.
// hibernating
CHECKING_REACHABILITY
- "oraddress=IP:port"
- "diraddress=IP:port"
- "timeout=NUM"
+ "ORADDRESS=IP:port"
+ "DIRADDRESS=IP:port"
+ "TIMEOUT=NUM" [timeout unimplemented]
+ We're going to start testing the reachability of our external OR port
+ or directory port.
+ REACHABILITY_SUCCEEDED
+ "ORADDRESS=IP:port"
+ "DIRADDRESS=IP:port"
+ We successfully verified the reachability of our external OR port or
+ directory port.
+
GOOD_SERVER_DESCRIPTOR
We successfully uploaded our server descriptor to each of the
directory authorities, with no complaints.
Actions for STATUS_SERVER severity WARN events can be as follows:
- [not implemented yet]
// something about failing to parse our address?
// from resolve_my_address() in config.c
+ [unimplemented]
// sketchy libevent, sketchy OS, sketchy threading
+ [unimplemented]
// too many onions queued. threading problem or slow cpu?
+ [unimplemented]
// eventdns statements. like, hijacked dns.
+ [unimplemented]
BAD_SERVER_DESCRIPTOR
- "dirauth=nickname"
- "reason=string"
- // dir authorities didn't like my descriptor, e.g. because they
- // think it's malformed, you're invalid, or wrong key.
+ "DIRAUTH=addr:port"
+ "REASON=string"
+ A directory authority rejected our descriptor. Possible reasons
+ include malformed descriptors, incorrect keys, highly skewed clocks,
+ and so on.
+ ACCEPTED_SERVER_DESCRIPTOR
+ "DIRAUTH=addr:port"
+ A single directory authority accepted our descriptor.
+
Actions for STATUS_SERVER severity ERR events can be as follows:
- [not implemented yet]
REACHABILITY_FAILED
- "oraddress=IP:port"
- "diraddress=IP:port"
+ "ORADDRESS=IP:port"
+ "DIRADDRESS=IP:port"
+ We failed to connect to our external OR port or directory port
+ successfully.
Controllers must tolerate hearing about actions that they don't
recognize.
Modified: tor/trunk/src/or/buffers.c
===================================================================
--- tor/trunk/src/or/buffers.c 2007-01-06 05:41:01 UTC (rev 9278)
+++ tor/trunk/src/or/buffers.c 2007-01-06 05:42:31 UTC (rev 9279)
@@ -1022,6 +1022,9 @@
"TorFAQ#SOCKSAndDNS.%s", req->port,
safe_socks ? " Rejecting." : "");
// have_warned_about_unsafe_socks = 1; // (for now, warn every time)
+ control_event_client_status(LOG_WARN,
+ "DANGEROUS_SOCKS PROTOCOL=SOCKS5 ADDRESS=%s:%d",
+ req->address, req->port);
if (safe_socks)
return -1;
}
@@ -1125,6 +1128,9 @@
"TorFAQ#SOCKSAndDNS.%s", req->port,
safe_socks ? " Rejecting." : "");
// have_warned_about_unsafe_socks = 1; // (for now, warn every time)
+ control_event_client_status(LOG_WARN,
+ "DANGEROUS_SOCKS PROTOCOL=SOCKS4 ADDRESS=%s:%d",
+ tmpbuf, req->port);
if (safe_socks)
return -1;
}
@@ -1200,6 +1206,13 @@
log_warn(LD_APP,
"Socks version %d not recognized. (Tor is not an http proxy.)",
*(buf->cur));
+ {
+ char *tmp = tor_strndup(buf->cur, 8);
+ control_event_client_status(LOG_WARN,
+ "SOCKS_UNKNOWN_PROTOCOL DATA=\"%s\"",
+ escaped(tmp));
+ tor_free(tmp);
+ }
return -1;
}
}
Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c 2007-01-06 05:41:01 UTC (rev 9278)
+++ tor/trunk/src/or/circuituse.c 2007-01-06 05:42:31 UTC (rev 9279)
@@ -622,12 +622,17 @@
static void
circuit_testing_failed(origin_circuit_t *circ, int at_last_hop)
{
+ routerinfo_t *me = router_get_my_routerinfo();
if (server_mode(get_options()) && check_whether_orport_reachable())
return;
+ if (!me)
+ return;
log_info(LD_GENERAL,
"Our testing circuit (to see if your ORPort is reachable) "
"has failed. I'll try again later.");
+ control_event_server_status(LOG_WARN, "REACHABILITY_FAILED ORADDRESS=%s:%d",
+ me->address, me->or_port);
/* These aren't used yet. */
(void)circ;
Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c 2007-01-06 05:41:01 UTC (rev 9278)
+++ tor/trunk/src/or/config.c 2007-01-06 05:42:31 UTC (rev 9279)
@@ -1801,6 +1801,7 @@
char hostname[256];
int explicit_ip=1;
int explicit_hostname=1;
+ int from_interface=0;
char tmpbuf[INET_NTOA_BUF_LEN];
const char *address = options->Address;
int notice_severity = warn_severity <= LOG_NOTICE ?
@@ -1843,6 +1844,7 @@
"Could not get local interface IP address. Failing.");
return -1;
}
+ from_interface = 1;
in.s_addr = htonl(interface_ip);
tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf));
log_fn(notice_severity, LD_CONFIG, "Learned IP address '%s' for "
@@ -1872,6 +1874,7 @@
"Interface IP address '%s' is a private address too. "
"Ignoring.", tmpbuf);
} else {
+ from_interface = 1;
in.s_addr = htonl(interface_ip);
tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf));
log_fn(notice_severity, LD_CONFIG,
@@ -1914,6 +1917,24 @@
log_notice(LD_NET, "Your IP address seems to have changed. Updating.");
ip_address_changed(0);
}
+ if (last_resolved_addr != *addr_out) {
+ const char *method;
+ const char *h = hostname;
+ if (explicit_ip) {
+ method = "CONFIGURED";
+ h = NULL;
+ } else if (explicit_hostname) {
+ method = "RESOLVED";
+ } else if (from_interface) {
+ method = "INTERFACE";
+ h = NULL;
+ } else {
+ method = "GETHOSTNAME";
+ }
+ control_event_server_status(LOG_NOTICE,
+ "EXTERNAL_ADDRESS ADDRESS=%s METHOD=%s %s%s",
+ tmpbuf, method, h?"HOSTNAME=":"", h);
+ }
last_resolved_addr = *addr_out;
if (hostname_out)
*hostname_out = tor_strdup(hostname);
Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c 2007-01-06 05:41:01 UTC (rev 9278)
+++ tor/trunk/src/or/control.c 2007-01-06 05:42:31 UTC (rev 9279)
@@ -314,7 +314,8 @@
break;
}
}
- if (EVENT_IS_INTERESTING(EVENT_LOG_OBSOLETE)) {
+ if (EVENT_IS_INTERESTING(EVENT_LOG_OBSOLETE) ||
+ EVENT_IS_INTERESTING(EVENT_STATUS_GENERAL)) {
if (min_log_event > EVENT_NOTICE_MSG)
min_log_event = EVENT_NOTICE_MSG;
if (max_log_event < EVENT_ERR_MSG)
@@ -661,8 +662,17 @@
continue;
}
if (control_conn->event_mask & (1<<event)) {
+ int is_err = 0;
connection_write_to_buf(msg, strlen(msg), TO_CONN(control_conn));
if (event == EVENT_ERR_MSG)
+ is_err = 1;
+ else if (event == EVENT_STATUS_GENERAL)
+ is_err = !strcmpstart(msg, "STATUS_GENERAL ERR ");
+ else if (event == EVENT_STATUS_CLIENT)
+ is_err = !strcmpstart(msg, "STATUS_CLIENT ERR ");
+ else if (event == EVENT_STATUS_SERVER)
+ is_err = !strcmpstart(msg, "STATUS_SERVER ERR ");
+ if (is_err)
connection_handle_write(TO_CONN(control_conn), 1);
}
}
@@ -3326,14 +3336,22 @@
/** We got a log message: tell any interested control connections. */
void
-control_event_logmsg(int severity, unsigned int domain, const char *msg)
+control_event_logmsg(int severity, uint32_t domain, const char *msg)
{
int oldlog, event;
- (void) domain;
if (disable_log_messages)
return;
+ if (domain == LD_BUG && EVENT_IS_INTERESTING(EVENT_STATUS_GENERAL) &&
+ severity <= LOG_NOTICE) {
+ char *esc = esc_for_log(msg);
+ ++disable_log_messages;
+ control_event_general_status(severity, "BUG REASON=\"%s\"", esc);
+ --disable_log_messages;
+ tor_free(esc);
+ }
+
oldlog = EVENT_IS_INTERESTING0(EVENT_LOG_OBSOLETE) &&
(severity == LOG_NOTICE || severity == LOG_WARN || severity == LOG_ERR);
event = log_severity_to_event(severity);
Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c 2007-01-06 05:41:01 UTC (rev 9278)
+++ tor/trunk/src/or/directory.c 2007-01-06 05:42:31 UTC (rev 9279)
@@ -117,6 +117,8 @@
if (!post_to_hidserv_only &&
!(ds->is_v1_authority || ds->is_v2_authority))
continue;
+ if (purpose == DIR_PURPOSE_UPLOAD_DIR)
+ ds->has_accepted_serverdesc = 0;
post_via_tor = purpose_is_private(purpose) ||
!fascist_firewall_allows_address_dir(ds->addr, ds->dir_port);
directory_initiate_command_routerstatus(rs, purpose, post_via_tor,
@@ -286,6 +288,22 @@
payload, payload_len);
}
+/** DOCDOC */
+static int
+directory_conn_is_self_reachability_test(dir_connection_t *conn)
+{
+ if (conn->requested_resource &&
+ !strcmpstart(conn->requested_resource,"authority")) {
+ routerinfo_t *me = router_get_my_routerinfo();
+ if (me &&
+ router_digest_is_me(conn->identity_digest) &&
+ me->addr == conn->_base.addr &&
+ me->dir_port == conn->_base.port)
+ return 1;
+ }
+ return 0;
+}
+
/** Called when we are unable to complete the client's request to a directory
* server due to a network error: Mark the router as down and try again if
* possible.
@@ -302,6 +320,14 @@
conn->_base.address, conn->_base.port);
directory_get_from_dirserver(conn->_base.purpose, NULL,
0 /* don't retry_if_no_servers */);
+
+ if (directory_conn_is_self_reachability_test(conn)) {
+ routerinfo_t *me = router_get_my_routerinfo();
+ if (me)
+ control_event_server_status(LOG_WARN,
+ "REACHABILITY_FAILED DIRADDRESS=%s:%d",
+ me->address, me->dir_port);
+ }
} else if (conn->_base.purpose == DIR_PURPOSE_FETCH_NETWORKSTATUS) {
log_info(LD_DIR, "Giving up on directory server at '%s'; retrying",
conn->_base.address);
@@ -920,8 +946,8 @@
now = time(NULL);
delta = now-date_header;
if (abs(delta)>ALLOW_DIRECTORY_TIME_SKEW) {
- log_fn(router_digest_is_trusted_dir(conn->identity_digest) ?
- LOG_WARN : LOG_INFO,
+ int trusted = router_digest_is_trusted_dir(conn->identity_digest);
+ log_fn(trusted ? LOG_WARN : LOG_INFO,
LD_HTTP,
"Received directory with skewed time (server '%s:%d'): "
"we are %d minutes %s, or the directory is %d minutes %s.",
@@ -929,6 +955,9 @@
abs(delta)/60, delta>0 ? "ahead" : "behind",
abs(delta)/60, delta>0 ? "behind" : "ahead");
skewed = 1; /* don't check the recommended-versions line */
+ control_event_general_status(trusted ? LOG_WARN : LOG_NOTICE,
+ "CLOCK_SKEW SKEW=%d SOURCE=DIRSERV:%s:%d",
+ delta, conn->_base.address, conn->_base.port);
} else {
log_debug(LD_HTTP, "Time on received directory is within tolerance; "
"we are %d seconds skewed. (That's okay.)", delta);
@@ -1173,28 +1202,43 @@
SMARTLIST_FOREACH(which, char *, cp, tor_free(cp));
smartlist_free(which);
}
- if (conn->requested_resource &&
- !strcmpstart(conn->requested_resource,"authority")) {
- /* this might have been a dirport reachability test. see if it is. */
- routerinfo_t *me = router_get_my_routerinfo();
- if (me &&
- router_digest_is_me(conn->identity_digest) &&
- me->addr == conn->_base.addr &&
- me->dir_port == conn->_base.port)
- router_dirport_found_reachable();
- }
+ if (directory_conn_is_self_reachability_test(conn))
+ router_dirport_found_reachable();
}
if (conn->_base.purpose == DIR_PURPOSE_UPLOAD_DIR) {
switch (status_code) {
- case 200:
- log_info(LD_GENERAL,"eof (status 200) after uploading server "
- "descriptor: finished.");
+ case 200: {
+ int all_done = 1;
+ trusted_dir_server_t *ds =
+ router_get_trusteddirserver_by_digest(conn->identity_digest);
+ smartlist_t *servers;
+ log_info(LD_GENERAL,"eof (status 200) after uploading server "
+ "descriptor: finished.");
+ control_event_server_status(
+ LOG_NOTICE, "ACCEPTED_SERVER_DESCRIPTOR DIRAUTH=%s:%d",
+ conn->_base.address, conn->_base.port);
+
+ ds->has_accepted_serverdesc = 1;
+ servers = router_get_trusted_dir_servers();
+ SMARTLIST_FOREACH(servers, trusted_dir_server_t *, d, {
+ if ((d->is_v1_authority || d->is_v2_authority) &&
+ !d->has_accepted_serverdesc) {
+ all_done = 0;
+ break;
+ }
+ });
+ if (all_done)
+ control_event_server_status(LOG_NOTICE, "GOOD_SERVER_DESCRIPTOR");
+ }
break;
case 400:
log_warn(LD_GENERAL,"http status 400 (%s) response from "
"dirserver '%s:%d'. Please correct.",
escaped(reason), conn->_base.address, conn->_base.port);
+ control_event_server_status(LOG_WARN,
+ "BAD_SERVER_DESCRIPTOR DIRAUTH=%s:%d REASON=\"%s\"",
+ conn->_base.address, conn->_base.port, escaped(reason));
break;
case 403:
log_warn(LD_GENERAL,
@@ -1204,6 +1248,9 @@
"private IP address? See http://tor.eff.org/doc/"
"tor-doc-server.html",escaped(reason), conn->_base.address,
conn->_base.port);
+ control_event_server_status(LOG_WARN,
+ "BAD_SERVER_DESCRIPTOR DIRAUTH=%s:%d REASON=\"%s\"",
+ conn->_base.address, conn->_base.port, escaped(reason));
break;
default:
log_warn(LD_GENERAL,
Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h 2007-01-06 05:41:01 UTC (rev 9278)
+++ tor/trunk/src/or/or.h 2007-01-06 05:42:31 UTC (rev 9279)
@@ -2717,6 +2717,9 @@
unsigned int is_v2_authority:1;
/** True iff this server is an authority for hidden services. */
unsigned int is_hidserv_authority:1;
+ /** True iff this server has accepted the most recent server descriptor
+ * we tried to upload to it. */
+ unsigned int has_accepted_serverdesc:1;
int n_networkstatus_failures; /**< How many times have we asked for this
* server's network-status unsuccessfully? */
Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c 2007-01-06 05:41:01 UTC (rev 9278)
+++ tor/trunk/src/or/router.c 2007-01-06 05:42:31 UTC (rev 9279)
@@ -457,6 +457,9 @@
!orport_reachable ? "reachability" : "bandwidth",
me->address, me->or_port);
circuit_launch_by_router(CIRCUIT_PURPOSE_TESTING, 0, me, 0, 1, 1);
+ control_event_server_status(LOG_NOTICE,
+ "CHECKING_REACHABILITY ORADDRESS=%s:%d",
+ me->address, me->or_port);
}
if (test_dir && !check_whether_dirport_reachable() &&
@@ -466,6 +469,9 @@
/* ask myself, via tor, for my server descriptor. */
directory_initiate_command_router(me, DIR_PURPOSE_FETCH_SERVERDESC,
1, "authority", NULL, 0);
+ control_event_server_status(LOG_NOTICE,
+ "CHECKING_REACHABILITY DIRADDRESS=%s:%d",
+ me->address, me->dir_port);
}
}
@@ -474,12 +480,18 @@
router_orport_found_reachable(void)
{
if (!can_reach_or_port) {
+ routerinfo_t *me = router_get_my_routerinfo();
log_notice(LD_OR,"Self-testing indicates your ORPort is reachable from "
"the outside. Excellent.%s",
get_options()->PublishServerDescriptor ?
" Publishing server descriptor." : "");
can_reach_or_port = 1;
mark_my_descriptor_dirty();
+ if (!me)
+ return;
+ control_event_server_status(LOG_NOTICE,
+ "REACHABILITY_SUCCEEDED ORADDRESS=%s:%d",
+ me->address, me->dir_port);
}
}
@@ -488,10 +500,16 @@
router_dirport_found_reachable(void)
{
if (!can_reach_dir_port) {
+ routerinfo_t *me = router_get_my_routerinfo();
log_notice(LD_DIRSERV,"Self-testing indicates your DirPort is reachable "
"from the outside. Excellent.");
can_reach_dir_port = 1;
mark_my_descriptor_dirty();
+ if (!me)
+ return;
+ control_event_server_status(LOG_NOTICE,
+ "REACHABILITY_SUCCEEDED DIRADDRESS=%s:%d",
+ me->address, me->dir_port);
}
}
@@ -1034,6 +1052,9 @@
* us an answer different from what we had the last time we managed to
* resolve it. */
if (last_guessed_ip != addr) {
+ control_event_server_status(LOG_NOTICE,
+ "EXTERNAL_ADDRESS ADDRESS=%s METHOD=DIRSERV",
+ suggestion);
log_addr_has_changed(LOG_NOTICE, last_guessed_ip, addr);
ip_address_changed(0);
last_guessed_ip = addr; /* router_rebuild_descriptor() will fetch it */
Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c 2007-01-06 05:41:01 UTC (rev 9278)
+++ tor/trunk/src/or/routerlist.c 2007-01-06 05:42:31 UTC (rev 9279)
@@ -2346,6 +2346,9 @@
"(%s GMT). Somebody is skewed here: check your clock. "
"Not caching.",
source_desc, published);
+ control_event_general_status(LOG_WARN,
+ "CLOCK_SKEW SOURCE=NETWORKSTATUS:%s:%d",
+ ns->source_address, ns->source_dirport);
skewed = 1;
}
More information about the tor-commits
mailing list