/*
meta.c -- handle the meta communication
- Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-2009 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 <openssl/err.h>
-#include <openssl/evp.h>
-
#include "splay_tree.h"
+#include "cipher.h"
#include "connection.h"
#include "logger.h"
#include "meta.h"
#include "xalloc.h"
bool send_meta(connection_t *c, const char *buffer, int length) {
- int outlen;
- int result;
- cp();
+ 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,
+ 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;
- result = EVP_EncryptUpdate(c->outctx, (unsigned char *)outbuf, &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));
+ 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."));
+ write(c->socket, outbuf, length);
} 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."));
+ write(c->socket, buffer, length);
}
return true;
splay_node_t *node;
connection_t *c;
- cp();
-
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
}
}
-bool receive_meta(connection_t *c) {
- int result, inlen, outlen;
- char inbuf[MAXBUFSIZE];
- char *bufp = inbuf, *endp;
+static bool process_meta(connection_t *c, char *reqbuf, int *len) {
+ while(*len) {
+ if(c->tcplen) {
+ if(c->tcplen > *len)
+ break;
- cp();
+ mutex_lock(&mutex);
+ receive_tcppacket(c, reqbuf, c->tcplen);
+ mutex_unlock(&mutex);
- /* 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.
- */
+ memmove(reqbuf, reqbuf, *len - c->tcplen);
+ *len -= c->tcplen;
+ } else {
+ char *end = memchr(reqbuf, '\n', *len);
+ if(!end)
+ break;
+ else
+ *end++ = 0;
- inlen = recv(c->socket, inbuf, sizeof inbuf, 0);
+ mutex_lock(&mutex);
+ bool success = receive_request(c, reqbuf);
+ mutex_unlock(&mutex);
+
+ if(!success)
+ return false;
- 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;
+ memmove(reqbuf, end, *len - (end - reqbuf));
+ *len -= end - reqbuf;
+ }
}
- do {
- if(!c->status.decryptin) {
- endp = memchr(bufp, '\n', inlen);
- if(endp)
- endp++;
- else
- endp = bufp + inlen;
+ return true;
+}
+
+bool receive_meta(connection_t *c) {
+ int inlen;
+ int reqlen = 0;
+ char inbuf[MAXBUFSIZE];
+ char reqbuf[MAXBUFSIZE];
- evbuffer_add(c->buffer->input, bufp, endp - bufp);
+ /* Strategy:
+ - Read as much as possible from the TCP socket in one go.
+ - Decrypt it if necessary.
+ - Check if a full request is in the request buffer.
+ - If yes, process request and remove it from the buffer, then check again.
+ - If not, try to read more.
+ */
- inlen -= endp - bufp;
- bufp = endp;
- } else {
- ifdebug(META) logger(LOG_DEBUG, _("Received encrypted %d bytes"), inlen);
- evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen);
- result = EVP_DecryptUpdate(c->inctx, (unsigned char *)c->buffer->input->buffer + c->buffer->input->off, &outlen, (unsigned char *)bufp, inlen);
- if(!result || outlen != inlen) {
- 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->buffer->input->off += inlen;
+ while(true) {
+ inlen = recv(c->socket, inbuf, sizeof inbuf - reqlen, 0);
- inlen = 0;
+ if(inlen <= 0) {
+ if(!inlen || !errno) {
+ ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)",
+ c->name, c->hostname);
+ } else if(sockwouldblock(sockerrno))
+ continue;
+ else
+ logger(LOG_ERR, "Metadata socket read error for %s (%s): %s",
+ c->name, c->hostname, sockstrerror(sockerrno));
+ return false;
}
- 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;
+ while(inlen) {
+ if(!c->status.decryptin) {
+ char *end = memchr(inbuf, '\n', inlen);
+ if(!end)
+ end = inbuf + inlen;
+ else
+ end++;
+ memcpy(reqbuf + reqlen, inbuf, end - inbuf);
+ reqlen += end - inbuf;
+
+ if(!process_meta(c, reqbuf, &reqlen))
+ return false;
+
+ memmove(inbuf, end, inlen - (end - inbuf));
+ inlen -= end - inbuf;
+ } else {
+ size_t outlen = inlen;
+
+ if(!cipher_decrypt(&c->incipher, inbuf, inlen, reqbuf + reqlen, &outlen, false) || inlen != outlen) {
+ logger(LOG_ERR, "Error while decrypting metadata from %s (%s)", c->name, c->hostname);
+ return false;
}
- }
- /* Otherwise we are waiting for a request */
+ reqlen += inlen;
+ inlen = 0;
- char *request = evbuffer_readline(c->buffer->input);
- if(request) {
- receive_request(c, request);
- free(request);
- continue;
- } else {
- break;
+ if(!process_meta(c, reqbuf, &reqlen))
+ return false;
}
}
- } while(inlen);
-
- c->last_ping_time = time(NULL);
-
- return true;
+ }
}
projects / tinc / blobdiff