X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=7d780608d6f9b64d276fd407355c938629fd5b35;hp=a1757c5b6b05e44e63396a6c43336bd504171355;hb=9acd4379f705edc8b736e21b9011434e63f7dd95;hpb=0f9ad1f047efec53590dc43f07d225e5f20456cb

diff --git a/src/net.c b/src/net.c
index a1757c5b..7d780608 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.15 2000/06/29 19:47:03 guus Exp $
+    $Id: net.c,v 1.35.4.26 2000/08/09 14:02:16 guus Exp $
 */
 
 #include "config.h"
@@ -95,7 +95,6 @@ cp
 
 int xsend(conn_list_t *cl, void *packet)
 {
-  int r;
   real_packet_t rp;
 cp
   do_encrypt((vpn_packet_t*)packet, &rp, cl->key);
@@ -107,16 +106,19 @@ cp
     syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
            ntohs(rp.len), cl->vpn_hostname, cl->real_hostname);
 
-  if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
+  total_socket_out += ntohs(rp.len);
+
+  cl->want_ping = 1;
+
+  if((cl->flags | myself->flags) & TCPONLY)
+      return send_tcppacket(cl, (void*)&rp, ntohs(rp.len));
+
+  if((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;
 }
@@ -144,6 +146,59 @@ cp
   return 0;
 }
 
+int tcprecv(conn_list_t *cl, real_packet_t *rp)
+{
+  vpn_packet_t vp;
+  int lenin;
+  conn_list_t *f;
+cp
+  rp->data.len = ntohs(rp->data.len);
+  rp->len = ntohs(rp->len);
+  rp->from = ntohl(rp->from);
+
+  total_socket_in += rp->len;
+
+  if(rp->len >= 0)
+    {
+      f = lookup_conn(rp->from);
+      if(!f)
+	{
+	  syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"),
+		 cl->vpn_hostname, cl->real_hostname, IP_ADDR_V(rp->from));
+	  return -1;
+	}
+
+      if(f->status.validkey)
+        {
+          do_decrypt(rp, &vp, cl->key);
+          add_mac_addresses(&vp);
+
+          if(debug_lvl > 3)
+            syslog(LOG_ERR, _("Receiving packet of %d bytes from %s (%s)"),
+                   rp->len, cl->vpn_hostname, cl->real_hostname);
+
+          if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
+            syslog(LOG_ERR, _("Can't write to tap device: %m"));
+          else
+            total_tap_out += lenin;
+        }
+      else
+	{
+          add_queue(&(cl->sq), rp, rp->len + 2);
+	  if(!cl->status.waitingforkey)
+	    send_key_request(rp->from);
+	}
+
+      if(my_key_expiry <= time(NULL))
+	regenerate_keys();
+    }
+
+  cl->want_ping = 0;
+  cl->last_ping_time = time(NULL);
+cp
+  return 0;
+}
+
 /*
   add the given packet of size s to the
   queue q, be it the send or receive queue
@@ -405,6 +460,7 @@ int setup_listen_meta_socket(int port)
   int nfd, flags;
   struct sockaddr_in a;
   const int one = 1;
+  config_t const *cfg;
 cp
   if((nfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
     {
@@ -418,6 +474,12 @@ cp
       return -1;
     }
 
+  if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
+    {
+      syslog(LOG_ERR, _("setsockopt: %m"));
+      return -1;
+    }
+
   flags = fcntl(nfd, F_GETFL);
   if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
     {
@@ -425,10 +487,23 @@ cp
       return -1;
     }
 
+  if((cfg = get_config_val(interface)))
+    {
+      if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, cfg->data.ptr, strlen(cfg->data.ptr)))
+        {
+          syslog(LOG_ERR, _("Unable to bind listen socket to interface %s: %m"), cfg->data.ptr);
+          return -1;
+        }
+    }
+
   memset(&a, 0, sizeof(a));
   a.sin_family = AF_INET;
   a.sin_port = htons(port);
-  a.sin_addr.s_addr = htonl(INADDR_ANY);
+  
+  if((cfg = get_config_val(interfaceip)))
+    a.sin_addr.s_addr = htonl(cfg->data.ip->ip);
+  else
+    a.sin_addr.s_addr = htonl(INADDR_ANY);
 
   if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
     {
@@ -508,7 +583,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 +601,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 +620,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)
     {
@@ -592,10 +677,14 @@ cp
   else
     myself->port = cfg->data.val;
 
-  if(cfg = get_config_val(indirectdata))
+  if((cfg = get_config_val(indirectdata)))
     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 +714,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 +725,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 +757,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 +840,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 +869,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;
@@ -838,12 +927,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 +942,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;
@@ -892,7 +983,7 @@ cp
 */
 void terminate_connection(conn_list_t *cl)
 {
-  conn_list_t *p, *q;
+  conn_list_t *p;
 
 cp
   if(cl->status.remove)
@@ -1034,12 +1125,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;
     }
 
