[or-cvs] r9131: Mark some TODO items as done. Also, never include ourself in (in tor/trunk: . doc src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2006-12-15 16:26:15 -0500 (Fri, 15 Dec 2006)
New Revision: 9131

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/doc/TODO
   tor/trunk/src/or/router.c
Log:
 r11596@Kushana:  nickm | 2006-12-15 10:57:12 -0500
 Mark some TODO items as done.  Also, never include ourself in our family list.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r11596] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2006-12-15 21:08:26 UTC (rev 9130)
+++ tor/trunk/ChangeLog	2006-12-15 21:26:15 UTC (rev 9131)
@@ -47,6 +47,9 @@
     - Fix a bug in 0.1.2.2-alpha that prevented clients from asking
       to resolve an address at a given exit node even when they ask for
       it by name.
+    - Routers no longer ever list themselves in their "family" line,
+      even if configured to do so.  This makes it easier to configure
+      family lists efficiently.
 
   o Controller features:
     - Have GETINFO dir/status/* work on hosts with DirPort disabled.

Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO	2006-12-15 21:08:26 UTC (rev 9130)
+++ tor/trunk/doc/TODO	2006-12-15 21:26:15 UTC (rev 9131)
@@ -247,7 +247,7 @@
       - What do we do about the fact that people can't read zlib-
         compressed files manually?
 
-  - Add IPv6 support to eventdns.c
+  o Add IPv6 support to eventdns.c
 
   - Refactor DNS resolve implementation
     - Refactor exit side of resolve: do we need a connection_t?
@@ -284,15 +284,15 @@
   o Some way for the authorities to set BadExit for some nodes manually.
   - When we export something from foo.c file for testing purposes only,
     make a foo_test.h file for test.c to include.
-  - "getinfo fingerprint" controller command
-  - "setevent guards" controller command
+  o "getinfo fingerprint" controller command
+  o "setevent guards" controller command
   - The Debian package now uses --verify-config when (re)starting,
     to distinguish configuration errors from other errors. Perhaps
     the RPM and other startup scripts should too?
   - add a "default.action" file to the tor/vidalia bundle so we can fix the
     https thing in the default configuration:
     http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#PrivoxyWeirdSSLPort
-  - even if your torrc lists yourself in your myfamily line, don't list it in
+  o even if your torrc lists yourself in your myfamily line, don't list it in
     the descriptor.
   - Flesh out options_description array in src/or/config.c
   - Don't let 'newnym' be triggered more often than every n seconds.

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2006-12-15 21:08:26 UTC (rev 9130)
+++ tor/trunk/src/or/router.c	2006-12-15 21:26:15 UTC (rev 9131)
@@ -882,6 +882,9 @@
          }
          smartlist_add(ri->declared_family, name);
          name = NULL;
+       } else if (router_is_me(member)) {
+         /* Don't list ourself in our own family; that's redundant */
+         continue;
        } else {
          char *fp = tor_malloc(HEX_DIGEST_LEN+2);
          fp[0] = '$';