- Moved TCP packet reception to meta handler: less kludgy and less buggy!

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index da39686..cd433d0 100644 (file)
--- 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.22 2000/08/07 16:27:28 guus Exp $
+    $Id: net.c,v 1.35.4.24 2000/08/08 17:07:47 guus Exp $
 */
 
 #include "config.h"
@@ -129,18 +129,70 @@ int xrecv(conn_list_t *cl, void *packet)
   int lenin;
 cp
   do_decrypt((real_packet_t*)packet, &vp, cl->key);
-cp
   add_mac_addresses(&vp);
-cp
+
   if(debug_lvl > 3)
     syslog(LOG_ERR, _("Receiving packet of %d bytes from %s (%s)"),
            ((real_packet_t*)packet)->len, cl->vpn_hostname, cl->real_hostname);
-cp
+
   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;
+
+  cl->want_ping = 0;
+  cl->last_ping_time = time(NULL);
+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
+       {
+          /* Can we add to queue? */
+         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
@@ -1093,53 +1145,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)
+                {
+                  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, _("Error while processing request from %s (%s)"),
-                         cl->vpn_hostname, cl->real_hostname);
+                  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;
         }
     }