projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Preserve inpkt->len, needed for broadcasts.
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
d606e9c
..
8620e4a
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-1,7
+1,7
@@
/*
connection.c -- connection list management
/*
connection.c -- connection list management
- 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: connection.c,v 1.1.2.
19 2001/10/10 20:35:10
guus Exp $
+ $Id: connection.c,v 1.1.2.
28 2002/02/18 16:25:16
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-25,6
+25,7
@@
#include <stdio.h>
#include <syslog.h>
#include <string.h>
#include <stdio.h>
#include <syslog.h>
#include <string.h>
+#include <sys/time.h>
#include <avl_tree.h>
#include <list.h>
#include <avl_tree.h>
#include <list.h>
@@
-43,7
+44,7
@@
avl_tree_t *connection_tree; /* Meta connections */
int connection_compare(connection_t *a, connection_t *b)
{
int connection_compare(connection_t *a, connection_t *b)
{
- return a
->socket - b->socket
;
+ return a
- b
;
}
void init_connections(void)
}
void init_connections(void)
@@
-53,7
+54,7
@@
cp
cp
}
cp
}
-void exit_connection(void)
+void exit_connection
s
(void)
{
cp
avl_delete_tree(connection_tree);
{
cp
avl_delete_tree(connection_tree);
@@
-62,8
+63,16
@@
cp
connection_t *new_connection(void)
{
connection_t *new_connection(void)
{
+ connection_t *c;
+cp
+ c = (connection_t *)xmalloc_and_zero(sizeof(connection_t));
+
+ if(!c)
+ return NULL;
+
+ gettimeofday(&c->start, NULL);
cp
cp
- return
(connection_t *)xmalloc_and_zero(sizeof(connection_t))
;
+ return
c
;
}
void free_connection(connection_t *c)
}
void free_connection(connection_t *c)
@@
-71,8
+80,6
@@
void free_connection(connection_t *c)
cp
if(c->hostname)
free(c->hostname);
cp
if(c->hostname)
free(c->hostname);
- if(c->rsa_key)
- RSA_free(c->rsa_key);
if(c->inkey)
free(c->inkey);
if(c->outkey)
if(c->inkey)
free(c->inkey);
if(c->outkey)
@@
-99,16
+106,6
@@
cp
cp
}
cp
}
-connection_t *lookup_connection(ipv4_t address, short unsigned int port)
-{
- connection_t c;
-cp
- c.address = address;
- c.port = port;
-
- return avl_search(connection_tree, &c);
-}
-
void dump_connections(void)
{
avl_node_t *node;
void dump_connections(void)
{
avl_node_t *node;
@@
-119,11
+116,22
@@
cp
for(node = connection_tree->head; node; node = node->next)
{
c = (connection_t *)node->data;
for(node = connection_tree->head; node; node = node->next)
{
c = (connection_t *)node->data;
- syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld socket %d status %04x"),
- c->node->name, c->hostname, c->port, c->options,
- c->socket, c->status);
+ syslog(LOG_DEBUG, _(" %s at %s options %ld socket %d status %04x"),
+ c->name, c->hostname, c->options, c->socket, c->status);
}
syslog(LOG_DEBUG, _("End of connections."));
cp
}
}
syslog(LOG_DEBUG, _("End of connections."));
cp
}
+
+int read_connection_config(connection_t *c)
+{
+ char *fname;
+ int x;
+cp
+ asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+ x = read_config_file(c->config_tree, fname);
+ free(fname);
+cp
+ return x;
+}