More consistent variable naming.

[meshlink] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index e376c33ba716ea9204e6d94bca36fd5b700a0c8b..78b81604a354bf22b5c0b951ad671a20ce8025fb 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,7 +1,7 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans
 
     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
@@ -25,7 +25,7 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "connection.h"
 #include "logger.h"
 #include "meta.h"
@@ -34,8 +34,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_meta(connection_t *c, const char *buffer, int length)
-{
+bool send_meta(connection_t *c, const char *buffer, int length) {
        int outlen;
        int result;
 
@@ -44,8 +43,12 @@ bool send_meta(connection_t *c, const char *buffer, int length)
        ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
                           c->name, c->hostname);
 
-       if(!c->outbuflen)
-               c->last_flushed_time = now;
+       if(!c->outbuflen) {
+               if(event_add(&c->outev, NULL) < 0) {
+                       logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
+                       abort();
+               }
+       }
 
        /* Find room in connection's buffer */
        if(length + c->outbuflen > c->outbufsize) {
@@ -60,8 +63,8 @@ bool send_meta(connection_t *c, const char *buffer, int length)
 
        /* Add our data to buffer */
        if(c->status.encryptout) {
-               result = EVP_EncryptUpdate(c->outctx, c->outbuf + c->outbufstart + c->outbuflen,
-                               &outlen, buffer, length);
+               result = EVP_EncryptUpdate(c->outctx, (unsigned char *)c->outbuf + c->outbufstart + c->outbuflen,
+                               &outlen, (unsigned char *)buffer, length);
                if(!result || outlen < length) {
                        logger(LOG_ERR, _("Error while encrypting metadata to %s (%s): %s"),
                                        c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
@@ -79,8 +82,8 @@ bool send_meta(connection_t *c, const char *buffer, int length)
        return true;
 }
 
-bool flush_meta(connection_t *c)
-{
+void flush_meta(int fd, short events, void *data) {
+       connection_t *c = data;
        int result;
        
        ifdebug(META) logger(LOG_DEBUG, _("Flushing %d bytes to %s (%s)"),
@@ -94,29 +97,32 @@ bool flush_meta(connection_t *c)
                                                   c->name, c->hostname);
                        } else if(errno == EINTR) {
                                continue;
+#ifdef EWOULDBLOCK
                        } else if(errno == EWOULDBLOCK) {
                                ifdebug(CONNECTIONS) logger(LOG_DEBUG, _("Flushing %d bytes to %s (%s) would block"),
                                                c->outbuflen, c->name, c->hostname);
-                               return true;
+                               return;
+#endif
                        } else {
                                logger(LOG_ERR, _("Flushing meta data to %s (%s) failed: %s"), c->name,
                                           c->hostname, strerror(errno));
                        }
 
-                       return false;
+                       terminate_connection(c, c->status.active);
+                       return;
                }
 
                c->outbufstart += result;
                c->outbuflen -= result;
        }
 
+       event_del(&c->outev);
+
        c->outbufstart = 0; /* avoid unnecessary memmoves */
-       return true;
 }
 
-void broadcast_meta(connection_t *from, const char *buffer, int length)
-{
-       avl_node_t *node;
+void broadcast_meta(connection_t *from, const char *buffer, int length) {
+       splay_node_t *node;
        connection_t *c;
 
        cp();
@@ -129,10 +135,9 @@ void broadcast_meta(connection_t *from, const char *buffer, int length)
        }
 }
 
-bool receive_meta(connection_t *c)
-{
+bool receive_meta(connection_t *c) {
        int oldlen, i, result;
-       int lenin, lenout, reqlen;
+       int inlen, outlen, reqlen;
        bool decrypted = false;
        char inbuf[MAXBUFSIZE];
 
@@ -147,10 +152,10 @@ bool receive_meta(connection_t *c)
           - If not, keep stuff in buffer and exit.
         */
 
-       lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
+       inlen = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
 
-       if(lenin <= 0) {
-               if(!lenin || !errno) {
+       if(inlen <= 0) {
+               if(!inlen || !errno) {
                        ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
                                           c->name, c->hostname);
                } else if(errno == EINTR)
@@ -163,19 +168,19 @@ bool receive_meta(connection_t *c)
        }
 
        oldlen = c->buflen;
-       c->buflen += lenin;
+       c->buflen += inlen;
 
-       while(lenin > 0) {
+       while(inlen > 0) {
                /* Decrypt */
 
                if(c->status.decryptin && !decrypted) {
-                       result = EVP_DecryptUpdate(c->inctx, inbuf, &lenout, c->buffer + oldlen, lenin);
-                       if(!result || lenout != lenin) {
+                       result = EVP_DecryptUpdate(c->inctx, (unsigned char *)inbuf, &outlen, (unsigned char *)c->buffer + oldlen, inlen);
+                       if(!result || outlen != inlen) {
                                logger(LOG_ERR, _("Error while decrypting metadata from %s (%s): %s"),
                                                c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
                                return false;
                        }
-                       memcpy(c->buffer + oldlen, inbuf, lenin);
+                       memcpy(c->buffer + oldlen, inbuf, inlen);
                        decrypted = true;
                }
 
@@ -186,7 +191,7 @@ bool receive_meta(connection_t *c)
                                receive_tcppacket(c, c->buffer, c->tcplen);
 
                                c->buflen -= c->tcplen;
-                               lenin -= c->tcplen - oldlen;
+                               inlen -= c->tcplen - oldlen;
                                memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
                                oldlen = 0;
                                c->tcplen = 0;
@@ -214,7 +219,7 @@ bool receive_meta(connection_t *c)
                                return false;
 
                        c->buflen -= reqlen;
-                       lenin -= reqlen - oldlen;
+                       inlen -= reqlen - oldlen;
                        memmove(c->buffer, c->buffer + reqlen, c->buflen);
                        oldlen = 0;
                        continue;
@@ -229,7 +234,7 @@ bool receive_meta(connection_t *c)
                return false;
        }
 
-       c->last_ping_time = now;
+       c->last_ping_time = time(NULL);
 
        return true;
 }