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
fafec5d
..
7999b6f
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-54,7
+54,10
@@
connection_t *new_connection(void) {
return xmalloc_and_zero(sizeof(connection_t));
}
return xmalloc_and_zero(sizeof(connection_t));
}
-void free_connection_partially(connection_t *c) {
+void free_connection(connection_t *c) {
+ if(!c)
+ return;
+
cipher_close(&c->incipher);
digest_close(&c->indigest);
cipher_close(&c->outcipher);
cipher_close(&c->incipher);
digest_close(&c->indigest);
cipher_close(&c->outcipher);
@@
-64,10
+67,7
@@
void free_connection_partially(connection_t *c) {
ecdsa_free(&c->ecdsa);
rsa_free(&c->rsa);
ecdsa_free(&c->ecdsa);
rsa_free(&c->rsa);
- if(c->hischallenge) {
- free(c->hischallenge);
- c->hischallenge = NULL;
- }
+ free(c->hischallenge);
buffer_clear(&c->inbuf);
buffer_clear(&c->outbuf);
buffer_clear(&c->inbuf);
buffer_clear(&c->outbuf);
@@
-81,19
+81,6
@@
void free_connection_partially(connection_t *c) {
if(c->socket > 0)
closesocket(c->socket);
if(c->socket > 0)
closesocket(c->socket);
- c->socket = -1;
-
- c->protocol_major = 0;
- c->protocol_minor = 0;
- c->allow_request = 0;
-}
-
-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);