Remove all unnecessary status.meta and status.active checks.

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 289d0b8..e4ebb42 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,7 +1,7 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
+                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,11 +17,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: meta.c,v 1.1.2.12 2000/11/20 19:12:12 guus Exp $
+    $Id: meta.c,v 1.1.2.20 2001/07/20 13:54:19 guus Exp $
 */
 
 #include "config.h"
 #include <utils.h>
+#include <avl_tree.h>
 
 #include <errno.h>
 #include <syslog.h>
@@ -31,11 +32,7 @@
 /* This line must be below the rest for FreeBSD */
 #include <sys/socket.h>
 
-#ifdef HAVE_OPENSSL_EVP_H
-# include <openssl/evp.h>
-#else
-# include <evp.h>
-#endif
+#include <openssl/evp.h>
 
 #include "net.h"
 #include "connection.h"
@@ -44,15 +41,13 @@
 
 int send_meta(connection_t *cl, char *buffer, int length)
 {
-  char outbuf[MAXBUFSIZE];
   char *bufp;
   int outlen;
+  char outbuf[MAXBUFSIZE];
 cp
   if(debug_lvl >= DEBUG_META)
-    syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s): %s"), length,
-           cl->name, cl->hostname, buffer);
-
-  buffer[length-1]='\n';
+    syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
+           cl->name, cl->hostname);
 
   if(cl->status.encryptout)
     {
@@ -74,13 +69,13 @@ cp
 
 void broadcast_meta(connection_t *cl, char *buffer, int length)
 {
-  rbl_t *rbl;
+  avl_node_t *node;
   connection_t *p;
 cp
-  RBL_FOREACH(connection_tree, rbl)
+  for(node = connection_tree->head; node; node = node->next)
     {
-      p = (connection_t *)rbl->data;
-      if(p != cl && p->status.meta && p->status.active)
+      p = (connection_t *)node->data;
+      if(p != cl && p->status.active)
         send_meta(p, buffer, length);
     }
 cp
@@ -90,9 +85,9 @@ int receive_meta(connection_t *cl)
 {
   int x, l = sizeof(x);
   int oldlen, i;
-  int lenin = 0;
+  int lenin, reqlen;
+  int decrypted = 0;
   char inbuf[MAXBUFSIZE];
-  char *bufp;
 cp
   if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
     {
@@ -107,63 +102,94 @@ cp
       return -1;
     }
 
-  if(cl->status.decryptin)
-    bufp = inbuf;
-  else
-    bufp = cl->buffer + cl->buflen;
+  /* Strategy:
+     - Read as much as possible from the TCP socket in one go.
+     - Decrypt it.
+     - Check if a full request is in the input buffer.
+       - If yes, process request and remove it from the buffer,
+         then check again.
+       - If not, keep stuff in buffer and exit.
+   */
 
-  lenin = read(cl->meta_socket, bufp, MAXBUFSIZE - cl->buflen);
+  lenin = read(cl->meta_socket, cl->buffer + cl->buflen, MAXBUFSIZE - cl->buflen);
 
   if(lenin<=0)
     {
-      if(errno==EINTR)
-        return 0;      
-      if(errno==0)
+      if(lenin==0)
         {
           if(debug_lvl >= DEBUG_CONNECTIONS)
             syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
                 cl->name, cl->hostname);
         }
       else
-        syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
-               cl->name, cl->hostname);
-      return -1;
-    }
+        if(errno==EINTR)
+          return 0;      
+        else
+          syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
+                 cl->name, cl->hostname);
 
-  if(cl->status.decryptin)
-    {
-      EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, &lenin, inbuf, lenin);
+      return -1;
     }
 
   oldlen = cl->buflen;
   cl->buflen += lenin;
 
-  for(;;)
+  while(lenin)
     {
-      cl->reqlen = 0;
+      /* Decrypt */
+
+      if(cl->status.decryptin && !decrypted)
+        {
+          EVP_DecryptUpdate(cl->cipher_inctx, inbuf, &lenin, cl->buffer + oldlen, lenin);
+          memcpy(cl->buffer + oldlen, inbuf, lenin);
+          decrypted = 1;
+        }
+
+      /* Are we receiving a TCPpacket? */
+
+      if(cl->tcplen)
+        {
+          if(cl->tcplen <= cl->buflen)
+            {
+              receive_tcppacket(cl, cl->buffer, cl->tcplen);
+
+              cl->buflen -= cl->tcplen;
+              lenin -= cl->tcplen;
+              memmove(cl->buffer, cl->buffer + cl->tcplen, cl->buflen);
+              oldlen = 0;
+              cl->tcplen = 0;
+              continue;
+            }
+          else
+            {
+              break;
+            }
+        }
+
+      /* Otherwise we are waiting for a request */
+
+      reqlen = 0;
 
       for(i = oldlen; i < cl->buflen; i++)
         {
           if(cl->buffer[i] == '\n')
             {
-              cl->buffer[i] = 0;  /* replace end-of-line by end-of-string so we can use sscanf */
-              cl->reqlen = i + 1;
+              cl->buffer[i] = '\0';  /* replace end-of-line by end-of-string so we can use sscanf */
+              reqlen = i + 1;
               break;
             }
         }
 
-      if(cl->reqlen)
+      if(reqlen)
         {
-          if(debug_lvl >= DEBUG_META)
-            syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
-                  cl->name, cl->hostname, cl->buffer);
-
           if(receive_request(cl))
             return -1;
 
-          cl->buflen -= cl->reqlen;
-          memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
+          cl->buflen -= reqlen;
+          lenin -= reqlen;
+          memmove(cl->buffer, cl->buffer + reqlen, cl->buflen);
           oldlen = 0;
+          continue;
         }
       else
         {