/*
meta.c -- handle the meta communication
- Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.eu.org>,
- 2000-2002 Ivo Timmermans <ivo@o2w.nl>
+ 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.34 2003/07/06 22:11:31 guus Exp $
+ $Id$
*/
-#include "config.h"
-#include <utils.h>
-#include <avl_tree.h>
-
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-/* This line must be below the rest for FreeBSD */
-#include <sys/types.h>
-#include <sys/socket.h>
+#include "system.h"
+#include <openssl/err.h>
#include <openssl/evp.h>
-#include "net.h"
+#include "avl_tree.h"
#include "connection.h"
-#include "system.h"
-#include "protocol.h"
#include "logger.h"
+#include "meta.h"
+#include "net.h"
+#include "protocol.h"
+#include "utils.h"
+#include "xalloc.h"
-int send_meta(connection_t *c, char *buffer, int length)
+bool send_meta(connection_t *c, const char *buffer, int length)
{
- char *bufp;
int outlen;
- char outbuf[MAXBUFSIZE];
int result;
cp();
- logger(DEBUG_META, LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
+ if(!c) {
+ logger(LOG_ERR, _("send_meta() called with NULL pointer!"));
+ abort();
+ }
+
+ ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
c->name, c->hostname);
+ if(!c->outbuflen)
+ c->last_flushed_time = now;
+
+ /* Find room in connection's buffer */
+ if(length + c->outbuflen > c->outbufsize) {
+ c->outbufsize = length + c->outbuflen;
+ c->outbuf = xrealloc(c->outbuf, c->outbufsize);
+ }
+
+ if(length + c->outbuflen + c->outbufstart > c->outbufsize) {
+ memmove(c->outbuf, c->outbuf + c->outbufstart, c->outbuflen);
+ c->outbufstart = 0;
+ }
+
+ /* Add our data to buffer */
if(c->status.encryptout) {
- EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length);
- bufp = outbuf;
- length = outlen;
- } else
- bufp = buffer;
-
- while(length) {
- result = write(c->socket, bufp, length);
+ result = EVP_EncryptUpdate(c->outctx, (unsigned char *)c->outbuf + c->outbufstart + c->outbuflen,
+ &outlen, (unsigned char *)buffer, length);
+ if(!result || outlen < length) {
+ logger(LOG_ERR, _("Error while encrypting metadata to %s (%s): %s"),
+ c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+ return false;
+ } else if(outlen > length) {
+ logger(LOG_EMERG, _("Encrypted data too long! Heap corrupted!"));
+ abort();
+ }
+ c->outbuflen += outlen;
+ } else {
+ memcpy(c->outbuf + c->outbufstart + c->outbuflen, buffer, length);
+ c->outbuflen += length;
+ }
+
+ return true;
+}
+
+bool flush_meta(connection_t *c)
+{
+ int result;
+
+ ifdebug(META) logger(LOG_DEBUG, _("Flushing %d bytes to %s (%s)"),
+ c->outbuflen, c->name, c->hostname);
+
+ while(c->outbuflen) {
+ result = send(c->socket, c->outbuf + c->outbufstart, c->outbuflen, 0);
if(result <= 0) {
- if(errno == EINTR)
+ if(!errno || errno == EPIPE) {
+ ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
+ c->name, c->hostname);
+ } else if(errno == EINTR) {
continue;
- logger(DEBUG_ALWAYS, LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
- c->hostname, strerror(errno));
- return -1;
+#ifdef EWOULDBLOCK
+ } else if(errno == EWOULDBLOCK) {
+ ifdebug(CONNECTIONS) logger(LOG_DEBUG, _("Flushing %d bytes to %s (%s) would block"),
+ c->outbuflen, c->name, c->hostname);
+ return true;
+#endif
+ } else {
+ logger(LOG_ERR, _("Flushing meta data to %s (%s) failed: %s"), c->name,
+ c->hostname, strerror(errno));
+ }
+
+ return false;
}
- bufp += result;
- length -= result;
+
+ c->outbufstart += result;
+ c->outbuflen -= result;
}
-
- return 0;
+
+ c->outbufstart = 0; /* avoid unnecessary memmoves */
+ return true;
}
-void broadcast_meta(connection_t *from, char *buffer, int length)
+void broadcast_meta(connection_t *from, const char *buffer, int length)
{
avl_node_t *node;
connection_t *c;
cp();
for(node = connection_tree->head; node; node = node->next) {
- c = (connection_t *) node->data;
+ c = node->data;
if(c != from && c->status.active)
send_meta(c, buffer, length);
}
}
-int receive_meta(connection_t *c)
+bool receive_meta(connection_t *c)
{
- int x;
- socklen_t l = sizeof(x);
- int oldlen, i;
- int lenin, reqlen;
- int decrypted = 0;
+ int oldlen, i, result;
+ int lenin, lenout, reqlen;
+ bool decrypted = false;
char inbuf[MAXBUFSIZE];
cp();
- if(getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, _("This is a bug: %s:%d: %d:%s %s (%s)"), __FILE__,
- __LINE__, c->socket, strerror(errno), c->name, c->hostname);
- return -1;
- }
-
- if(x) {
- logger(DEBUG_ALWAYS, LOG_ERR, _("Metadata socket error for %s (%s): %s"),
- c->name, c->hostname, strerror(x));
- return -1;
- }
-
/* Strategy:
- Read as much as possible from the TCP socket in one go.
- Decrypt it.
- If not, keep stuff in buffer and exit.
*/
- lenin = read(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen);
+ lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
if(lenin <= 0) {
- if(lenin == 0) {
- logger(DEBUG_CONNECTIONS, LOG_NOTICE, _("Connection closed by %s (%s)"),
+ if(!lenin || !errno) {
+ ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
c->name, c->hostname);
} else if(errno == EINTR)
- return 0;
+ return true;
else
- logger(DEBUG_ALWAYS, LOG_ERR, _("Metadata socket read error for %s (%s): %s"),
+ logger(LOG_ERR, _("Metadata socket read error for %s (%s): %s"),
c->name, c->hostname, strerror(errno));
- return -1;
+ return false;
}
oldlen = c->buflen;
c->buflen += lenin;
- while(lenin) {
+ while(lenin > 0) {
/* Decrypt */
if(c->status.decryptin && !decrypted) {
- EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
+ result = EVP_DecryptUpdate(c->inctx, (unsigned char *)inbuf, &lenout, (unsigned char *)c->buffer + oldlen, lenin);
+ if(!result || lenout != lenin) {
+ logger(LOG_ERR, _("Error while decrypting metadata from %s (%s): %s"),
+ c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+ return false;
+ }
memcpy(c->buffer + oldlen, inbuf, lenin);
- decrypted = 1;
+ decrypted = true;
}
/* Are we receiving a TCPpacket? */
receive_tcppacket(c, c->buffer, c->tcplen);
c->buflen -= c->tcplen;
- lenin -= c->tcplen;
+ lenin -= c->tcplen - oldlen;
memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
oldlen = 0;
c->tcplen = 0;
if(reqlen) {
c->reqlen = reqlen;
- if(receive_request(c))
- return -1;
+ if(!receive_request(c))
+ return false;
c->buflen -= reqlen;
- lenin -= reqlen;
+ lenin -= reqlen - oldlen;
memmove(c->buffer, c->buffer + reqlen, c->buflen);
oldlen = 0;
continue;
}
if(c->buflen >= MAXBUFSIZE) {
- logger(DEBUG_ALWAYS, LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
+ logger(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
c->name, c->hostname);
- return -1;
+ return false;
}
c->last_ping_time = now;
- return 0;
+ return true;
}
projects / tinc / blobdiff