projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
b61609a
..
dd52448
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>
@@
-54,31
+54,19
@@
connection_t *new_connection(void) {
return xmalloc_and_zero(sizeof(connection_t));
}
return xmalloc_and_zero(sizeof(connection_t));
}
-void free_connection(connection_t *c) {
- if(!c)
- return;
-
- if(c->name)
- free(c->name);
-
- if(c->hostname)
- free(c->hostname);
-
+void free_connection_partially(connection_t *c) {
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);
- s
top_sptps
(&c->sptps);
+ s
ptps_stop
(&c->sptps);
ecdsa_free(&c->ecdsa);
rsa_free(&c->rsa);
if(c->hischallenge)
free(c->hischallenge);
ecdsa_free(&c->ecdsa);
rsa_free(&c->rsa);
if(c->hischallenge)
free(c->hischallenge);
- if(c->config_tree)
- exit_configuration(&c->config_tree);
-
buffer_clear(&c->inbuf);
buffer_clear(&c->outbuf);
buffer_clear(&c->inbuf);
buffer_clear(&c->outbuf);
@@
-91,6
+79,21
@@
void free_connection(connection_t *c) {
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);
+
+ if(c->config_tree)
+ exit_configuration(&c->config_tree);
+
free(c);
}
free(c);
}