projects
/
oweals
/
tinc.git
/ 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.
[oweals/tinc.git]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index a08981f96b64679925defcf16e3bdc41bad15532..0718a8c5725acd0576b32110e7600f28e57e0ea4 100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-218,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;
@@
-247,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 */
@@
-541,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) {