[or-cvs] Resolve" all XXX011 items, mostly by marking them non-011.
Nick Mathewson
nickm at seul.org
Tue Apr 18 03:05:37 UTC 2006
Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv3332/src/or
Modified Files:
Tag: tor-0_1_1-patches
circuitbuild.c circuituse.c control.c directory.c dns.c or.h
rendservice.c rephist.c router.c test.c
Log Message:
"Resolve" all XXX011 items, mostly by marking them non-011.
Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.230
retrieving revision 1.230.2.1
diff -u -p -d -r1.230 -r1.230.2.1
--- circuitbuild.c 2 Apr 2006 22:59:59 -0000 1.230
+++ circuitbuild.c 18 Apr 2006 03:05:34 -0000 1.230.2.1
@@ -1420,7 +1420,6 @@ count_acceptable_routers(smartlist_t *ro
}
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++;
Index: circuituse.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuituse.c,v
retrieving revision 1.124
retrieving revision 1.124.2.1
diff -u -p -d -r1.124 -r1.124.2.1
--- circuituse.c 9 Apr 2006 21:36:37 -0000 1.124
+++ circuituse.c 18 Apr 2006 03:05:34 -0000 1.124.2.1
@@ -1057,7 +1057,7 @@ consider_recording_trackhost(connection_
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) {
Index: control.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/control.c,v
retrieving revision 1.189
retrieving revision 1.189.2.1
diff -u -p -d -r1.189 -r1.189.2.1
--- control.c 2 Apr 2006 22:19:01 -0000 1.189
+++ control.c 18 Apr 2006 03:05:34 -0000 1.189.2.1
@@ -1595,7 +1595,6 @@ handle_control_getinfo(connection_t *con
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);
Index: directory.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.370
retrieving revision 1.370.2.1
diff -u -p -d -r1.370 -r1.370.2.1
--- directory.c 10 Apr 2006 01:35:56 -0000 1.370
+++ directory.c 18 Apr 2006 03:05:34 -0000 1.370.2.1
@@ -534,8 +534,8 @@ directory_send_command(connection_t *con
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);
Index: dns.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/dns.c,v
retrieving revision 1.182
retrieving revision 1.182.2.1
diff -u -p -d -r1.182 -r1.182.2.1
--- dns.c 19 Mar 2006 03:55:48 -0000 1.182
+++ dns.c 18 Apr 2006 03:05:34 -0000 1.182.2.1
@@ -725,7 +725,7 @@ connection_dns_process_inbuf(connection_
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;
}
Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.824.2.2
retrieving revision 1.824.2.3
diff -u -p -d -r1.824.2.2 -r1.824.2.3
--- or.h 10 Apr 2006 21:33:32 -0000 1.824.2.2
+++ or.h 18 Apr 2006 03:05:34 -0000 1.824.2.3
@@ -886,7 +886,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. */
Index: rendservice.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/rendservice.c,v
retrieving revision 1.159
retrieving revision 1.159.2.1
diff -u -p -d -r1.159 -r1.159.2.1
--- rendservice.c 19 Mar 2006 01:21:59 -0000 1.159
+++ rendservice.c 18 Apr 2006 03:05:34 -0000 1.159.2.1
@@ -515,7 +515,6 @@ rend_service_introduce(circuit_t *circui
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;
}
}
Index: rephist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/rephist.c,v
retrieving revision 1.84
retrieving revision 1.84.2.1
diff -u -p -d -r1.84 -r1.84.2.1
--- rephist.c 26 Mar 2006 06:51:26 -0000 1.84
+++ rephist.c 18 Apr 2006 03:05:34 -0000 1.84.2.1
@@ -217,10 +217,8 @@ rep_hist_note_connection_died(const char
{
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;
}
Index: router.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.259
retrieving revision 1.259.2.1
diff -u -p -d -r1.259 -r1.259.2.1
--- router.c 27 Mar 2006 05:30:16 -0000 1.259
+++ router.c 18 Apr 2006 03:05:34 -0000 1.259.2.1
@@ -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];
Index: test.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/test.c,v
retrieving revision 1.224
retrieving revision 1.224.2.1
diff -u -p -d -r1.224 -r1.224.2.1
--- test.c 27 Mar 2006 02:25:34 -0000 1.224
+++ test.c 18 Apr 2006 03:05:34 -0000 1.224.2.1
@@ -1324,7 +1324,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;
More information about the tor-commits
mailing list