[or-cvs] Do not check whether DirPort is reachable when we are suppr...

[Nick Mathewson]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv19307/src/or

Modified Files:
	router.c 
Log Message:
Do not check whether DirPort is reachable when we are suppressing it because of hibernation. (Backport candidate)

Index: router.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -r1.218 -r1.219
--- router.c	7 Oct 2005 18:56:21 -0000	1.218
+++ router.c	12 Oct 2005 04:07:10 -0000	1.219
@@ -402,8 +402,10 @@
 check_whether_dirport_reachable(void)
 {
   or_options_t *options = get_options();
+  routerinfo_t *ri = router_get_my_routerinfo();
   return !options->DirPort ||
          options->AssumeReachable ||
+         (ri && !ri->dir_port) ||
          can_reach_dir_port;
 }