projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging of the entire pre5 branch.
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
a86faa9
..
815de4b
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.2
0 2001/10/27 12:13:17
guus Exp $
+ $Id: connection.c,v 1.1.2.2
7 2002/02/10 21:57:53
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>
@@
-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)
@@
-97,7
+106,7
@@
cp
cp
}
cp
}
-connection_t *lookup_connection(ipv4_t address,
short unsigned in
t port)
+connection_t *lookup_connection(ipv4_t address,
port_
t port)
{
connection_t c;
cp
{
connection_t c;
cp