summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-09-17 01:58:39 -0400
committerRoger Dingledine <arma@torproject.org>2009-09-17 01:58:39 -0400
commitb02b11c4b4dda362eb692e6b278f2855edd1e658 (patch)
tree9e99c1800d31a1c6bb213475af2a370c53d6b5b7 /src/or
parentee89061ef29dfd6df7057eadbad4a491548f622c (diff)
downloadtor-b02b11c4b4dda362eb692e6b278f2855edd1e658.tar.gz
tor-b02b11c4b4dda362eb692e6b278f2855edd1e658.zip
a mish-mash of stuff in my sandbox
Diffstat (limited to 'src/or')
-rw-r--r--src/or/rendclient.c1
-rw-r--r--src/or/rendservice.c4
2 files changed, 3 insertions, 2 deletions
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);