projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add #ifdefs in case not all platforms support IPv4 and IPv6 multicast.
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
9a26ec9
..
9b752fa
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>
@@
-23,16
+23,13
@@
#include "avl_tree.h"
#include "conf.h"
#include "avl_tree.h"
#include "conf.h"
-#include "list.h"
#include "logger.h"
#include "logger.h"
-#include "net.h" /* Don't ask. */
-#include "netutl.h"
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
avl_tree_t *connection_tree; /* Meta connections */
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
avl_tree_t *connection_tree; /* Meta connections */
-connection_t *
broadcast
;
+connection_t *
everyone
;
static int connection_compare(const connection_t *a, const connection_t *b) {
return a < b ? -1 : a == b ? 0 : 1;
static int connection_compare(const connection_t *a, const connection_t *b) {
return a < b ? -1 : a == b ? 0 : 1;
@@
-40,14
+37,14
@@
static int connection_compare(const connection_t *a, const connection_t *b) {
void init_connections(void) {
connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
void init_connections(void) {
connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
-
broadcast
= new_connection();
-
broadcast
->name = xstrdup("everyone");
-
broadcast
->hostname = xstrdup("BROADCAST");
+
everyone
= new_connection();
+
everyone
->name = xstrdup("everyone");
+
everyone
->hostname = xstrdup("BROADCAST");
}
void exit_connections(void) {
avl_delete_tree(connection_tree);
}
void exit_connections(void) {
avl_delete_tree(connection_tree);
- free_connection(
broadcast
);
+ free_connection(
everyone
);
}
connection_t *new_connection(void) {
}
connection_t *new_connection(void) {
@@
-63,44
+60,54
@@
connection_t *new_connection(void) {
return c;
}
return c;
}
-void free_connection(connection_t *c) {
- if(c->name)
- free(c->name);
-
- if(c->hostname)
- free(c->hostname);
-
- if(c->inkey)
- free(c->inkey);
-
- if(c->outkey)
- free(c->outkey);
+void free_connection_partially(connection_t *c) {
+ free(c->inkey);
+ free(c->outkey);
+ free(c->mychallenge);
+ free(c->hischallenge);
+ free(c->outbuf);
+
+ c->inkey = NULL;
+ c->outkey = NULL;
+ c->mychallenge = NULL;
+ c->hischallenge = NULL;
+ c->outbuf = NULL;
+
+ c->buflen = 0;
+ c->reqlen = 0;
+ c->tcplen = 0;
+ c->allow_request = 0;
+ c->outbuflen = 0;
+ c->outbufsize = 0;
+ c->outbufstart = 0;
if(c->inctx) {
EVP_CIPHER_CTX_cleanup(c->inctx);
free(c->inctx);
if(c->inctx) {
EVP_CIPHER_CTX_cleanup(c->inctx);
free(c->inctx);
+ c->inctx = NULL;
}
if(c->outctx) {
EVP_CIPHER_CTX_cleanup(c->outctx);
free(c->outctx);
}
if(c->outctx) {
EVP_CIPHER_CTX_cleanup(c->outctx);
free(c->outctx);
+ c->outctx = NULL;
}
}
- if(c->mychallenge)
- free(c->mychallenge);
+ if(c->rsa_key) {
+ RSA_free(c->rsa_key);
+ c->rsa_key = NULL;
+ }
+}
+
+void free_connection(connection_t *c) {
+ free_connection_partially(c);
- if(c->hischallenge)
-
free(c->hischalleng
e);
+ free(c->name);
+
free(c->hostnam
e);
if(c->config_tree)
exit_configuration(&c->config_tree);
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);
}
@@
-127,14
+134,3
@@
void dump_connections(void) {
logger(LOG_DEBUG, "End of connections.");
}
logger(LOG_DEBUG, "End of connections.");
}
-
-bool read_connection_config(connection_t *c) {
- char *fname;
- int x;
-
- xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
- x = read_config_file(c->config_tree, fname);
- free(fname);
-
- return x == 0;
-}