projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split connection list into two lists:
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
c1acfea
..
c09ca94
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-17,13
+17,14
@@
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.1
0 2001/03/04 13:59:25
guus Exp $
+ $Id: connection.c,v 1.1.2.1
3 2001/07/15 18:07:31
guus Exp $
*/
#include "config.h"
#include <stdio.h>
#include <syslog.h>
*/
#include "config.h"
#include <stdio.h>
#include <syslog.h>
+#include <string.h>
#include <avl_tree.h>
#include <list.h>
#include <avl_tree.h>
#include <list.h>
@@
-41,6
+42,7
@@
/* Root of the connection list */
avl_tree_t *connection_tree;
/* Root of the connection list */
avl_tree_t *connection_tree;
+avl_tree_t *active_tree;
avl_tree_t *id_tree;
/* Pointer to connection describing myself */
avl_tree_t *id_tree;
/* Pointer to connection describing myself */
@@
-50,6
+52,11
@@
connection_t *myself = NULL;
/* Initialization and callbacks */
int connection_compare(connection_t *a, connection_t *b)
/* Initialization and callbacks */
int connection_compare(connection_t *a, connection_t *b)
+{
+ return a->meta_socket - b->meta_socket;
+}
+
+int active_compare(connection_t *a, connection_t *b)
{
ipv4_t result;
{
ipv4_t result;
@@
-68,6
+75,7
@@
int id_compare(connection_t *a, connection_t *b)
void init_connections(void)
{
connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, (avl_action_t)free_connection);
void init_connections(void)
{
connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, (avl_action_t)free_connection);
+ active_tree = avl_alloc_tree((avl_compare_t)active_compare, NULL);
id_tree = avl_alloc_tree((avl_compare_t)id_compare, NULL);
}
id_tree = avl_alloc_tree((avl_compare_t)id_compare, NULL);
}
@@
-88,7
+96,7
@@
void free_connection(connection_t *p)
cp
if(p->queue)
list_delete_list(p->queue);
cp
if(p->queue)
list_delete_list(p->queue);
- if(p->name
&& p->name!=unknown
)
+ if(p->name)
free(p->name);
if(p->hostname)
free(p->hostname);
free(p->name);
if(p->hostname)
free(p->hostname);
@@
-129,6
+137,7
@@
void destroy_connection_tree(void)
{
cp
avl_delete_tree(id_tree);
{
cp
avl_delete_tree(id_tree);
+ avl_delete_tree(active_tree);
avl_delete_tree(connection_tree);
cp
}
avl_delete_tree(connection_tree);
cp
}
@@
-142,6
+151,13
@@
cp
cp
}
cp
}
+void active_add(connection_t *cl)
+{
+cp
+ avl_insert(active_tree, cl);
+cp
+}
+
void id_add(connection_t *cl)
{
cp
void id_add(connection_t *cl)
{
cp
@@
-153,20
+169,21
@@
void connection_del(connection_t *cl)
{
cp
avl_delete(id_tree, cl);
{
cp
avl_delete(id_tree, cl);
+ avl_delete(active_tree, cl);
avl_delete(connection_tree, cl);
cp
}
/* Lookup functions */
avl_delete(connection_tree, cl);
cp
}
/* Lookup functions */
-connection_t *lookup_
connection
(ipv4_t address, short unsigned int port)
+connection_t *lookup_
active
(ipv4_t address, short unsigned int port)
{
connection_t cl;
cp
cl.address = address;
cl.port = port;
{
connection_t cl;
cp
cl.address = address;
cl.port = port;
- return avl_search(
connection
_tree, &cl);
+ return avl_search(
active
_tree, &cl);
}
connection_t *lookup_id(char *name)
}
connection_t *lookup_id(char *name)