[or-cvs] Regenerate our local descriptor if it"s dirty and some local

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	router.c 
Log Message:
Regenerate our local descriptor if it's dirty and some local
function asks for it. This may resolve bug 286.


Index: router.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -p -d -r1.260 -r1.261
--- router.c	18 Apr 2006 03:07:24 -0000	1.260
+++ router.c	23 Apr 2006 23:09:03 -0000	1.261
@@ -760,8 +760,8 @@ router_get_my_routerinfo(void)
   if (!server_mode(get_options()))
     return NULL;
 
-  if (!desc_routerinfo) {
-    if (router_rebuild_descriptor(1))
+  if (!desc_routerinfo || !desc_clean_since) {
+    if (router_rebuild_descriptor(!desc_routerinfo))
       return NULL;
   }
   return desc_routerinfo;
@@ -774,10 +774,8 @@ const char *
 router_get_my_descriptor(void)
 {
   const char *body;
-  if (!desc_routerinfo) {
-    if (router_rebuild_descriptor(1))
-      return NULL;
-  }
+  if (!router_get_my_routerinfo())
+    return NULL;
   body = signed_descriptor_get_body(&desc_routerinfo->cache_info);
   log_debug(LD_GENERAL,"my desc is '%s'", body);
   return body;