X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=e4e8fad81c6bf6087b15f20dbcf229fa2324e06c;hp=089ff0de1babbdb5717d8382e2366e5d560fb058;hb=6c7172d694dcb80e538518282b6c4bd51818f1d2;hpb=f75dcef72a81a337e847adf0bae54198894f65b9 diff --git a/src/connection.c b/src/connection.c index 089ff0de..e4e8fad8 100644 --- a/src/connection.c +++ b/src/connection.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. - $Id: connection.c,v 1.1.2.33 2002/09/09 21:24:31 guus Exp $ + $Id: connection.c,v 1.1.2.36 2003/06/25 20:55:05 guus Exp $ */ #include "config.h" @@ -32,7 +32,6 @@ #include "net.h" /* Don't ask. */ #include "netutl.h" -#include "config.h" #include "conf.h" #include #include "subnet.h" @@ -43,9 +42,9 @@ avl_tree_t *connection_tree; /* Meta connections */ connection_t *broadcast; -int connection_compare(connection_t * a, connection_t * b) +int connection_compare(connection_t *a, connection_t *b) { - return a - b; + return (void *)a - (void *)b; } void init_connections(void) @@ -82,7 +81,7 @@ connection_t *new_connection(void) return c; } -void free_connection(connection_t * c) +void free_connection(connection_t *c) { cp(); @@ -104,14 +103,14 @@ void free_connection(connection_t * c) free(c); } -void connection_add(connection_t * c) +void connection_add(connection_t *c) { cp(); avl_insert(connection_tree, c); } -void connection_del(connection_t * c) +void connection_del(connection_t *c) { cp(); @@ -136,7 +135,7 @@ void dump_connections(void) syslog(LOG_DEBUG, _("End of connections.")); } -int read_connection_config(connection_t * c) +int read_connection_config(connection_t *c) { char *fname; int x;