/*
meta.c -- handle the meta communication
- Copyright (C) 2000 Guus Sliepen <guus@sliepen.warande.net>,
- 2000 Ivo Timmermans <itimmermans@bigfoot.com>
+ Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+ 2000-2005 Ivo Timmermans
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
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: meta.c,v 1.1.2.5 2000/10/21 11:52:06 guus Exp $
+ $Id$
*/
-#include "config.h"
-#include <utils.h>
-
-#include <errno.h>
-#include <syslog.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <openssl/evp.h>
-
-#include "net.h"
#include "system.h"
-int send_meta(conn_list_t *cl, char *buffer, int length)
-{
- char outbuf[MAXBUFSIZE];
- char *bufp;
- int outlen;
-cp
- if(debug_lvl >= DEBUG_META)
- syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s): %s"), length,
- cl->name, cl->hostname, buffer);
-
- buffer[length-1]='\n';
-
- if(cl->status.encryptout)
- {
- EVP_EncryptUpdate(cl->cipher_outctx, outbuf, &outlen, buffer, length);
- bufp = outbuf;
- }
- else
- bufp = buffer;
-
- if(write(cl->meta_socket, bufp, length) < 0)
- {
- syslog(LOG_ERR, _("Sending meta data to %s (%s) failed: %m"), cl->name, cl->hostname);
- return -1;
- }
-cp
- return 0;
+#include "splay_tree.h"
+#include "cipher.h"
+#include "connection.h"
+#include "logger.h"
+#include "meta.h"
+#include "net.h"
+#include "protocol.h"
+#include "utils.h"
+#include "xalloc.h"
+
+bool send_meta(connection_t *c, const char *buffer, int length) {
+ cp();
+
+ ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
+ c->name, c->hostname);
+
+ /* Add our data to buffer */
+ if(c->status.encryptout) {
+ char outbuf[length];
+ 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)"),
+ 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."));
+ } 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."));
+ }
+
+ return true;
}
-int broadcast_meta(conn_list_t *cl, char *buffer, int length)
-{
- conn_list_t *p;
-cp
- for(p = conn_list; p != NULL; p = p->next)
- if(p != cl && p->status.meta && p->status.active)
- send_meta(p, buffer, length);
-cp
- return 0;
+void broadcast_meta(connection_t *from, const char *buffer, int length) {
+ splay_node_t *node;
+ connection_t *c;
+
+ cp();
+
+ for(node = connection_tree->head; node; node = node->next) {
+ c = node->data;
+
+ if(c != from && c->status.active)
+ send_meta(c, buffer, length);
+ }
}
-int receive_meta(conn_list_t *cl)
-{
- int x, l = sizeof(x);
- int oldlen, i;
- int lenin = 0;
- char inbuf[MAXBUFSIZE];
- char *bufp;
-cp
- if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
- {
- syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, cl->meta_socket,
- cl->name, cl->hostname);
- return -1;
- }
- if(x)
- {
- syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
- cl->name, cl->hostname, strerror(x));
- return -1;
- }
-
- if(cl->status.decryptin)
- bufp = inbuf;
- else
- bufp = cl->buffer + cl->buflen;
-
- lenin = read(cl->meta_socket, bufp, MAXBUFSIZE - cl->buflen);
-
- if(lenin<=0)
- {
- if(errno==EINTR)
- return 0;
- if(errno==0)
- {
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
- cl->name, cl->hostname);
- }
- else
- syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
- cl->name, cl->hostname);
- return -1;
- }
-
- if(cl->status.decryptin)
- {
- EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, NULL, inbuf, lenin);
- }
-
- oldlen = cl->buflen;
- cl->buflen += lenin;
-
- for(;;)
- {
- cl->reqlen = 0;
-
- for(i = oldlen; i < cl->buflen; i++)
- {
- if(cl->buffer[i] == '\n')
- {
- cl->buffer[i] = 0; /* replace end-of-line by end-of-string so we can use sscanf */
- cl->reqlen = i + 1;
- break;
- }
- }
-
- if(cl->reqlen)
- {
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
- cl->name, cl->hostname, cl->buffer);
-
- if(receive_request(cl))
- return -1;
-
- cl->buflen -= cl->reqlen;
- memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
- oldlen = 0;
- }
- else
- {
- break;
- }
- }
-
- if(cl->buflen >= MAXBUFSIZE)
- {
- syslog(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
- cl->name, cl->hostname);
- return -1;
- }
-
- cl->last_ping_time = time(NULL);
- cl->want_ping = 0;
-cp
- return 0;
+bool receive_meta(connection_t *c) {
+ size_t inlen;
+ char inbuf[MAXBUFSIZE];
+ char *bufp = inbuf, *endp;
+
+ cp();
+
+ /* Strategy:
+ - Read as much as possible from the TCP socket in one go.
+ - Decrypt it.
+ - Check if a full request is in the input buffer.
+ - If yes, process request and remove it from the buffer,
+ then check again.
+ - If not, keep stuff in buffer and exit.
+ */
+
+ inlen = recv(c->socket, inbuf, sizeof inbuf, 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));
+ return false;
+ }
+
+ do {
+ if(!c->status.decryptin) {
+ endp = memchr(bufp, '\n', inlen);
+ if(endp)
+ endp++;
+ else
+ endp = bufp + inlen;
+
+ evbuffer_add(c->buffer->input, bufp, endp - bufp);
+
+ inlen -= endp - bufp;
+ bufp = endp;
+ } 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)"),
+ c->name, c->hostname);
+ return false;
+ }
+ c->buffer->input->off += inlen;
+
+ inlen = 0;
+ }
+
+ while(c->buffer->input->off) {
+ /* 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 {
+ break;
+ }
+ }
+
+ /* Otherwise we are waiting for a request */
+
+ char *request = evbuffer_readline(c->buffer->input);
+ if(request) {
+ bool result = receive_request(c, request);
+ free(request);
+ if(!result)
+ return false;
+ continue;
+ } else {
+ break;
+ }
+ }
+ } while(inlen);
+
+ c->last_ping_time = time(NULL);
+
+ return true;
}
projects / tinc / blobdiff