projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use xstrdup() instead of xasprintf() to copy static strings.
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
2b177c1
..
0718a8c
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-2,6
+2,7
@@
net_setup.c -- Setup.
Copyright (C) 1998-2005 Ivo Timmermans,
2000-2009 Guus Sliepen <guus@tinc-vpn.org>
net_setup.c -- Setup.
Copyright (C) 1998-2005 Ivo Timmermans,
2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+ 2006 Scott Lamb <slamb@slamb.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-217,8
+218,8
@@
bool setup_myself(void) {
myself->connection = new_connection();
init_configuration(&myself->connection->config_tree);
myself->connection = new_connection();
init_configuration(&myself->connection->config_tree);
-
xasprintf(&myself->hostname,
"MYSELF");
-
xasprintf(&myself->connection->hostname,
"MYSELF");
+
myself->hostname = xstrdup(
"MYSELF");
+
myself->connection->hostname = xstrdup(
"MYSELF");
myself->connection->options = 0;
myself->connection->protocol_version = PROT_CURRENT;
myself->connection->options = 0;
myself->connection->protocol_version = PROT_CURRENT;
@@
-246,7
+247,7
@@
bool setup_myself(void) {
return false;
if(!get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
return false;
if(!get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
-
xasprintf(&myport,
"655");
+
myport = xstrdup(
"655");
/* Read in all the subnets specified in the host configuration file */
/* Read in all the subnets specified in the host configuration file */
@@
-351,14
+352,14
@@
bool setup_myself(void) {
}
}
} else
}
}
} else
- myself->incipher = EVP_
aes_256
_cbc();
+ myself->incipher = EVP_
bf
_cbc();
if(myself->incipher)
myself->inkeylength = myself->incipher->key_len + myself->incipher->iv_len;
else
myself->inkeylength = 1;
if(myself->incipher)
myself->inkeylength = myself->incipher->key_len + myself->incipher->iv_len;
else
myself->inkeylength = 1;
- myself->connection->outcipher = EVP_
aes_256
_ofb();
+ myself->connection->outcipher = EVP_
bf
_ofb();
if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
keylifetime = 3600;
if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
keylifetime = 3600;
@@
-379,9
+380,9
@@
bool setup_myself(void) {
}
}
} else
}
}
} else
- myself->indigest = EVP_sha
256
();
+ myself->indigest = EVP_sha
1
();
- myself->connection->outdigest = EVP_sha
256
();
+ myself->connection->outdigest = EVP_sha
1
();
if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->inmaclength)) {
if(myself->indigest) {
if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->inmaclength)) {
if(myself->indigest) {
@@
-540,10
+541,17
@@
void close_network_connections(void) {
for(node = connection_tree->head; node; node = next) {
next = node->next;
c = node->data;
for(node = connection_tree->head; node; node = next) {
next = node->next;
c = node->data;
- c->outgoing =
false
;
+ c->outgoing =
NULL
;
terminate_connection(c, false);
}
terminate_connection(c, false);
}
+ for(list_node_t *node = outgoing_list->head; node; node = node->next) {
+ outgoing_t *outgoing = node->data;
+
+ if(outgoing->event)
+ event_del(outgoing->event);
+ }
+
list_delete_list(outgoing_list);
if(myself && myself->connection) {
list_delete_list(outgoing_list);
if(myself && myself->connection) {