[or-cvs] Instead of "Network down", say "Is your network connection ...

Nick Mathewson nickm at seul.org
Thu Dec 15 22:10:05 UTC 2005


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

Modified Files:
	main.c routerlist.c 
Log Message:
Instead of "Network down", say "Is your network connection down?"

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.602
retrieving revision 1.603
diff -u -p -d -r1.602 -r1.603
--- main.c	15 Dec 2005 20:44:15 -0000	1.602
+++ main.c	15 Dec 2005 22:10:03 -0000	1.603
@@ -513,7 +513,8 @@ directory_all_unreachable(time_t now)
 
   while ((conn = connection_get_by_type_state(CONN_TYPE_AP,
                                               AP_CONN_STATE_CIRCUIT_WAIT))) {
-    notice(LD_NET,"Network down? Failing connection to '%s:%d'.",
+    notice(LD_NET,
+           "Is your network connection down? Failing connection to '%s:%d'.",
            safe_str(conn->socks_request->address), conn->socks_request->port);
     connection_mark_unattached_ap(conn, END_STREAM_REASON_NET_UNREACHABLE);
   }

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -p -d -r1.401 -r1.402
--- routerlist.c	15 Dec 2005 21:44:23 -0000	1.401
+++ routerlist.c	15 Dec 2005 22:10:03 -0000	1.402
@@ -3343,7 +3343,8 @@ router_have_minimum_dir_info(void)
   if (!res && have_enough) {
     log(LOG_NOTICE, LD_DIR,"Our directory information is no longer up-to-date "
         "enough to build circuits.%s",
-        any_running ? "" : " (All servers seem down -- network down?)");
+        any_running ? "" :
+        " (No servers seem reachable -- is your network connection down?)");
   }
   have_enough = res;
   return res;



More information about the tor-commits mailing list