- Integrate rbl trees into tinc.

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 0a40d8c..289d0b8 100644 (file)
--- a/src/meta.c
+++ b/src/meta.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: meta.c,v 1.1.2.4 2000/10/15 00:59:34 guus Exp $
+    $Id: meta.c,v 1.1.2.12 2000/11/20 19:12:12 guus Exp $
 */
 
 #include "config.h"
@@ -26,13 +26,23 @@
 #include <errno.h>
 #include <syslog.h>
 #include <sys/signal.h>
+#include <unistd.h>
+#include <string.h>
+/* This line must be below the rest for FreeBSD */
 #include <sys/socket.h>
-#include <openssl/evp.h>
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
 
 #include "net.h"
+#include "connection.h"
 #include "system.h"
+#include "protocol.h"
 
-int send_meta(conn_list_t *cl, char *buffer, int length)
+int send_meta(connection_t *cl, char *buffer, int length)
 {
   char outbuf[MAXBUFSIZE];
   char *bufp;
@@ -43,14 +53,15 @@ cp
            cl->name, cl->hostname, buffer);
 
   buffer[length-1]='\n';
-  
+
   if(cl->status.encryptout)
     {
       EVP_EncryptUpdate(cl->cipher_outctx, outbuf, &outlen, buffer, length);
       bufp = outbuf;
+      length = outlen;
     }
   else
-    bufp = buffer;
+      bufp = buffer;
 
   if(write(cl->meta_socket, bufp, length) < 0)
     {
@@ -61,18 +72,21 @@ cp
   return 0;
 }
 
-int broadcast_meta(conn_list_t *cl, char *buffer, int length)
+void broadcast_meta(connection_t *cl, char *buffer, int length)
 {
-  conn_list_t *p;
+  rbl_t *rbl;
+  connection_t *p;
 cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(p != cl && p->status.meta && p->status.active)
-      send_meta(p, buffer, length);
+  RBL_FOREACH(connection_tree, rbl)
+    {
+      p = (connection_t *)rbl->data;
+      if(p != cl && p->status.meta && p->status.active)
+        send_meta(p, buffer, length);
+    }
 cp
-  return 0;
 }
 
-int receive_meta(conn_list_t *cl)
+int receive_meta(connection_t *cl)
 {
   int x, l = sizeof(x);
   int oldlen, i;
@@ -106,7 +120,7 @@ cp
         return 0;      
       if(errno==0)
         {
-          if(debug_lvl>DEBUG_CONNECTIONS)
+          if(debug_lvl >= DEBUG_CONNECTIONS)
             syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
                 cl->name, cl->hostname);
         }
@@ -118,9 +132,9 @@ cp
 
   if(cl->status.decryptin)
     {
-      EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, NULL, inbuf, lenin);
+      EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, &lenin, inbuf, lenin);
     }
-    
+
   oldlen = cl->buflen;
   cl->buflen += lenin;
 
@@ -140,7 +154,7 @@ cp
 
       if(cl->reqlen)
         {
-          if(debug_lvl > DEBUG_META)
+          if(debug_lvl >= DEBUG_META)
             syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
                   cl->name, cl->hostname, cl->buffer);
 
@@ -165,7 +179,6 @@ cp
     }
 
   cl->last_ping_time = time(NULL);
-  cl->want_ping = 0;
 cp  
   return 0;
 }