projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finish crypto wrapping. Also provide wrappers for OpenSSL.
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
b4a17ad
..
a369cb8
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-200
3 Guus Sliepen <guus@sliepen.eu
.org>,
- 2000-200
3 Ivo Timmermans <ivo@o2w.nl>
+ Copyright (C) 2000-200
7 Guus Sliepen <guus@tinc-vpn
.org>,
+ 2000-200
5 Ivo Timmermans
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,12
+17,13
@@
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.44 2003/08/28 21:05:10 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
-#include "avl_tree.h"
+#include "splay_tree.h"
+#include "cipher.h"
#include "conf.h"
#include "list.h"
#include "logger.h"
#include "conf.h"
#include "list.h"
#include "logger.h"
@@
-32,87
+33,76
@@
#include "utils.h"
#include "xalloc.h"
#include "utils.h"
#include "xalloc.h"
-
avl_tree_t *connection_tree;
/* Meta connections */
+
splay_tree_t *connection_tree;
/* Meta connections */
connection_t *broadcast;
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();
cp();
- connection_tree =
avl_alloc_tree((avl_compare_t) connection_compare, NULL
);
+ connection_tree =
splay_alloc_tree((splay_compare_t) connection_compare, (splay_action_t) free_connection
);
broadcast = new_connection();
broadcast->name = xstrdup(_("everyone"));
broadcast->hostname = xstrdup(_("BROADCAST"));
}
broadcast = new_connection();
broadcast->name = xstrdup(_("everyone"));
broadcast->hostname = xstrdup(_("BROADCAST"));
}
-void exit_connections(void)
-{
+void exit_connections(void) {
cp();
cp();
-
avl
_delete_tree(connection_tree);
+
splay
_delete_tree(connection_tree);
free_connection(broadcast);
}
free_connection(broadcast);
}
-connection_t *new_connection(void)
-{
- connection_t *c;
-
+connection_t *new_connection(void) {
cp();
cp();
- c = xmalloc_and_zero(sizeof(connection_t));
-
- if(!c)
- return NULL;
-
- gettimeofday(&c->start, NULL);
-
- return c;
+ return xmalloc_and_zero(sizeof(connection_t));
}
}
-void free_connection(connection_t *c)
-{
+void free_connection(connection_t *c) {
cp();
cp();
- if(
c->hostname
)
-
free(c->hostname)
;
+ if(
!c
)
+
return
;
- if(c->
inkey
)
- free(c->
inkey
);
+ if(c->
name
)
+ free(c->
name
);
- if(c->
outkey
)
- free(c->
outkey
);
+ if(c->
hostname
)
+ free(c->
hostname
);
- if(c->mychallenge)
-
free(c->mychallenge
);
+ cipher_close(&c->incipher);
+
cipher_close(&c->outcipher
);
if(c->hischallenge)
free(c->hischallenge);
if(c->hischallenge)
free(c->hischallenge);
+ if(c->buffer)
+ bufferevent_free(c->buffer);
+
+ if(event_initialized(&c->inevent))
+ event_del(&c->inevent);
+
free(c);
}
free(c);
}
-void connection_add(connection_t *c)
-{
+void connection_add(connection_t *c) {
cp();
cp();
-
avl
_insert(connection_tree, c);
+
splay
_insert(connection_tree, c);
}
}
-void connection_del(connection_t *c)
-{
+void connection_del(connection_t *c) {
cp();
cp();
-
avl
_delete(connection_tree, c);
+
splay
_delete(connection_tree, c);
}
}
-void dump_connections(void)
-{
- avl_node_t *node;
+void dump_connections(void) {
+ splay_node_t *node;
connection_t *c;
cp();
connection_t *c;
cp();
@@
-122,14
+112,13
@@
void dump_connections(void)
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"),
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"),
- c->name, c->hostname, c->options, c->socket,
*(uint32_t *)&c->status
);
+ c->name, c->hostname, c->options, c->socket,
c->status.value
);
}
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;