Add Opaque option which prevent information from being forwarded to certain nodes.

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 5048e63..2ff272e 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -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.45 2003/10/10 16:24:24 guus Exp $
+    $Id: meta.c,v 1.1.2.49 2003/11/10 22:31:53 guus Exp $
 */
 
 #include "system.h"
 
+#include <openssl/err.h>
 #include <openssl/evp.h>
 
 #include "avl_tree.h"
@@ -48,7 +49,8 @@ bool send_meta(connection_t *c, const char *buffer, int length)
        if(c->status.encryptout) {
                result = EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length);
                if(!result || outlen != length) {
-                       logger(LOG_ERR, _("Error while encrypting metadata to %s (%s): %s"), ERR_error_string(ERR_get_error(), NULL));
+                       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;
@@ -86,7 +88,7 @@ void broadcast_meta(connection_t *from, const char *buffer, int length)
        for(node = connection_tree->head; node; node = node->next) {
                c = node->data;
 
-               if(c != from && c->status.active)
+               if(c != from && c->status.active && !c->status.opaque)
                        send_meta(c, buffer, length);
        }
 }
@@ -133,7 +135,8 @@ bool receive_meta(connection_t *c)
                if(c->status.decryptin && !decrypted) {
                        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"), ERR_error_string(ERR_get_error(), NULL));
+                               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);
@@ -147,7 +150,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;
@@ -175,7 +178,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;