/*
meta.c -- handle the meta communication
- Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-2014 Guus Sliepen <guus@tinc-vpn.org>,
2000-2005 Ivo Timmermans
+ 2006 Scott Lamb <slamb@slamb.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- $Id$
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "system.h"
-#include "splay_tree.h"
#include "cipher.h"
#include "connection.h"
#include "logger.h"
#include "utils.h"
#include "xalloc.h"
+#ifndef MIN
+#define MIN(x, y) (((x)<(y))?(x):(y))
+#endif
+
+bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) {
+ connection_t *c = handle;
+
+ if(!c) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "send_meta_sptps() called with NULL pointer!");
+ abort();
+ }
+
+ buffer_add(&c->outbuf, buffer, length);
+ io_set(&c->io, IO_READ | IO_WRITE);
+
+ return true;
+}
+
bool send_meta(connection_t *c, const char *buffer, int length) {
- cp();
+ if(!c) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!");
+ abort();
+ }
- ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
+ logger(DEBUG_META, LOG_DEBUG, "Sending %d 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);
+
/* Add our data to buffer */
if(c->status.encryptout) {
- char outbuf[length];
+#ifdef DISABLE_LEGACY
+ return false;
+#else
size_t outlen = length;
- if(!cipher_encrypt(&c->outcipher, buffer, length, outbuf, &outlen, false) || outlen != length) {
- logger(LOG_ERR, _("Error while encrypting metadata to %s (%s)"),
+ 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;
}
-
- ifdebug(META) logger(LOG_DEBUG, _("Encrypted write %p %p %p %d"), c, c->buffer, outbuf, length);
- bufferevent_write(c->buffer, (void *)outbuf, length);
- ifdebug(META) logger(LOG_DEBUG, _("Done."));
+#endif
} else {
- ifdebug(META) logger(LOG_DEBUG, _("Unencrypted write %p %p %p %d"), c, c->buffer, buffer, length);
- bufferevent_write(c->buffer, (void *)buffer, length);
- ifdebug(META) logger(LOG_DEBUG, _("Done."));
+ buffer_add(&c->outbuf, buffer, length);
}
+ io_set(&c->io, IO_READ | IO_WRITE);
+
return true;
}
-void broadcast_meta(connection_t *from, const char *buffer, int length) {
- splay_node_t *node;
- connection_t *c;
+void send_meta_raw(connection_t *c, const char *buffer, int 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);
- cp();
+ buffer_add(&c->outbuf, buffer, length);
- for(node = connection_tree->head; node; node = node->next) {
- c = node->data;
+ io_set(&c->io, IO_READ | IO_WRITE);
+}
- if(c != from && c->status.active)
+void broadcast_meta(connection_t *from, const char *buffer, int length) {
+ for list_each(connection_t, c, connection_list)
+ 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) {
+ const char *data = vdata;
+ connection_t *c = handle;
+
+ if(!c) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "receive_meta_sptps() called with NULL pointer!");
+ abort();
+ }
+
+ if(type == SPTPS_HANDSHAKE) {
+ if(c->allow_request == ACK)
+ return send_ack(c);
+ else
+ return true;
}
+
+ if(!data)
+ return true;
+
+ /* Are we receiving a TCPpacket? */
+
+ if(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')
+ ((char *)data)[length - 1] = 0;
+
+ /* Otherwise we are waiting for a request */
+
+ return receive_request(c, data);
}
bool receive_meta(connection_t *c) {
- size_t inlen;
+ int inlen;
char inbuf[MAXBUFSIZE];
char *bufp = inbuf, *endp;
- cp();
-
/* Strategy:
- Read as much as possible from the TCP socket in one go.
- Decrypt it.
- If not, keep stuff in buffer and exit.
*/
- inlen = recv(c->socket, inbuf, sizeof inbuf, 0);
+ buffer_compact(&c->inbuf, MAXBUFSIZE);
+
+ 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);
if(inlen <= 0) {
- logger(LOG_ERR, _("Receive callback called for %s (%s) but no data to receive: %s"), c->name, c->hostname, strerror(errno));
+ if(!inlen || !sockerrno) {
+ logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection closed by %s (%s)",
+ c->name, c->hostname);
+ } else if(sockwouldblock(sockerrno))
+ return true;
+ else
+ logger(DEBUG_ALWAYS, LOG_ERR, "Metadata socket read error for %s (%s): %s",
+ c->name, c->hostname, sockstrerror(sockerrno));
return false;
}
do {
+ /* Are we receiving a SPTPS packet? */
+
+ if(c->sptpslen) {
+ int len = MIN(inlen, c->sptpslen - c->inbuf.len);
+ buffer_add(&c->inbuf, bufp, len);
+
+ char *sptpspacket = buffer_read(&c->inbuf, c->sptpslen);
+ if(!sptpspacket)
+ return true;
+
+ if(!receive_tcppacket_sptps(c, sptpspacket, c->sptpslen))
+ return false;
+ c->sptpslen = 0;
+
+ bufp += len;
+ inlen -= len;
+ continue;
+ }
+
+ if(c->protocol_minor >= 2) {
+ int 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)
else
endp = bufp + inlen;
- evbuffer_add(c->buffer->input, bufp, endp - bufp);
+ buffer_add(&c->inbuf, bufp, endp - bufp);
inlen -= endp - bufp;
bufp = endp;
} else {
+#ifdef DISABLE_LEGACY
+ return false;
+#else
size_t outlen = inlen;
- ifdebug(META) logger(LOG_DEBUG, _("Received encrypted %zu bytes"), inlen);
- evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen);
- if(!cipher_decrypt(&c->incipher, bufp, inlen, c->buffer->input->buffer + c->buffer->input->off, &outlen, false) || inlen != outlen) {
- logger(LOG_ERR, _("Error while decrypting metadata from %s (%s)"),
+ if(!cipher_decrypt(c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)",
c->name, c->hostname);
return false;
}
- c->buffer->input->off += inlen;
inlen = 0;
+#endif
}
- while(c->buffer->input->off) {
+ while(c->inbuf.len) {
/* Are we receiving a TCPpacket? */
if(c->tcplen) {
- if(c->tcplen <= c->buffer->input->off) {
- receive_tcppacket(c, (char *)c->buffer->input->buffer, c->tcplen);
- evbuffer_drain(c->buffer->input, c->tcplen);
- c->tcplen = 0;
- continue;
- } else {
+ char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen);
+ if(!tcpbuffer)
break;
+
+ if(!c->node) {
+ if(c->outgoing && proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
+ if(tcpbuffer[0] == 0 && tcpbuffer[1] == 0x5a) {
+ logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
+ } else {
+ logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected");
+ return false;
+ }
+ } else if(c->outgoing && proxytype == PROXY_SOCKS5 && c->allow_request == ID) {
+ if(tcpbuffer[0] != 5) {
+ 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 {
+ logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request rejected");
+ return false;
+ }
+ } else {
+ logger(DEBUG_CONNECTIONS, LOG_ERR, "c->tcplen set but c->node is NULL!");
+ abort();
+ }
+ } else {
+ if(c->allow_request == ALL) {
+ receive_tcppacket(c, tcpbuffer, c->tcplen);
+ } else {
+ logger(DEBUG_CONNECTIONS, LOG_ERR, "Got unauthorized TCP packet from %s (%s)", c->name, c->hostname);
+ return false;
+ }
}
+
+ c->tcplen = 0;
}
/* Otherwise we are waiting for a request */
- char *request = evbuffer_readline(c->buffer->input);
+ char *request = buffer_readline(&c->inbuf);
if(request) {
bool result = receive_request(c, request);
- free(request);
if(!result)
return false;
continue;
}
} while(inlen);
- c->last_ping_time = time(NULL);
-
return true;
}
projects / tinc / blobdiff