/*
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-2003 Guus Sliepen <guus@sliepen.eu.org>,
+ 2000-2003 Ivo Timmermans <ivo@o2w.nl>
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.29 2002/09/09 21:24:34 guus Exp $
+ $Id: meta.c,v 1.1.2.42 2003/08/16 12:40:00 guus Exp $
*/
-#include "config.h"
-#include <utils.h>
-#include <avl_tree.h>
-
-#include <errno.h>
-#include <syslog.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/evp.h>
-#include "net.h"
+#include "avl_tree.h"
#include "connection.h"
-#include "system.h"
+#include "logger.h"
+#include "meta.h"
+#include "net.h"
#include "protocol.h"
+#include "system.h"
+#include "utils.h"
-int send_meta(connection_t * c, char *buffer, int length)
+bool send_meta(connection_t *c, const char *buffer, int length)
{
- char *bufp;
+ const char *bufp;
int outlen;
char outbuf[MAXBUFSIZE];
+ int result;
cp();
- if(debug_lvl >= DEBUG_META)
- syslog(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);
if(c->status.encryptout) {
} else
bufp = buffer;
- if(write(c->socket, bufp, length) < 0) {
- syslog(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
- c->hostname, strerror(errno));
- return -1;
+ while(length) {
+ result = send(c->socket, bufp, length, 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)
+ continue;
+ else
+ logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
+ c->hostname, strerror(errno));
+ return false;
+ }
+ bufp += result;
+ length -= result;
}
-
- return 0;
+
+ 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;
}
}
-int receive_meta(connection_t * c)
+bool receive_meta(connection_t *c)
{
- int x, l = sizeof(x);
+ int x;
+ socklen_t l = sizeof(x);
int oldlen, i;
int lenin, reqlen;
- int decrypted = 0;
+ bool decrypted = false;
char inbuf[MAXBUFSIZE];
cp();
- if(getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) {
- syslog(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) {
- syslog(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) {
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(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
- syslog(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;
/* Decrypt */
if(c->status.decryptin && !decrypted) {
- EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen,
- lenin);
+ EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
memcpy(c->buffer + oldlen, inbuf, lenin);
- decrypted = 1;
+ decrypted = true;
}
/* Are we receiving a TCPpacket? */
if(reqlen) {
c->reqlen = reqlen;
- if(receive_request(c))
- return -1;
+ if(!receive_request(c))
+ return false;
c->buflen -= reqlen;
lenin -= reqlen;
}
if(c->buflen >= MAXBUFSIZE) {
- syslog(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