/*
meta.c -- handle the meta communication
- Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
- 2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+ 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
#include <openssl/err.h>
#include <openssl/evp.h>
-#include "avl_tree.h"
+#include "splay_tree.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)
-{
- const char *bufp;
+bool send_meta(connection_t *c, const char *buffer, int length) {
int outlen;
- char outbuf[MAXBUFSIZE];
int result;
cp();
ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
c->name, c->hostname);
+ if(!c->outbuflen) {
+ if(event_add(&c->outev, NULL) < 0) {
+ logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
+ abort();
+ }
+ }
+
+ /* 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) {
- result = EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length);
- if(!result || outlen != 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();
}
- bufp = outbuf;
- length = outlen;
- } else
- bufp = buffer;
+ c->outbuflen += outlen;
+ } else {
+ memcpy(c->outbuf + c->outbufstart + c->outbuflen, buffer, length);
+ c->outbuflen += length;
+ }
+
+ return true;
+}
- while(length) {
- result = send(c->socket, bufp, length, 0);
+void flush_meta(int fd, short events, void *data) {
+ connection_t *c = data;
+ 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 || errno == EPIPE) {
ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
c->name, c->hostname);
- } else if(errno == EINTR)
+ } else if(errno == EINTR) {
continue;
- else
- logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
+#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;
+#endif
+ } else {
+ logger(LOG_ERR, _("Flushing meta data to %s (%s) failed: %s"), c->name,
c->hostname, strerror(errno));
- return false;
+ }
+
+ terminate_connection(c, c->status.active);
+ return;
}
- bufp += result;
- length -= result;
+
+ c->outbufstart += result;
+ c->outbuflen -= result;
}
-
- return true;
+
+ event_del(&c->outev);
+
+ c->outbufstart = 0; /* avoid unnecessary memmoves */
}
-void broadcast_meta(connection_t *from, const char *buffer, int length)
-{
- avl_node_t *node;
+void broadcast_meta(connection_t *from, const char *buffer, int length) {
+ splay_node_t *node;
connection_t *c;
cp();
}
}
-bool receive_meta(connection_t *c)
-{
+bool receive_meta(connection_t *c) {
int oldlen, i, result;
int lenin, lenout, reqlen;
bool decrypted = false;
/* Decrypt */
if(c->status.decryptin && !decrypted) {
- result = EVP_DecryptUpdate(c->inctx, inbuf, &lenout, 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;
}
- c->last_ping_time = now;
+ c->last_ping_time = time(NULL);
return true;
}