[or-cvs] r9721: Remove some XXX012s: leave a check in connection_or_set_iden (in tor/trunk: . src/or)
nickm at seul.org
nickm at seul.org
Sat Mar 3 21:55:35 UTC 2007
Author: nickm
Date: 2007-03-03 16:55:31 -0500 (Sat, 03 Mar 2007)
New Revision: 9721
Modified:
tor/trunk/
tor/trunk/src/or/connection_or.c
tor/trunk/src/or/main.c
Log:
r12053 at catbus: nickm | 2007-03-03 16:45:38 -0500
Remove some XXX012s: leave a check in connection_or_set_identity_digest it costs basically nothing to do on average. Forget about reinstating the user check on NT Service creation. Note that a notice message in main.c ("Is something wrong with your network connection?") is really useless.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r12053] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: tor/trunk/src/or/connection_or.c
===================================================================
--- tor/trunk/src/or/connection_or.c 2007-03-03 21:16:07 UTC (rev 9720)
+++ tor/trunk/src/or/connection_or.c 2007-03-03 21:55:31 UTC (rev 9721)
@@ -113,7 +113,6 @@
conn->next_with_same_id = tmp;
#if 1
- /*XXXX012 change this back to if 0. */
/* Testing code to check for bugs in representation. */
for (; tmp; tmp = tmp->next_with_same_id) {
tor_assert(!memcmp(tmp->identity_digest, digest, DIGEST_LEN));
Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c 2007-03-03 21:16:07 UTC (rev 9720)
+++ tor/trunk/src/or/main.c 2007-03-03 21:55:31 UTC (rev 9721)
@@ -536,6 +536,8 @@
severity = LOG_INFO;
else
severity = LOG_NOTICE;
+ /* XXXX012 rewrite this error message; it generates lots of worried
+ * support requests. */
log_fn(severity, LD_NET, "Something wrong with your network connection? "
"We tried to write %d bytes to addr %s (fd %d, type %s, state %d)"
" but timed out. (Marked at %s:%d)",
@@ -2278,7 +2280,7 @@
NULL, &sidLen, // Don't care about the SID
NULL, &domainLen, // Don't care about the domain
&sidUse) == 0) {
- /* XXXX012 For some reason, the above test segfaults. Fix that. */
+ /* XXXX For some reason, the above test segfaults. Fix that. */
printf("User \"%s\" doesn't seem to exist.\n", user_acct);
return -1;
} else {
More information about the tor-commits
mailing list