/*
meta.c -- handle the meta communication
- Copyright (C) 2000 Guus Sliepen <guus@sliepen.warande.net>,
- 2000 Ivo Timmermans <itimmermans@bigfoot.com>
+ Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
+ 2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
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.3 2000/10/11 22:00:58 guus Exp $
+ $Id: meta.c,v 1.1.2.15 2001/02/25 11:09:29 guus Exp $
*/
#include "config.h"
#include <utils.h>
+#include <avl_tree.h>
#include <errno.h>
#include <syslog.h>
#include <sys/signal.h>
+#include <unistd.h>
+#include <string.h>
+/* This line must be below the rest for FreeBSD */
#include <sys/socket.h>
-#include <openssl/evp.h>
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
#include "net.h"
+#include "connection.h"
#include "system.h"
+#include "protocol.h"
-int send_meta(conn_list_t *cl, char *buffer, int length)
+int send_meta(connection_t *cl, char *buffer, int length)
{
char outbuf[MAXBUFSIZE];
char *bufp;
syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s): %s"), length,
cl->name, cl->hostname, buffer);
+ buffer[length-1]='\n';
+
if(cl->status.encryptout)
{
EVP_EncryptUpdate(cl->cipher_outctx, outbuf, &outlen, buffer, length);
bufp = outbuf;
+ length = outlen;
}
else
- bufp = buffer;
+ bufp = buffer;
if(write(cl->meta_socket, bufp, length) < 0)
{
return 0;
}
-int broadcast_meta(conn_list_t *cl, char *buffer, int length)
+void broadcast_meta(connection_t *cl, char *buffer, int length)
{
- conn_list_t *p;
+ avl_node_t *node;
+ connection_t *p;
cp
- for(p = conn_list; p != NULL; p = p->next)
- if(p != cl && p->status.meta && p->status.active)
- send_meta(p, buffer, length);
+ for(node = connection_tree->head; node; node = node->next)
+ {
+ p = (connection_t *)node->data;
+ if(p != cl && p->status.meta && p->status.active)
+ send_meta(p, buffer, length);
+ }
cp
- return 0;
}
-int receive_meta(conn_list_t *cl)
+int receive_meta(connection_t *cl)
{
int x, l = sizeof(x);
int oldlen, i;
if(lenin<=0)
{
- if(errno==EINTR)
- return 0;
- if(errno==0)
+ if(lenin==0)
{
- if(debug_lvl>DEBUG_CONNECTIONS)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
cl->name, cl->hostname);
}
else
- syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
- cl->name, cl->hostname);
+ if(errno==EINTR)
+ return 0;
+ else
+ syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
+ cl->name, cl->hostname);
+
return -1;
}
if(cl->status.decryptin)
{
- EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, NULL, inbuf, lenin);
+ EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, &lenin, inbuf, lenin);
}
-
+
oldlen = cl->buflen;
cl->buflen += lenin;
if(cl->reqlen)
{
- if(debug_lvl > DEBUG_META)
+ if(debug_lvl >= DEBUG_META)
syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
cl->name, cl->hostname, cl->buffer);
}
cl->last_ping_time = time(NULL);
- cl->want_ping = 0;
cp
return 0;
}