projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing closedir().
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
dd52448
..
496f674
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-201
2
Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-201
3
Guus Sliepen <guus@tinc-vpn.org>,
2000-2005 Ivo Timmermans
2008 Max Rijevski <maksuf@gmail.com>
2000-2005 Ivo Timmermans
2008 Max Rijevski <maksuf@gmail.com>
@@
-21,73
+21,59
@@
#include "system.h"
#include "system.h"
-#include "
splay_tree
.h"
+#include "
list
.h"
#include "cipher.h"
#include "conf.h"
#include "control_common.h"
#include "list.h"
#include "logger.h"
#include "cipher.h"
#include "conf.h"
#include "control_common.h"
#include "list.h"
#include "logger.h"
+#include "rsa.h"
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
-splay_tree_t *connection_tree; /* Meta connections */
+list_t *connection_list;
connection_t *everyone;
connection_t *everyone;
-static int connection_compare(const connection_t *a, const connection_t *b) {
- return a < b ? -1 : a == b ? 0 : 1;
-}
-
void init_connections(void) {
void init_connections(void) {
- connection_
tree = splay_alloc_tree((splay_compare_t) connection_compare, (splay
_action_t) free_connection);
+ connection_
list = list_alloc((list
_action_t) free_connection);
everyone = new_connection();
everyone->name = xstrdup("everyone");
everyone->hostname = xstrdup("BROADCAST");
}
void exit_connections(void) {
everyone = new_connection();
everyone->name = xstrdup("everyone");
everyone->hostname = xstrdup("BROADCAST");
}
void exit_connections(void) {
-
splay_delete_tree(connection_tree
);
+
list_delete_list(connection_list
);
free_connection(everyone);
}
connection_t *new_connection(void) {
free_connection(everyone);
}
connection_t *new_connection(void) {
- return x
malloc_and_zero
(sizeof(connection_t));
+ return x
zalloc
(sizeof(connection_t));
}
}
-void free_connection_partially(connection_t *c) {
- cipher_close(&c->incipher);
- digest_close(&c->indigest);
- cipher_close(&c->outcipher);
- digest_close(&c->outdigest);
+void free_connection(connection_t *c) {
+ if(!c)
+ return;
+
+ cipher_close(c->incipher);
+ digest_close(c->indigest);
+ cipher_close(c->outcipher);
+ digest_close(c->outdigest);
sptps_stop(&c->sptps);
sptps_stop(&c->sptps);
- ecdsa_free(
&
c->ecdsa);
- rsa_free(
&
c->rsa);
+ ecdsa_free(c->ecdsa);
+ rsa_free(c->rsa);
- if(c->hischallenge)
- free(c->hischallenge);
+ free(c->hischallenge);
buffer_clear(&c->inbuf);
buffer_clear(&c->outbuf);
buffer_clear(&c->inbuf);
buffer_clear(&c->outbuf);
-
- if(event_initialized(&c->inevent))
- event_del(&c->inevent);
- if(event_initialized(&c->outevent))
- event_del(&c->outevent);
+ io_del(&c->io);
if(c->socket > 0)
closesocket(c->socket);
if(c->socket > 0)
closesocket(c->socket);
- c->socket = -1;
-}
-
-void free_connection(connection_t *c) {
- if(!c)
- return;
-
- free_connection_partially(c);
-
free(c->name);
free(c->hostname);
free(c->name);
free(c->hostname);
@@
-98,20
+84,16
@@
void free_connection(connection_t *c) {
}
void connection_add(connection_t *c) {
}
void connection_add(connection_t *c) {
-
splay_insert(connection_tree
, c);
+
list_insert_tail(connection_list
, c);
}
void connection_del(connection_t *c) {
}
void connection_del(connection_t *c) {
-
splay_delete(connection_tree
, c);
+
list_delete(connection_list
, c);
}
bool dump_connections(connection_t *cdump) {
}
bool dump_connections(connection_t *cdump) {
- splay_node_t *node;
- connection_t *c;
-
- for(node = connection_tree->head; node; node = node->next) {
- c = node->data;
- send_request(cdump, "%d %d %s at %s options %x socket %d status %04x",
+ for list_each(connection_t, c, connection_list) {
+ send_request(cdump, "%d %d %s %s %x %d %x",
CONTROL, REQ_DUMP_CONNECTIONS,
c->name, c->hostname, c->options, c->socket,
bitfield_to_int(&c->status, sizeof c->status));
CONTROL, REQ_DUMP_CONNECTIONS,
c->name, c->hostname, c->options, c->socket,
bitfield_to_int(&c->status, sizeof c->status));