X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeta.c;h=afc98ab2f94cb2ae5c9878bded7838f7f5e4b652;hb=2c6b2d70e6640f39563ad7bb0aa0ba87f883848c;hp=084c6a7f2c12d21df53bab202a2df33e856cc459;hpb=b18d5b572992debb04a7851e43143711319243a0;p=tinc diff --git a/src/meta.c b/src/meta.c index 084c6a7f..afc98ab2 100644 --- a/src/meta.c +++ b/src/meta.c @@ -50,14 +50,14 @@ bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t leng return true; } -bool send_meta(connection_t *c, const char *buffer, size_t length) { +bool send_meta(connection_t *c, const void *buffer, size_t length) { if(!c) { logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!"); abort(); } - logger(DEBUG_META, LOG_DEBUG, "Sending %lu bytes of metadata to %s (%s)", (unsigned long)length, - c->name, c->hostname); + logger(DEBUG_META, LOG_DEBUG, "Sending %zu bytes of metadata to %s (%s)", + length, c->name, c->hostname); if(c->protocol_minor >= 2) { return sptps_send_record(&c->sptps, 0, buffer, length); @@ -94,14 +94,14 @@ bool send_meta(connection_t *c, const char *buffer, size_t length) { return true; } -void send_meta_raw(connection_t *c, const char *buffer, size_t length) { +void send_meta_raw(connection_t *c, const void *buffer, size_t length) { if(!c) { logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!"); abort(); } - logger(DEBUG_META, LOG_DEBUG, "Sending %lu bytes of raw metadata to %s (%s)", (unsigned long)length, - c->name, c->hostname); + logger(DEBUG_META, LOG_DEBUG, "Sending %zu bytes of raw metadata to %s (%s)", + length, c->name, c->hostname); buffer_add(&c->outbuf, buffer, length); @@ -227,7 +227,7 @@ bool receive_meta(connection_t *c) { } bufp += len; - inlen -= len; + inlen -= (ssize_t)len; continue; }