diff options
| -rw-r--r-- | src/or/circuitbuild.c | 1 | ||||
| -rw-r--r-- | src/or/circuituse.c | 2 | ||||
| -rw-r--r-- | src/or/control.c | 1 | ||||
| -rw-r--r-- | src/or/directory.c | 4 | ||||
| -rw-r--r-- | src/or/dns.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 3 | ||||
| -rw-r--r-- | src/or/rendservice.c | 2 | ||||
| -rw-r--r-- | src/or/rephist.c | 6 | ||||
| -rw-r--r-- | src/or/router.c | 4 | ||||
| -rw-r--r-- | src/or/test.c | 2 |
10 files changed, 9 insertions, 18 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index e49b461320..9a68a636b0 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1420,7 +1420,6 @@ count_acceptable_routers(smartlist_t *routers) } if (r->is_valid == 0) { // log_debug(LD_CIRC,"Nope, the directory says %d is not valid.",i); - /* XXXX009 But invalid routers *are* sometimes acceptable. */ goto next_i_loop; } num++; diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 1d79e62cf7..2aec912c17 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1057,7 +1057,7 @@ consider_recording_trackhost(connection_t *conn, circuit_t *circ) SMARTLIST_FOREACH(options->TrackHostExits, const char *, cp, { if (cp[0] == '.') { /* match end */ - /* XXX strstr is probably really bad here */ + /* XXX strstr is probably really bad here. */ if ((str = strstr(conn->socks_request->address, &cp[1]))) { if (str == conn->socks_request->address || strcmp(str, &cp[1]) == 0) { diff --git a/src/or/control.c b/src/or/control.c index c19042704e..7dcdf99910 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1595,7 +1595,6 @@ handle_control_getinfo(connection_t *conn, uint32_t len, const char *body) for (i = 0; i < smartlist_len(answers); i += 2) { char *k = smartlist_get(answers, i); char *v = smartlist_get(answers, i+1); - /*XXXX Not an adequate test! XXXX011 */ if (!strchr(v, '\n') && !strchr(v, '\r')) { connection_printf_to_buf(conn, "250-%s=", k); connection_write_str_to_buf(v, conn); diff --git a/src/or/directory.c b/src/or/directory.c index e191ae0d06..98ffeae320 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -534,8 +534,8 @@ directory_send_command(connection_t *conn, const char *platform, httpcommand = "GET"; /* Request the most recent versioned descriptor. */ - // XXXX011 - //tor_snprintf(url, sizeof(url), "/tor/rendezvous1/%s", resource); + // (XXXX We were going to switch this to fetch rendezvous1 descriptors, + // but that never got testing, and it wasn't a good design.) len = strlen(resource)+32; url = tor_malloc(len); tor_snprintf(url, len, "/tor/rendezvous/%s", resource); diff --git a/src/or/dns.c b/src/or/dns.c index d782039353..ebbc5b75bd 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -725,7 +725,7 @@ connection_dns_process_inbuf(connection_t *conn) connection_fetch_from_buf(&success,1,conn); connection_fetch_from_buf((char *)&addr,sizeof(uint32_t),conn); log_warn(LD_EXIT,"Discarding idle dns answer (success %d, addr %d.)", - success, addr); // XXX safe_str + success, addr); } return 0; } diff --git a/src/or/or.h b/src/or/or.h index d21fcd5110..49d4aaf15d 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -865,7 +865,8 @@ typedef struct local_routerstatus_t { */ } local_routerstatus_t; -/*XXXX011 make this configurable? */ +/** How many times will we try to download a router's descriptor before giving + * up? */ #define MAX_ROUTERDESC_DOWNLOAD_FAILURES 8 /** Contents of a (v2 or later) network status object. */ diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 81a70ff391..45454985ed 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -515,7 +515,6 @@ rend_service_introduce(circuit_t *circuit, const char *request, rp_nickname = buf; version = 0; } - /* XXX when 0.1.0.x is obsolete, change this to reject version < 2. */ ptr=memchr(rp_nickname,0,nickname_field_len); if (!ptr || ptr == rp_nickname) { log_warn(LD_PROTOCOL, @@ -1072,7 +1071,6 @@ rend_consider_services_upload(time_t now) * descriptor and ours has been stable for 5 seconds, upload a * new one of each format. */ upload_service_descriptor(service, 0); - // XXXX011 upload_service_descriptor(service, 1); service->next_upload_time = now + rendpostperiod; } } diff --git a/src/or/rephist.c b/src/or/rephist.c index 5f8923bef7..0790084597 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -217,10 +217,8 @@ rep_hist_note_connection_died(const char* id, time_t when) { or_history_t *hist; if (!id) { - /* XXXX009 Well, everybody has an ID now. Hm. */ - /* If conn has no nickname, it's either an OP, or it is an OR - * which didn't complete its handshake (or did and was unapproved). - * Ignore it. + /* If conn has no nickname, it didn't complete its handshake, or something + * went wrong. Ignore it. */ return; } diff --git a/src/or/router.c b/src/or/router.c index b48339397c..16174acdc7 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -237,10 +237,6 @@ init_key_from_file(const char *fname) int init_keys(void) { - /* XXX009 Two problems with how this is called: - * 1. It should be idempotent for servers, so we can call init_keys - * as much as we need to. - */ char keydir[512]; char keydir2[512]; char fingerprint[FINGERPRINT_LEN+1]; diff --git a/src/or/test.c b/src/or/test.c index 2fff4d7097..407abbf159 100644 --- a/src/or/test.c +++ b/src/or/test.c @@ -1311,7 +1311,7 @@ test_dir_format(void) { char d[DIGEST_LEN]; const char *m; - /* XXXX NM re-enable. 011 */ + /* XXXX NM re-enable. */ /* Make sure routers aren't too far in the past any more. */ r1.cache_info.published_on = time(NULL); r2.cache_info.published_on = time(NULL)-3*60*60; |