/*
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 "xalloc.h"
bool send_meta(connection_t *c, const char *buffer, int length) {
- cp();
-
if(!c) {
- logger(LOG_ERR, _("send_meta() called with NULL pointer!"));
+ 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;
- 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(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."));
+ buffer_add(&c->outbuf, buffer, length);
}
+ event_add(&c->outevent, NULL);
+
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) {
- 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(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 || !errno) {
+ ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)",
+ c->name, c->hostname);
+ } else if(sockwouldblock(sockerrno))
+ return true;
+ else
+ logger(LOG_ERR, "Metadata socket read error for %s (%s): %s",
+ c->name, c->hostname, sockstrerror(sockerrno));
return false;
}
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 {
size_t outlen = inlen;
- ifdebug(META) logger(LOG_DEBUG, _("Received encrypted %zu bytes"), inlen);
- evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen);
+ ifdebug(META) logger(LOG_DEBUG, "Received encrypted %d bytes", 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(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) {
+ 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);
+ char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen);
+ if(tcpbuffer) {
+ receive_tcppacket(c, tcpbuffer, c->tcplen);
c->tcplen = 0;
continue;
} else {
/* 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;
}