projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor outgoing connection handling.
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
9587819
..
7999b6f
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-20
09
Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-20
12
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>
@@
-58,26
+58,16
@@
void free_connection(connection_t *c) {
if(!c)
return;
if(!c)
return;
- if(c->name)
- free(c->name);
-
- if(c->hostname)
- free(c->hostname);
-
cipher_close(&c->incipher);
digest_close(&c->indigest);
cipher_close(&c->outcipher);
digest_close(&c->outdigest);
cipher_close(&c->incipher);
digest_close(&c->indigest);
cipher_close(&c->outcipher);
digest_close(&c->outdigest);
-
ecdh_free(&c->ecdh
);
+
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);
-
- if(c->config_tree)
- exit_configuration(&c->config_tree);
+ free(c->hischallenge);
buffer_clear(&c->inbuf);
buffer_clear(&c->outbuf);
buffer_clear(&c->inbuf);
buffer_clear(&c->outbuf);
@@
-91,6
+81,12
@@
void free_connection(connection_t *c) {
if(c->socket > 0)
closesocket(c->socket);
if(c->socket > 0)
closesocket(c->socket);
+ free(c->name);
+ free(c->hostname);
+
+ if(c->config_tree)
+ exit_configuration(&c->config_tree);
+
free(c);
}
free(c);
}
@@
-108,7
+104,7
@@
bool dump_connections(connection_t *cdump) {
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
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 %04
x",
+ 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));