projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
K&R style braces
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
c4c9fd4
..
58e2d35
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-1,6
+1,6
@@
/*
connection.c -- connection list management
/*
connection.c -- connection list management
- Copyright (C) 2000-200
6
Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-200
7
Guus Sliepen <guus@tinc-vpn.org>,
2000-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
2000-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
@@
-35,13
+35,11
@@
avl_tree_t *connection_tree; /* Meta connections */
connection_t *broadcast;
avl_tree_t *connection_tree; /* Meta connections */
connection_t *broadcast;
-static int connection_compare(const connection_t *a, const connection_t *b)
-{
+static int connection_compare(const connection_t *a, const connection_t *b) {
return (void *)a - (void *)b;
}
return (void *)a - (void *)b;
}
-void init_connections(void)
-{
+void init_connections(void) {
cp();
connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
cp();
connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
@@
-50,16
+48,14
@@
void init_connections(void)
broadcast->hostname = xstrdup(_("BROADCAST"));
}
broadcast->hostname = xstrdup(_("BROADCAST"));
}
-void exit_connections(void)
-{
+void exit_connections(void) {
cp();
avl_delete_tree(connection_tree);
free_connection(broadcast);
}
cp();
avl_delete_tree(connection_tree);
free_connection(broadcast);
}
-connection_t *new_connection(void)
-{
+connection_t *new_connection(void) {
connection_t *c;
cp();
connection_t *c;
cp();
@@
-70,14
+66,20
@@
connection_t *new_connection(void)
return NULL;
gettimeofday(&c->start, NULL);
return NULL;
gettimeofday(&c->start, NULL);
+ event_set(&c->ev, -1, 0, NULL, NULL);
return c;
}
return c;
}
-void free_connection(connection_t *c)
-{
+void free_connection(connection_t *c) {
cp();
cp();
+ if(!c)
+ return;
+
+ if(c->name)
+ free(c->name);
+
if(c->hostname)
free(c->hostname);
if(c->hostname)
free(c->hostname);
@@
-93,25
+95,23
@@
void free_connection(connection_t *c)
if(c->hischallenge)
free(c->hischallenge);
if(c->hischallenge)
free(c->hischallenge);
+ event_del(&c->ev);
free(c);
}
free(c);
}
-void connection_add(connection_t *c)
-{
+void connection_add(connection_t *c) {
cp();
avl_insert(connection_tree, c);
}
cp();
avl_insert(connection_tree, c);
}
-void connection_del(connection_t *c)
-{
+void connection_del(connection_t *c) {
cp();
avl_delete(connection_tree, c);
}
cp();
avl_delete(connection_tree, c);
}
-void dump_connections(void)
-{
+void dump_connections(void) {
avl_node_t *node;
connection_t *c;
avl_node_t *node;
connection_t *c;
@@
-129,8
+129,7
@@
void dump_connections(void)
logger(LOG_DEBUG, _("End of connections."));
}
logger(LOG_DEBUG, _("End of connections."));
}
-bool read_connection_config(connection_t *c)
-{
+bool read_connection_config(connection_t *c) {
char *fname;
int x;
char *fname;
int x;