Checkpoint in-progress fixes:

Add 'testing' circuit purpose, for reachability testing.
Notice when our IP changes, and reset stats.
Try to pull down a directory via Tor to see if our DirPort is working.
Try to extend a circuit back to us to see if our ORPort is working.
Only publish a descriptor if they're both reachable.

These mostly work, and I'd better get them in before I cause conflicts.


svn:r3703

1 files changed, 2 insertions, 2 deletions

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 360d46d865..dfd37363f1 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -66,7 +66,7 @@ int router_reload_router_list(void)
     if (routerlist &&
         ((routerlist->published_on > time(NULL) - MIN_ONION_KEY_LIFETIME/2)
          || is_recent)) {
-      directory_has_arrived(st.st_mtime); /* do things we've been waiting to do */
+      directory_has_arrived(st.st_mtime, NULL); /* do things we've been waiting to do */
     }
     tor_free(s);
   }
@@ -634,11 +634,11 @@ routerinfo_t *router_get_by_digest(const char *digest) {
   routerinfo_t *router;
 
   tor_assert(digest);
-  if (!routerlist) return NULL;
   if (server_mode(get_options()) &&
       (router = router_get_my_routerinfo()) &&
       !memcmp(digest, router->identity_digest, DIGEST_LEN))
     return router;
+  if (!routerlist) return NULL;
 
   for (i=0;i<smartlist_len(routerlist->routers);i++) {
     router = smartlist_get(routerlist->routers, i);