X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=93be1cbc418aa418755b94bb7e4ab845a0e8d12e;hp=ce60eeac5436a03b60851f60b52a2958381d562d;hb=fdc6a2f106315cd9ed22943d8c0bd279631e66b4;hpb=18c85caac36f7236454deef11b9eba74328dbd96

diff --git a/src/net.c b/src/net.c
index ce60eeac..93be1cbc 100644
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.14 2000/06/29 17:09:05 guus Exp $
+    $Id: net.c,v 1.35.4.21 2000/08/07 14:52:15 guus Exp $
 */
 
 #include "config.h"
@@ -107,16 +107,19 @@ cp
     syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
            ntohs(rp.len), cl->vpn_hostname, cl->real_hostname);
 
+  total_socket_out += r;
+
+  cl->want_ping = 1;
+
+  if((cl->flags | myself->flags) & TCPONLY)
+      return send_tcppacket(cl, packet, ntohs(rp.len));
+
   if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
     {
       syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
              cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
-
-  total_socket_out += r;
-
-  cl->want_ping = 1;
 cp
   return 0;
 }
@@ -508,7 +511,8 @@ cp
   cl->meta_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
   if(cl->meta_socket == -1)
     {
-      syslog(LOG_ERR, _("Creating socket failed: %m"));
+      syslog(LOG_ERR, _("Creating socket for %s port %d failed: %m"),
+             cl->real_hostname, cl->port);
       return -1;
     }
 
@@ -525,11 +529,13 @@ cp
   flags = fcntl(cl->meta_socket, F_GETFL);
   if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0)
     {
-      syslog(LOG_ERR, _("fcntl: %m"));
+      syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
+             cl->real_hostname, cl->port);
       return -1;
     }
 
