projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big bad commit:
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
3fadb0d
..
786d56a
100644
(file)
--- a/
src/meta.c
+++ b/
src/meta.c
@@
-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.
18 2001/05/25 11:54:28
guus Exp $
+ $Id: meta.c,v 1.1.2.
21 2001/10/27 12:13:17
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-32,18
+32,14
@@
/* This line must be below the rest for FreeBSD */
#include <sys/socket.h>
/* This line must be below the rest for FreeBSD */
#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 *bufp;
int outlen;
{
char *bufp;
int outlen;
@@
-51,41
+47,41
@@
int send_meta(connection_t *cl, char *buffer, int length)
cp
if(debug_lvl >= DEBUG_META)
syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
cp
if(debug_lvl >= DEBUG_META)
syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
- c
l->name, cl
->hostname);
+ 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"), c
l->name, cl
->hostname);
+ syslog(LOG_ERR, _("Sending meta data to %s (%s) failed: %m"), c
->name, c
->hostname);
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;
@@
-93,16
+89,16
@@
int receive_meta(connection_t *cl)
int decrypted = 0;
char inbuf[MAXBUFSIZE];
cp
int decrypted = 0;
char inbuf[MAXBUFSIZE];
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__, c
l->meta_
socket,
- c
l->name, cl
->hostname);
+ syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, c
->
socket,
+ 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;
}
@@
-115,7
+111,7
@@
cp
- If not, keep stuff in buffer and exit.
*/
- If not, keep stuff in buffer and exit.
*/
- lenin = read(c
l->meta_socket, cl->buffer + cl->buflen, MAXBUFSIZE - cl
->buflen);
+ lenin = read(c
->socket, c->buffer + c->buflen, MAXBUFSIZE - c
->buflen);
if(lenin<=0)
{
if(lenin<=0)
{
@@
-123,45
+119,45
@@
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
syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
}
else
if(errno==EINTR)
return 0;
else
syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
- c
l->name, cl
->hostname);
+ c
->name, c
->hostname);
return -1;
}
return -1;
}
- oldlen = c
l
->buflen;
- c
l
->buflen += lenin;
+ oldlen = c->buflen;
+ c->buflen += lenin;
while(lenin)
{
/* Decrypt */
while(lenin)
{
/* Decrypt */
- if(c
l
->status.decryptin && !decrypted)
+ if(c->status.decryptin && !decrypted)
{
{
- EVP_DecryptUpdate(c
l->cipher_inctx, inbuf, &lenin, cl
->buffer + oldlen, lenin);
- memcpy(c
l
->buffer + oldlen, inbuf, lenin);
+ EVP_DecryptUpdate(c
->inctx, inbuf, &lenin, c
->buffer + oldlen, lenin);
+ memcpy(c->buffer + oldlen, inbuf, lenin);
decrypted = 1;
}
/* Are we receiving a TCPpacket? */
decrypted = 1;
}
/* Are we receiving a TCPpacket? */
- if(c
l
->tcplen)
+ if(c->tcplen)
{
{
- if(c
l->tcplen <= cl
->buflen)
+ if(c
->tcplen <= c
->buflen)
{
{
- receive_tcppacket(c
l, cl->buffer, cl
->tcplen);
+ receive_tcppacket(c
, c->buffer, c
->tcplen);
- c
l->buflen -= cl
->tcplen;
- lenin -= c
l
->tcplen;
- memmove(c
l->buffer, cl->buffer + cl->tcplen, cl
->buflen);
+ c
->buflen -= c
->tcplen;
+ lenin -= c->tcplen;
+ memmove(c
->buffer, c->buffer + c->tcplen, c
->buflen);
oldlen = 0;
oldlen = 0;
- c
l
->tcplen = 0;
+ c->tcplen = 0;
continue;
}
else
continue;
}
else
@@
-174,11
+170,11
@@
cp
reqlen = 0;
reqlen = 0;
- for(i = oldlen; i < c
l
->buflen; i++)
+ for(i = oldlen; i < c->buflen; i++)
{
{
- if(c
l
->buffer[i] == '\n')
+ if(c->buffer[i] == '\n')
{
{
- c
l
->buffer[i] = '\0'; /* replace end-of-line by end-of-string so we can use sscanf */
+ c->buffer[i] = '\0'; /* replace end-of-line by end-of-string so we can use sscanf */
reqlen = i + 1;
break;
}
reqlen = i + 1;
break;
}
@@
-186,12
+182,12
@@
cp
if(reqlen)
{
if(reqlen)
{
- if(receive_request(c
l
))
+ if(receive_request(c))
return -1;
return -1;
- c
l
->buflen -= reqlen;
+ c->buflen -= reqlen;
lenin -= reqlen;
lenin -= reqlen;
- memmove(c
l->buffer, cl->buffer + reqlen, cl
->buflen);
+ memmove(c
->buffer, c->buffer + reqlen, c
->buflen);
oldlen = 0;
continue;
}
oldlen = 0;
continue;
}
@@
-201,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 = time(NULL);
cp
return 0;
}
cp
return 0;
}