Only show meta connection related debug messages when debug level >= 4

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 7951411..cb4b03e 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -53,13 +53,13 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
                        return false;
                }
                
-               logger(LOG_DEBUG, _("Encrypted write %p %p %p %d"), c, c->buffer, outbuf, length);
+               ifdebug(META) logger(LOG_DEBUG, _("Encrypted write %p %p %p %d"), c, c->buffer, outbuf, length);
                bufferevent_write(c->buffer, (void *)outbuf, length);
-               logger(LOG_DEBUG, _("Done."));
+               ifdebug(META) logger(LOG_DEBUG, _("Done."));
        } else {
-               logger(LOG_DEBUG, _("Unencrypted write %p %p %p %d"), c, c->buffer, buffer, length);
+               ifdebug(META) logger(LOG_DEBUG, _("Unencrypted write %p %p %p %d"), c, c->buffer, buffer, length);
                bufferevent_write(c->buffer, (void *)buffer, length);
-               logger(LOG_DEBUG, _("Done."));
+               ifdebug(META) logger(LOG_DEBUG, _("Done."));
        }
 
        return true;
@@ -110,19 +110,17 @@ bool receive_meta(connection_t *c) {
                        else
                                endp = bufp + inlen;
 
-                       logger(LOG_DEBUG, _("Received unencrypted %ld of %d bytes"), endp - bufp, inlen);
-
                        evbuffer_add(c->buffer->input, bufp, endp - bufp);
 
                        inlen -= endp - bufp;
                        bufp = endp;
                } else {
-                       logger(LOG_DEBUG, _("Received encrypted %d bytes"), inlen);
-                       evbuffer_expand(c->buffer->input, inlen);
-                       result = EVP_DecryptUpdate(c->inctx, (unsigned char *)c->buffer->input->buffer, &outlen, (unsigned char *)bufp, inlen);
+                       ifdebug(META) logger(LOG_DEBUG, _("Received encrypted %d bytes"), inlen);
+                       evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen);
+                       result = EVP_DecryptUpdate(c->inctx, (unsigned char *)c->buffer->input->buffer + c->buffer->input->off, &outlen, (unsigned char *)bufp, 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));
+                                          c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
                                return false;
                        }
                        c->buffer->input->off += inlen;