-  syslog(LOG_INFO, _("Connected to %s port %hd"),
+  if(debug_lvl > 0)
+    syslog(LOG_INFO, _("Connected to %s port %hd"),
          cl->real_hostname, cl->port);
 cp
   return 0;
@@ -542,13 +548,20 @@ cp
   an authentication sequence during which
   we will do just that.
 */
-int setup_outgoing_connection(ip_t ip)
+int setup_outgoing_connection(char *hostname)
 {
   conn_list_t *ncn;
+  struct hostent *h;
 cp
+  if(!(h = gethostbyname(hostname)))
+    {
+      syslog(LOG_ERR, _("Error looking up `%s': %m"), hostname);
+      return -1;
+    }
+
   ncn = new_conn_list();
-  ncn->real_ip = ip;
-  ncn->real_hostname = hostlookup(htonl(ip));
+  ncn->real_ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
+  ncn->real_hostname = hostlookup(htonl(ncn->real_ip));
   
   if(setup_outgoing_meta_socket(ncn) < 0)
     {
@@ -596,6 +609,10 @@ cp
     if(cfg->data.val == stupid_true)
       myself->flags |= EXPORTINDIRECTDATA;
 
+  if(cfg = get_config_val(tcponly))
+    if(cfg->data.val == stupid_true)
+      myself->flags |= TCPONLY;
+
   if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
     {
       syslog(LOG_ERR, _("Unable to set up a listening socket"));
@@ -625,7 +642,7 @@ cp
 
   while(cfg)
     {
-      if(!setup_outgoing_connection(cfg->data.ip->ip))   /* function returns 0 when there are no problems */
+      if(!setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
         {
           signal(SIGALRM, SIG_IGN);
           return;
@@ -636,11 +653,11 @@ cp
   signal(SIGALRM, sigalrm_handler);
   upstreamindex = 0;
   seconds_till_retry += 5;
-  if(seconds_till_retry>300)    /* Don't wait more than 5 minutes. */
-    seconds_till_retry = 300;
-  alarm(seconds_till_retry);
+  if(seconds_till_retry > MAXTIMEOUT)    /* Don't wait more than MAXTIMEOUT seconds. */
+    seconds_till_retry = MAXTIMEOUT;
   syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"),
 	 seconds_till_retry);
+  alarm(seconds_till_retry);
 cp
 }
 
@@ -668,16 +685,16 @@ cp
 
   while(cfg)
     {
-      if(!setup_outgoing_connection(cfg->data.ip->ip))   /* function returns 0 when there are no problems */
+      if(!setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
         return 0;
       cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
     }
     
   signal(SIGALRM, sigalrm_handler);
   upstreamindex = 0;
-  seconds_till_retry = 300;
+  seconds_till_retry = MAXTIMEOUT;
+  syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
   alarm(seconds_till_retry);
-  syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 minutes"));
 cp
   return 0;
 }
@@ -751,7 +768,8 @@ cp
   flags = fcntl(nfd, F_GETFL);
   if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
     {
-      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"), __FILE__, __LINE__, nfd);
+      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, nfd,
+             cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
 
@@ -779,7 +797,6 @@ cp
       return NULL;
     }
 
-  p->vpn_hostname = _("unknown");
   p->real_ip = ntohl(ci.sin_addr.s_addr);
   p->real_hostname = hostlookup(ci.sin_addr.s_addr);
   p->meta_socket = sfd;
@@ -794,7 +811,7 @@ cp
 
   if(send_basic_info(p) < 0)
     {
-      free(p);
+      free_conn_element(p);
       return NULL;
     }
 cp
@@ -838,12 +855,14 @@ int handle_incoming_vpn_data(conn_list_t *cl)
 cp
   if(getsockopt(cl->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
     {
-      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"), __FILE__, __LINE__, cl->socket);
+      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, cl->socket,
+             cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
   if(x)
     {
-      syslog(LOG_ERR, _("Incoming data socket error: %s"), sys_errlist[x]);
+      syslog(LOG_ERR, _("Incoming data socket error for %s (%s): %s"),
+             cl->vpn_hostname, cl->real_hostname, sys_errlist[x]);
       return -1;
     }
 
@@ -851,7 +870,7 @@ cp
   lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL);
   if(lenin <= 0)
     {
-      syslog(LOG_ERR, _("Receiving packet from %s failed: %m"), cl->real_hostname);
+      syslog(LOG_ERR, _("Receiving packet from %s (%s) failed: %m"), cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
   total_socket_in += lenin;
@@ -904,54 +923,47 @@ cp
 
   if(cl->status.timeout)
     send_timeout(cl);
-  else if(!cl->status.termreq)
+/*  else if(!cl->status.termreq)
     send_termreq(cl);
-
-  close(cl->socket);
+ */
+ 
+  if(cl->socket)
+    close(cl->socket);
   if(cl->status.meta)
     close(cl->meta_socket);
 
-  if(cl->status.outgoing)
-    {
-      signal(SIGALRM, sigalrm_handler);
-      seconds_till_retry = 5;
-      alarm(seconds_till_retry);
-      syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
-    }
-  
   cl->status.remove = 1;
 
   /* If this cl isn't active, don't send any DEL_HOSTs. */
-  if(!cl->status.active)
-    return;
+  if(cl->status.active)
+    notify_others(cl,NULL,send_del_host);
     
-  cl->status.active = 0;
-  notify_others(cl,NULL,send_del_host);
-  
 cp
   /* Find all connections that were lost because they were behind cl
      (the connection that was dropped). */
   if(cl->status.meta)
     for(p = conn_list; p != NULL; p = p->next)
       {
-        if(p->nexthop == cl)
+        if((p->nexthop == cl) && (p != cl))
           {
-            if(p->status.active)
+            if(cl->status.active && p->status.active)
               notify_others(p,cl,send_del_host);
+           if(cl->socket)
+             close(cl->socket);
 	    p->status.active = 0;
 	    p->status.remove = 1;
           }
       }
     
-cp 
-  /* Then send a notification about all these connections to all hosts
-     that are still connected to us.
-  for(p = conn_list; p != NULL; p = p->next)
-    if(p->status.active && p->status.meta)
-      for(q = conn_list; q != NULL; q = q->next)
-	if(q->status.remove)
-	  send_del_host(p, q);
-   */
+  cl->status.active = 0;
+  
+  if(cl->status.outgoing)
+    {
+      signal(SIGALRM, sigalrm_handler);
+      seconds_till_retry = 5;
+      alarm(seconds_till_retry);
+      syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
+    }
 cp
 }
 
@@ -1015,7 +1027,7 @@ cp
       return -1;
     }
 
-  if((ncn = create_new_connection(nfd)) == NULL)
+  if(!(ncn = create_new_connection(nfd)))
     {
       shutdown(nfd, 2);
       close(nfd);
@@ -1041,12 +1053,14 @@ int handle_incoming_meta_data(conn_list_t *cl)
 cp
   if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
     {
-      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"), __FILE__, __LINE__, cl->meta_socket);
+      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, cl->meta_socket,
+             cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
   if(x)
     {
-      syslog(LOG_ERR, _("Metadata socket error: %s"), sys_errlist[x]);
+      syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
+             cl->vpn_hostname, cl->real_hostname, sys_errlist[x]);
       return -1;
     }
 
@@ -1062,7 +1076,13 @@ cp
     {
       if(errno==EINTR)
         return 0;      
-      syslog(LOG_ERR, _("Metadata socket read error: %m"));
+      if(errno==0)
+        if(debug_lvl>0)
+          syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
+                 cl->vpn_hostname, cl->real_hostname);
+      else
+        syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
+               cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
 
@@ -1242,10 +1262,26 @@ cp
 
       if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
         {
-	  if(errno == EINTR) /* because of alarm */
-	    continue;
-          syslog(LOG_ERR, _("Error while waiting for input: %m"));
-          return;
+	  if(errno != EINTR) /* because of alarm */
+            {
+              syslog(LOG_ERR, _("Error while waiting for input: %m"));
+              return;
+            }
+        }
+
+      if(sighup)
+        {
+          sighup = 0;
+          close_network_connections();
+          clear_config();
+          if(read_config_file(configfilename))
+            {
+              syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
+              exit(0);
+            }
+          sleep(5);
+          setup_network_connections();
+          continue;
         }
 
       if(last_ping_check + timeout < time(NULL))
@@ -1253,14 +1289,16 @@ cp
 	{
 	  check_dead_connections();
           last_ping_check = time(NULL);
-	  continue;
 	}
 
-      check_network_activity(&fset);
+      if(r > 0)
+        {
+          check_network_activity(&fset);
 
-      /* local tap data */
-      if(FD_ISSET(tap_fd, &fset))
-	handle_tap_input();
+          /* local tap data */
+          if(FD_ISSET(tap_fd, &fset))
+	    handle_tap_input();
+        }
     }
 cp
 }