@@ -1049,13 +1142,21 @@ cp
       return -1;
     }
 
-  lenin = read(cl->meta_socket, cl->buffer, MAXBUFSIZE-cl->buflen);
+  lenin = read(cl->meta_socket, cl->buffer, MAXBUFSIZE - cl->buflen);
 
   if(lenin<=0)
     {
       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;
     }
 
@@ -1064,53 +1165,71 @@ cp
 
   for(;;)
     {
-      cl->reqlen = 0;
-
-      for(i = oldlen; i < cl->buflen; i++)
+      if(cl->tcppacket)
         {
-          if(cl->buffer[i] == '\n')
+          if(cl->buflen >= cl->tcppacket)
+            {
+              tcprecv(cl, (real_packet_t *)cl->buffer);
+              cl->buflen -= cl->tcppacket;
+              memmove(cl->buffer, cl->buffer + cl->tcppacket, cl->buflen);
+              oldlen = 0;
+              cl->tcppacket=0;
+            }
+          else
             {
-              cl->buffer[i] = 0;  /* replace end-of-line by end-of-string so we can use sscanf */
-              cl->reqlen = i + 1;
               break;
             }
         }
-
-      if(cl->reqlen)
+      else
         {
-          if(debug_lvl > 2)
-            syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
-                         cl->vpn_hostname, cl->real_hostname, cl->buffer);
-          if(sscanf(cl->buffer, "%d", &request) == 1)
+          cl->reqlen = 0;
+
+          for(i = oldlen; i < cl->buflen; i++)
             {
-              if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
+              if(cl->buffer[i] == '\n')
                 {
-                  syslog(LOG_ERR, _("Unknown request from %s (%s)"),
-                         cl->vpn_hostname, cl->real_hostname);
-                  return -1;
+                  cl->buffer[i] = 0;  /* replace end-of-line by end-of-string so we can use sscanf */
+                  cl->reqlen = i + 1;
+                  break;
                 }
+            }
 
-              if(request_handlers[request](cl))  /* Something went wrong. Probably scriptkiddies. Terminate. */
+          if(cl->reqlen)
+            {
+              if(debug_lvl > 2)
+                syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
+                             cl->vpn_hostname, cl->real_hostname, cl->buffer);
+              if(sscanf(cl->buffer, "%d", &request) == 1)
                 {
-                  syslog(LOG_ERR, _("Error while processing request from %s (%s)"),
-                         cl->vpn_hostname, cl->real_hostname);
+                  if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
+                    {
+                      syslog(LOG_ERR, _("Unknown request from %s (%s)"),
+                             cl->vpn_hostname, cl->real_hostname);
+                      return -1;
+                    }
+
+                  if(request_handlers[request](cl))  /* Something went wrong. Probably scriptkiddies. Terminate. */
+                    {
+                      syslog(LOG_ERR, _("Error while processing request from %s (%s)"),
+                             cl->vpn_hostname, cl->real_hostname);
+                      return -1;
+                    }
+                }
+              else
+                {
+                  syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
+                             cl->vpn_hostname, cl->real_hostname);
                   return -1;
                 }
+
+              cl->buflen -= cl->reqlen;
+              memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
+              oldlen = 0;
             }
           else
             {
-              syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
-                         cl->vpn_hostname, cl->real_hostname);
-              return -1;
+              break;
             }
-
-          cl->buflen -= cl->reqlen;
-          memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
-          oldlen = 0;
-        }
-      else
-        {
-          break;
         }
     }
 
@@ -1244,19 +1363,16 @@ cp
 
       if(sighup)
         {
+          sighup = 0;
           close_network_connections();
           clear_config();
           if(read_config_file(configfilename))
             {
-              syslog(LOG_ERR, _("Unable to reread configuration file, exitting"));
+              syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
               exit(0);
             }
-          if(setup_network_connections())
-            {
-              syslog(LOG_ERR, _("Unable to restart, exitting"));
-              exit(0);
-            }
-          sighup = 0;
+          sleep(5);
+          setup_network_connections();
           continue;
         }
 
@@ -1265,14 +1381,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
 }