Update copyright notices.

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index e6e76d3..8e9c8d3 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,7 +1,7 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2000-2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
 
     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.41 2003/08/12 14:48:12 guus Exp $
+    $Id$
 */
 
 #include "system.h"
 
+#include <openssl/err.h>
 #include <openssl/evp.h>
 
 #include "avl_tree.h"
@@ -30,7 +31,6 @@
 #include "meta.h"
 #include "net.h"
 #include "protocol.h"
-#include "system.h"
 #include "utils.h"
 
 bool send_meta(connection_t *c, const char *buffer, int length)
@@ -46,7 +46,12 @@ bool send_meta(connection_t *c, const char *buffer, int length)
                           c->name, c->hostname);
 
        if(c->status.encryptout) {
-               EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length);
+               result = EVP_EncryptUpdate(c->outctx, outbuf, &outlen, 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));
+                       return false;
+               }
                bufp = outbuf;
                length = outlen;
        } else
@@ -80,7 +85,7 @@ void broadcast_meta(connection_t *from, const char *buffer, int length)
        cp();
 
        for(node = connection_tree->head; node; node = node->next) {
-               c = (connection_t *) node->data;
+               c = node->data;
 
                if(c != from && c->status.active)
                        send_meta(c, buffer, length);
@@ -89,27 +94,13 @@ void broadcast_meta(connection_t *from, const char *buffer, int length)
 
 bool receive_meta(connection_t *c)
 {
-       int x;
-       socklen_t l = sizeof(x);
-       int oldlen, i;
-       int lenin, reqlen;
+       int oldlen, i, result;
+       int lenin, lenout, reqlen;
        bool decrypted = false;
        char inbuf[MAXBUFSIZE];
 
        cp();
 
-       if(getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) {
-               logger(LOG_ERR, _("This is a bug: %s:%d: %d:%s %s (%s)"), __FILE__,
-                          __LINE__, c->socket, strerror(errno), c->name, c->hostname);
-               return false;
-       }
-
-       if(x) {
-               logger(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
-                          c->name, c->hostname, strerror(x));
-               return false;
-       }
-
        /* Strategy:
           - Read as much as possible from the TCP socket in one go.
           - Decrypt it.
@@ -137,11 +128,16 @@ bool receive_meta(connection_t *c)
        oldlen = c->buflen;
        c->buflen += lenin;
 
-       while(lenin) {
+       while(lenin > 0) {
                /* Decrypt */
 
                if(c->status.decryptin && !decrypted) {
-                       EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
+                       result = EVP_DecryptUpdate(c->inctx, inbuf, &lenout, c->buffer + oldlen, lenin);
+                       if(!result || lenout != lenin) {
+                               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);
                        decrypted = true;
                }
@@ -153,7 +149,7 @@ bool receive_meta(connection_t *c)
                                receive_tcppacket(c, c->buffer, c->tcplen);
 
                                c->buflen -= c->tcplen;
-                               lenin -= c->tcplen;
+                               lenin -= c->tcplen - oldlen;
                                memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
                                oldlen = 0;
                                c->tcplen = 0;
@@ -181,7 +177,7 @@ bool receive_meta(connection_t *c)
                                return false;
 
                        c->buflen -= reqlen;
-                       lenin -= reqlen;
+                       lenin -= reqlen - oldlen;
                        memmove(c->buffer, c->buffer + reqlen, c->buflen);
                        oldlen = 0;
                        continue;