projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't check_network_activity() if select() is interrupted by a signal.
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
f9b18ca
..
b51c64d
100644
(file)
--- a/
src/meta.c
+++ b/
src/meta.c
@@
-1,7
+1,7
@@
/*
meta.c -- handle the meta communication
/*
meta.c -- handle the meta communication
- Copyright (C) 2000
,2001
Guus Sliepen <guus@sliepen.warande.net>,
- 2000
,2001
Ivo Timmermans <itimmermans@bigfoot.com>
+ Copyright (C) 2000
-2002
Guus Sliepen <guus@sliepen.warande.net>,
+ 2000
-2002
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
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
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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.
15 2001/02/25 11:09:29
guus Exp $
+ $Id: meta.c,v 1.1.2.
25 2002/03/01 14:09:31
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-26,94
+26,92
@@
#include <errno.h>
#include <syslog.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 <unistd.h>
#include <string.h>
/* This line must be below the rest for FreeBSD */
+#include <sys/types.h>
#include <sys/socket.h>
#include <sys/socket.h>
-#ifdef HAVE_OPENSSL_EVP_H
-# include <openssl/evp.h>
-#else
-# include <evp.h>
-#endif
+#include <openssl/evp.h>
#include "net.h"
#include "connection.h"
#include "system.h"
#include "protocol.h"
#include "net.h"
#include "connection.h"
#include "system.h"
#include "protocol.h"
-int send_meta(connection_t *c
l
, char *buffer, int length)
+int send_meta(connection_t *c, char *buffer, int length)
{
{
- char outbuf[MAXBUFSIZE];
char *bufp;
int outlen;
char *bufp;
int outlen;
+ char outbuf[MAXBUFSIZE];
cp
if(debug_lvl >= DEBUG_META)
cp
if(debug_lvl >= DEBUG_META)
- syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s): %s"), length,
- cl->name, cl->hostname, buffer);
-
- buffer[length-1]='\n';
+ syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
+ c->name, c->hostname);
- if(c
l
->status.encryptout)
+ if(c->status.encryptout)
{
{
- EVP_EncryptUpdate(c
l->cipher_
outctx, outbuf, &outlen, buffer, length);
+ EVP_EncryptUpdate(c
->
outctx, outbuf, &outlen, buffer, length);
bufp = outbuf;
length = outlen;
}
else
bufp = buffer;
bufp = outbuf;
length = outlen;
}
else
bufp = buffer;
- if(write(c
l->meta_
socket, bufp, length) < 0)
+ if(write(c
->
socket, bufp, length) < 0)
{
{
- syslog(LOG_ERR, _("Sending meta data to %s (%s) failed: %
m"), cl->name, cl->hostname
);
+ syslog(LOG_ERR, _("Sending meta data to %s (%s) failed: %
s"), c->name, c->hostname, strerror(errno)
);
return -1;
}
cp
return 0;
}
return -1;
}
cp
return 0;
}
-void broadcast_meta(connection_t *
cl
, char *buffer, int length)
+void broadcast_meta(connection_t *
from
, char *buffer, int length)
{
avl_node_t *node;
{
avl_node_t *node;
- connection_t *
p
;
+ connection_t *
c
;
cp
for(node = connection_tree->head; node; node = node->next)
{
cp
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);
+
c
= (connection_t *)node->data;
+ if(
c != from && c
->status.active)
+ send_meta(
c
, buffer, length);
}
cp
}
}
cp
}
-int receive_meta(connection_t *c
l
)
+int receive_meta(connection_t *c)
{
int x, l = sizeof(x);
int oldlen, i;
{
int x, l = sizeof(x);
int oldlen, i;
- int lenin = 0;
+ int lenin, reqlen;
+ int decrypted = 0;
char inbuf[MAXBUFSIZE];
char inbuf[MAXBUFSIZE];
- char *bufp;
cp
cp
- if(getsockopt(c
l->meta_
socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
+ if(getsockopt(c
->
socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
{
- syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%
m %s (%s)"), __FILE__, __LINE__, cl->meta_socket
,
- c
l->name, cl
->hostname);
+ 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"),
return -1;
}
if(x)
{
syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
- c
l->name, cl
->hostname, strerror(x));
+ c
->name, c
->hostname, strerror(x));
return -1;
}
return -1;
}
- if(cl->status.decryptin)
- bufp = inbuf;
- else
- bufp = cl->buffer + cl->buflen;
+ /* 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.
+ */
- lenin = read(c
l->meta_socket, bufp, MAXBUFSIZE - cl
->buflen);
+ lenin = read(c
->socket, c->buffer + c->buflen, MAXBUFSIZE - c
->buflen);
if(lenin<=0)
{
if(lenin<=0)
{
@@
-121,52
+119,77
@@
cp
{
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
{
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
- c
l->name, cl
->hostname);
+ c
->name, c
->hostname);
}
else
if(errno==EINTR)
return 0;
else
}
else
if(errno==EINTR)
return 0;
else
- syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %
m
"),
- c
l->name, cl->hostname
);
+ syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %
s
"),
+ c
->name, c->hostname, strerror(errno)
);
return -1;
}
return -1;
}
- if(cl->status.decryptin)
+ oldlen = c->buflen;
+ c->buflen += lenin;
+
+ while(lenin)
{
{
- EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, &lenin, inbuf, lenin);
- }
+ /* Decrypt */
- oldlen = cl->buflen;
- cl->buflen += lenin;
+ if(c->status.decryptin && !decrypted)
+ {
+ EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
+ memcpy(c->buffer + oldlen, inbuf, lenin);
+ decrypted = 1;
+ }
- for(;;)
- {
- cl->reqlen = 0;
+ /* Are we receiving a TCPpacket? */
-
for(i = oldlen; i < cl->buflen; i++
)
+
if(c->tcplen
)
{
{
- if(cl->buffer[i] == '\n')
+ if(c->tcplen <= c->buflen)
+ {
+ receive_tcppacket(c, c->buffer, c->tcplen);
+
+ c->buflen -= c->tcplen;
+ lenin -= c->tcplen;
+ memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
+ oldlen = 0;
+ c->tcplen = 0;
+ continue;
+ }
+ else
{
{
- cl->buffer[i] = 0; /* replace end-of-line by end-of-string so we can use sscanf */
- cl->reqlen = i + 1;
break;
}
}
break;
}
}
- if(cl->reqlen)
+ /* Otherwise we are waiting for a request */
+
+ reqlen = 0;
+
+ for(i = oldlen; i < c->buflen; i++)
{
{
- if(debug_lvl >= DEBUG_META)
- syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
- cl->name, cl->hostname, cl->buffer);
+ if(c->buffer[i] == '\n')
+ {
+ c->buffer[i] = '\0'; /* replace end-of-line by end-of-string so we can use sscanf */
+ reqlen = i + 1;
+ break;
+ }
+ }
- if(receive_request(cl))
+ if(reqlen)
+ {
+ if(receive_request(c))
return -1;
return -1;
- cl->buflen -= cl->reqlen;
- memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
+ c->buflen -= reqlen;
+ lenin -= reqlen;
+ memmove(c->buffer, c->buffer + reqlen, c->buflen);
oldlen = 0;
oldlen = 0;
+ continue;
}
else
{
}
else
{
@@
-174,14
+197,14
@@
cp
}
}
}
}
- if(c
l
->buflen >= MAXBUFSIZE)
+ if(c->buflen >= MAXBUFSIZE)
{
syslog(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
{
syslog(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
- c
l->name, cl
->hostname);
+ c
->name, c
->hostname);
return -1;
}
return -1;
}
- c
l->last_ping_time = time(NULL)
;
+ c
->last_ping_time = now
;
cp
return 0;
}
cp
return 0;
}