projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve use of compiler attributes
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
a829e82
..
0318613
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-267,7
+267,7
@@
bool setup_myself_reloadable(void) {
proxytype = PROXY_EXEC;
} else {
logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type %s!", proxy);
proxytype = PROXY_EXEC;
} else {
logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type %s!", proxy);
- free(proxy);
+ free
_string
(proxy);
return false;
}
return false;
}
@@
-277,10
+277,10
@@
bool setup_myself_reloadable(void) {
free(proxyport);
proxyport = NULL;
free(proxyport);
proxyport = NULL;
- free(proxyuser);
+ free
_string
(proxyuser);
proxyuser = NULL;
proxyuser = NULL;
- free(proxypass);
+ free
_string
(proxypass);
proxypass = NULL;
switch(proxytype) {
proxypass = NULL;
switch(proxytype) {
@@
-291,7
+291,7
@@
bool setup_myself_reloadable(void) {
case PROXY_EXEC:
if(!space || !*space) {
logger(DEBUG_ALWAYS, LOG_ERR, "Argument expected for proxy type exec!");
case PROXY_EXEC:
if(!space || !*space) {
logger(DEBUG_ALWAYS, LOG_ERR, "Argument expected for proxy type exec!");
- free(proxy);
+ free
_string
(proxy);
return false;
}
return false;
}
@@
-312,7
+312,7
@@
bool setup_myself_reloadable(void) {
logger(DEBUG_ALWAYS, LOG_ERR, "Host and port argument expected for proxy!");
proxyport = NULL;
proxyhost = NULL;
logger(DEBUG_ALWAYS, LOG_ERR, "Host and port argument expected for proxy!");
proxyport = NULL;
proxyhost = NULL;
- free(proxy);
+ free
_string
(proxy);
return false;
}
return false;
}
@@
-338,7
+338,7
@@
bool setup_myself_reloadable(void) {
break;
}
break;
}
- free(proxy);
+ free
_string
(proxy);
}
bool choice;
}
bool choice;
@@
-788,9
+788,11
@@
static bool setup_myself(void) {
}
}
}
}
-
myself->connection->
rsa = read_rsa_private_key(&config_tree, NULL);
+
rsa_t *
rsa = read_rsa_private_key(&config_tree, NULL);
- if(!myself->connection->rsa) {
+ if(rsa) {
+ myself->connection->legacy = new_legacy_ctx(rsa);
+ } else {
if(experimental) {
logger(DEBUG_ALWAYS, LOG_WARNING, "Support for legacy protocol disabled.");
} else {
if(experimental) {
logger(DEBUG_ALWAYS, LOG_WARNING, "Support for legacy protocol disabled.");
} else {
@@
-901,7
+903,8
@@
static bool setup_myself(void) {
if(!cipher_open_by_name(myself->incipher, cipher)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
if(!cipher_open_by_name(myself->incipher, cipher)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
- cipher_free(&myself->incipher);
+ cipher_free(myself->incipher);
+ myself->incipher = NULL;
free(cipher);
return false;
}
free(cipher);
return false;
}
@@
-936,7
+939,8
@@
static bool setup_myself(void) {
if(!digest_open_by_name(myself->indigest, digest, maclength)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
if(!digest_open_by_name(myself->indigest, digest, maclength)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
- digest_free(&myself->indigest);
+ digest_free(myself->indigest);
+ myself->indigest = NULL;
free(digest);
return false;
}
free(digest);
return false;
}
@@
-946,7
+950,11
@@
static bool setup_myself(void) {
#endif
/* Compression */
#endif
/* Compression */
- if(get_config_int(lookup_config(&config_tree, "Compression"), &myself->incompression)) {
+ int incompression = 0;
+
+ if(get_config_int(lookup_config(&config_tree, "Compression"), &incompression)) {
+ myself->incompression = incompression;
+
switch(myself->incompression) {
case COMPRESS_LZ4:
#ifdef HAVE_LZ4
switch(myself->incompression) {
case COMPRESS_LZ4:
#ifdef HAVE_LZ4
@@
-996,8
+1004,6
@@
static bool setup_myself(void) {
myself->incompression = COMPRESS_NONE;
}
myself->incompression = COMPRESS_NONE;
}
- myself->connection->outcompression = COMPRESS_NONE;
-
/* Done */
myself->nexthop = myself;
/* Done */
myself->nexthop = myself;