/*
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 "utils.h"
#include "xalloc.h"
+#ifndef MIN
+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 char *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)
+ if(c->protocol_minor >= 2) {
return sptps_send_record(&c->sptps, 0, buffer, length);
+ }
/* Add our data to buffer */
if(c->status.encryptout) {
#ifdef DISABLE_LEGACY
return false;
#else
+
+ if(length > c->outbudget) {
+ logger(DEBUG_META, LOG_ERR, "Byte limit exceeded for encryption to %s (%s)", c->name, c->hostname);
+ return false;
+ } else {
+ c->outbudget -= length;
+ }
+
size_t 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);
+ c->name, c->hostname);
return false;
}
+
#endif
} else {
buffer_add(&c->outbuf, buffer, length);
return true;
}
-void send_meta_raw(connection_t *c, const char *buffer, int length) {
+void send_meta_raw(connection_t *c, const char *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) {
+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)
+ if(c != from && c->edge) {
send_meta(c, buffer, length);
+ }
}
bool receive_meta_sptps(void *handle, uint8_t type, const void *vdata, uint16_t length) {
}
if(type == SPTPS_HANDSHAKE) {
- if(c->allow_request == ACK)
+ if(c->allow_request == ACK) {
return send_ack(c);
- else
+ } else {
return true;
+ }
}
- if(!data)
+ if(!data) {
return true;
+ }
/* Are we receiving a TCPpacket? */
if(c->tcplen) {
- if(length != c->tcplen)
+ if(length != c->tcplen) {
return false;
+ }
+
receive_tcppacket(c, data, length);
c->tcplen = 0;
return true;
/* Change newline to null byte, just like non-SPTPS requests */
- if(data[length - 1] == '\n')
+ if(data[length - 1] == '\n') {
((char *)data)[length - 1] = 0;
+ }
/* Otherwise we are waiting for a request */
}
bool receive_meta(connection_t *c) {
- int inlen;
+ ssize_t inlen;
char inbuf[MAXBUFSIZE];
char *bufp = inbuf, *endp;
buffer_compact(&c->inbuf, MAXBUFSIZE);
- if(sizeof inbuf <= c->inbuf.len) {
+ if(sizeof(inbuf) <= c->inbuf.len) {
logger(DEBUG_ALWAYS, LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname);
return false;
}
- inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0);
+ inlen = recv(c->socket, inbuf, sizeof(inbuf) - c->inbuf.len, 0);
if(inlen <= 0) {
if(!inlen || !sockerrno) {
logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection closed by %s (%s)",
- c->name, c->hostname);
- } else if(sockwouldblock(sockerrno))
+ c->name, c->hostname);
+ } else if(sockwouldblock(sockerrno)) {
return true;
- else
+ } else
logger(DEBUG_ALWAYS, LOG_ERR, "Metadata socket read error for %s (%s): %s",
- c->name, c->hostname, sockstrerror(sockerrno));
+ c->name, c->hostname, sockstrerror(sockerrno));
+
return false;
}
/* 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(!sptpspacket)
+
+ if(!sptpspacket) {
return true;
+ }
- if(!receive_tcppacket_sptps(c, sptpspacket, c->sptpslen))
+ if(!receive_tcppacket_sptps(c, sptpspacket, c->sptpslen)) {
return false;
+ }
+
c->sptpslen = 0;
bufp += len;
}
if(c->protocol_minor >= 2) {
- int len = sptps_receive_data(&c->sptps, bufp, inlen);
- if(!len)
+ size_t len = sptps_receive_data(&c->sptps, bufp, inlen);
+
+ if(!len) {
return false;
+ }
+
bufp += len;
inlen -= len;
continue;
if(!c->status.decryptin) {
endp = memchr(bufp, '\n', inlen);
- if(endp)
+
+ if(endp) {
endp++;
- else
+ } else {
endp = bufp + inlen;
+ }
buffer_add(&c->inbuf, bufp, endp - bufp);
#ifdef DISABLE_LEGACY
return false;
#else
+
+ 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);
+ c->name, c->hostname);
return false;
}
if(c->tcplen) {
char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen);
- if(!tcpbuffer)
+
+ if(!tcpbuffer) {
break;
+ }
if(!c->node) {
if(c->outgoing && proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server");
return false;
}
+
if(tcpbuffer[1] == (char)0xff) {
logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected: unsuitable authentication method");
return false;
}
+
if(tcpbuffer[2] != 5) {
logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server");
return false;
}
+
if(tcpbuffer[3] == 0) {
logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
} else {
/* Otherwise we are waiting for a request */
char *request = buffer_readline(&c->inbuf);
+
if(request) {
bool result = receive_request(c, request);
- if(!result)
+
+ if(!result) {
return false;
+ }
+
continue;
} else {
break;
projects / tinc / blobdiff