/*
meta.c -- handle the meta communication
- Copyright (C) 2000-2014 Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-2018 Guus Sliepen <guus@tinc-vpn.org>,
2000-2005 Ivo Timmermans
2006 Scott Lamb <slamb@slamb.org>
#include "net.h"
#include "protocol.h"
#include "utils.h"
-#include "xalloc.h"
#ifndef MIN
-#define MIN(x, y) (((x)<(y))?(x):(y))
+static ssize_t MIN(ssize_t x, ssize_t y) {
+ return x < y ? x : y;
+}
#endif
bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) {
+ (void)type;
connection_t *c = handle;
if(!c) {
return true;
}
-bool send_meta(connection_t *c, const char *buffer, int 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 %d bytes of metadata to %s (%s)", length,
- c->name, c->hostname);
+ logger(DEBUG_META, LOG_DEBUG, "Sending %lu bytes of metadata to %s (%s)",
+ (unsigned long)length, c->name, c->hostname);
if(c->protocol_minor >= 2) {
return sptps_send_record(&c->sptps, 0, buffer, length);
size_t outlen = length;
- if(!cipher_encrypt(c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
+ if(!cipher_encrypt(&c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting metadata to %s (%s)",
c->name, c->hostname);
return false;
return true;
}
-void send_meta_raw(connection_t *c, const char *buffer, int 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 %d bytes of raw metadata to %s (%s)", length,
- c->name, c->hostname);
+ logger(DEBUG_META, LOG_DEBUG, "Sending %lu bytes of raw metadata to %s (%s)",
+ (unsigned long)length, c->name, c->hostname);
buffer_add(&c->outbuf, buffer, length);
io_set(&c->io, IO_READ | IO_WRITE);
}
-void broadcast_meta(connection_t *from, const char *buffer, int length) {
- for list_each(connection_t, c, connection_list)
+void broadcast_meta(connection_t *from, const char *buffer, size_t length) {
+ for list_each(connection_t, c, &connection_list)
if(c != from && c->edge) {
send_meta(c, buffer, length);
}
}
bool receive_meta(connection_t *c) {
- int inlen;
+ ssize_t inlen;
char inbuf[MAXBUFSIZE];
char *bufp = inbuf, *endp;
/* Are we receiving a SPTPS packet? */
if(c->sptpslen) {
- int len = MIN(inlen, c->sptpslen - c->inbuf.len);
+ ssize_t len = MIN(inlen, c->sptpslen - c->inbuf.len);
buffer_add(&c->inbuf, bufp, len);
char *sptpspacket = buffer_read(&c->inbuf, c->sptpslen);
}
if(c->protocol_minor >= 2) {
- int len = sptps_receive_data(&c->sptps, bufp, inlen);
+ size_t len = sptps_receive_data(&c->sptps, bufp, inlen);
if(!len) {
return false;
}
bufp += len;
- inlen -= len;
+ inlen -= (ssize_t)len;
continue;
}
return false;
#else
- if(inlen > c->inbudget) {
- logger(DEBUG_META, LOG_ERR, "yte limit exceeded for decryption from %s (%s)", c->name, c->hostname);
+ if((size_t)inlen > c->inbudget) {
+ logger(DEBUG_META, LOG_ERR, "Byte limit exceeded for decryption from %s (%s)", c->name, c->hostname);
return false;
} else {
c->inbudget -= inlen;
size_t outlen = inlen;
- if(!cipher_decrypt(c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
+ if(!cipher_decrypt(&c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || (size_t)inlen != outlen) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)",
c->name, c->hostname);
return false;