From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 30 Apr 2007 05:36:41 +0000 (+0000)
Subject:  r12557@catbus:  nickm | 2007-04-30 01:36:39 -0400
X-Git-Tag: tor-0.2.0.1-alpha~226
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=313ac313be7189860114fdd31fcaab1b0de7393a;p=thirdparty%2Ftor.git

 r12557@catbus:  nickm | 2007-04-30 01:36:39 -0400
 Oops; the rest of the last patch. If that one gets backported, this should too.


svn:r10053
---

diff --git a/src/or/or.h b/src/or/or.h
index 32b7288357..c44504156a 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3094,6 +3094,8 @@ char *networkstatus_getinfo_helper_single(routerstatus_t *rs);
 int getinfo_helper_networkstatus(control_connection_t *conn,
                                  const char *question, char **answer);
 
+void routerlist_assert_ok(routerlist_t *rl);
+
 /********************************* routerparse.c ************************/
 
 #define MAX_STATUS_TAG_LEN 32
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index c211d7c1c6..697731ac78 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -33,7 +33,6 @@ static void trusted_dir_server_free(trusted_dir_server_t *ds);
 static void update_networkstatus_cache_downloads(time_t now);
 static void update_networkstatus_client_downloads(time_t now);
 static int signed_desc_digest_is_recognized(signed_descriptor_t *desc);
-static void routerlist_assert_ok(routerlist_t *rl);
 static int have_tried_downloading_all_statuses(int n_failures);
 static routerstatus_t *networkstatus_find_entry(networkstatus_t *ns,
                                                 const char *digest);
@@ -4668,13 +4667,13 @@ getinfo_helper_networkstatus(control_connection_t *conn,
 
 /** Assert that the internal representation of <b>rl</b> is
  * self-consistent. */
-static void
+void
 routerlist_assert_ok(routerlist_t *rl)
 {
   digestmap_iter_t *iter;
   routerinfo_t *r2;
   signed_descriptor_t *sd2;
-  if (!rl);
+  if (!rl)
     return;
   SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r,
   {