[or-cvs] commit some minor fixes from this sandbox so i can commit t...

[Roger Dingledine]

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

Modified Files:
	config.c connection.c connection_or.c 
Log Message:
commit some minor fixes from this sandbox so i can commit the next one


Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/config.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- config.c	4 Aug 2004 02:15:22 -0000	1.130
+++ config.c	15 Aug 2004 05:28:09 -0000	1.131
@@ -431,13 +431,6 @@
       log_fn(LOG_WARN,"Error obtaining local hostname");
       return -1;
     }
-#if 0 /* don't worry about complaining, as long as it resolves */
-    if(!strchr(localhostname,'.')) {
-      log_fn(LOG_WARN,"fqdn '%s' has only one element. Misconfigured machine?",address);
-      log_fn(LOG_WARN,"Try setting the Address line in your config file.");
-      return -1;
-    }
-#endif
     options->Address = tor_strdup(localhostname);
     log_fn(LOG_DEBUG,"Guessed local host name as '%s'",options->Address);
   }

Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection.c,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- connection.c	8 Aug 2004 11:15:38 -0000	1.247
+++ connection.c	15 Aug 2004 05:28:09 -0000	1.248
@@ -478,7 +478,8 @@
 
   s=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
   if (s < 0) {
-    log_fn(LOG_WARN,"Error creating network socket.");
+    log_fn(LOG_WARN,"Error creating network socket: %s",
+           tor_socket_strerror(tor_socket_errno(-1)));
     return -1;
   }
   set_socket_nonblocking(s);

Index: connection_or.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_or.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- connection_or.c	8 Aug 2004 10:32:36 -0000	1.123
+++ connection_or.c	15 Aug 2004 05:28:09 -0000	1.124
@@ -167,6 +167,7 @@
 
   /* this function should never be called if we're already connected to
    * id_digest, but check first to be sure */
+/*XXX008 this is getting called, at least by dirservers. */
   conn = connection_get_by_identity_digest(id_digest, CONN_TYPE_OR);
   if(conn) {
     tor_assert(conn->nickname);