From b02b11c4b4dda362eb692e6b278f2855edd1e658 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Thu, 17 Sep 2009 01:58:39 -0400 Subject: [PATCH] a mish-mash of stuff in my sandbox --- doc/HACKING | 5 +---- doc/spec/control-spec.txt | 17 +++++++++++++++++ src/or/rendclient.c | 1 + src/or/rendservice.c | 4 ++-- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 3d3f2c1dfc..210f09f4ba 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -3,10 +3,7 @@ 0.0 The buildbot. - http://tor-buildbot.freehaven.net:8010/ - - - Down because nickm isn't running services at home any more. ioerror says - he will resurrect it. + https://buildbot.vidalia-project.net/one_line_per_build 0.1. Useful command-lines that are non-trivial to reproduce but can help with tracking bugs or leaks. diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt index 1a463afc60..f968fa851f 100644 --- a/doc/spec/control-spec.txt +++ b/doc/spec/control-spec.txt @@ -1496,6 +1496,23 @@ should just look at ACCEPTED_SERVER_DESCRIPTOR and should ignore this event for now.} + SERVER_DESCRIPTOR_STATUS + "STATUS=" "LISTED" / "UNLISTED" + We just got a new networkstatus consensus, and whether we're in + it or not in it has changed. Specifically, status is "listed" + if we're listed in it but previous to this point we didn't know + we were listed in a consensus; and status is "unlisted" if we + thought we should have been listed in it (e.g. we were listed in + the last one), but we're not. + + {Moving from listed to unlisted is not necessarily cause for + alarm. The relay might have failed a few reachability tests, + or the Internet might have had some routing problems. So this + feature is mainly to let relay operators know when their relay + has successfully been listed in the consensus.} + + [Not implemented yet. We should do this in 0.2.2.x. -RD] + NAMESERVER_STATUS "NS=addr" "STATUS=" "UP" / "DOWN" diff --git a/src/or/rendclient.c b/src/or/rendclient.c index fc8d05b6ad..35fa58ff5d 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -91,6 +91,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, } }); if (!intro_key) { + /* XXX022 Karsten: should this turn into a log_info, a la bug 1073? */ log_warn(LD_BUG, "Internal error: could not find intro key; we " "only have a v2 rend desc with %d intro points.", smartlist_len(entry->parsed->intro_nodes)); diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 7ae6009958..daf8247e55 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -264,7 +264,7 @@ rend_config_services(or_options_t *options, int validate_only) for (line = options->RendConfigLines; line; line = line->next) { if (!strcasecmp(line->key, "HiddenServiceDir")) { - if (service) { + if (service) { /* register the one we just finished parsing */ if (validate_only) rend_service_free(service); else @@ -1476,7 +1476,7 @@ rend_service_rendezvous_has_opened(origin_circuit_t *circuit) /* set the windows to default. these are the windows * that bob thinks alice has. */ - hop->package_window = circuit_initial_package_window();; + hop->package_window = circuit_initial_package_window(); hop->deliver_window = CIRCWINDOW_START; onion_append_to_cpath(&circuit->cpath, hop);