projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure tinc compiles with gcc -std=c99.
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
53c0fd0
..
430e1c1
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-37,7
+37,7
@@
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
a -
b;
}
void init_connections(void)
}
void init_connections(void)
@@
-90,12
+90,31
@@
void free_connection(connection_t *c)
if(c->outkey)
free(c->outkey);
if(c->outkey)
free(c->outkey);
+ if(c->inctx) {
+ EVP_CIPHER_CTX_cleanup(c->inctx);
+ free(c->inctx);
+ }
+
+ if(c->outctx) {
+ EVP_CIPHER_CTX_cleanup(c->outctx);
+ free(c->outctx);
+ }
+
if(c->mychallenge)
free(c->mychallenge);
if(c->hischallenge)
free(c->hischallenge);
if(c->mychallenge)
free(c->mychallenge);
if(c->hischallenge)
free(c->hischallenge);
+ if(c->config_tree)
+ exit_configuration(&c->config_tree);
+
+ if(c->outbuf)
+ free(c->outbuf);
+
+ if(c->rsa_key)
+ RSA_free(c->rsa_key);
+
free(c);
}
free(c);
}
@@
-125,7
+144,7
@@
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 outbuf %d/%d/%d"),
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x outbuf %d/%d/%d"),
- c->name, c->hostname, c->options, c->socket,
c->status.value
,
+ c->name, c->hostname, c->options, c->socket,
*(uint32_t *)&c->status
,
c->outbufsize, c->outbufstart, c->outbuflen);
}
c->outbufsize, c->outbufstart, c->outbuflen);
}
@@
-139,7
+158,7
@@
bool read_connection_config(connection_t *c)
cp();
cp();
- asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+
x
asprintf(&fname, "%s/hosts/%s", confbase, c->name);
x = read_config_file(c->config_tree, fname);
free(fname);
x = read_config_file(c->config_tree, fname);
free(fname);