projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1.1
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
033bf37
..
17eaec2
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-1,7
+1,7
@@
/*
net_setup.c -- Setup.
Copyright (C) 1998-2005 Ivo Timmermans,
/*
net_setup.c -- Setup.
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-200
6
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-200
9
Guus Sliepen <guus@tinc-vpn.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
@@
-148,14
+148,8
@@
static void keyexpire_handler(int fd, short events, void *data) {
}
void regenerate_key() {
}
void regenerate_key() {
- ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
-
- if(!cipher_regenerate_key(&myself->cipher, true)) {
- logger(LOG_ERR, _("Error regenerating key!"));
- abort();
- }
-
if(timeout_initialized(&keyexpire_event)) {
if(timeout_initialized(&keyexpire_event)) {
+ ifdebug(STATUS) logger(LOG_INFO, _("Expiring symmetric keys"));
event_del(&keyexpire_event);
send_key_changed(broadcast, myself);
} else {
event_del(&keyexpire_event);
send_key_changed(broadcast, myself);
} else {
@@
-242,9
+236,6
@@
bool setup_myself(void) {
if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice) && choice)
myself->options |= OPTION_TCPONLY;
if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice) && choice)
myself->options |= OPTION_TCPONLY;
- if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice)
- myself->options |= OPTION_PMTU_DISCOVERY;
-
if(myself->options & OPTION_TCPONLY)
myself->options |= OPTION_INDIRECT;
if(myself->options & OPTION_TCPONLY)
myself->options |= OPTION_INDIRECT;
@@
-265,11
+256,15
@@
bool setup_myself(void) {
} else
routing_mode = RMODE_ROUTER;
} else
routing_mode = RMODE_ROUTER;
+ if(routing_mode == RMODE_ROUTER)
+ if(!get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) || choice)
+ myself->options |= OPTION_PMTU_DISCOVERY;
+
get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
#if !defined(SOL_IP) || !defined(IP_TOS)
if(priorityinheritance)
get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
#if !defined(SOL_IP) || !defined(IP_TOS)
if(priorityinheritance)
- logger(LOG_WARNING, _("
PriorityInheritance not supported on this platform")
);
+ logger(LOG_WARNING, _("
%s not supported on this platform"), "PriorityInheritance"
);
#endif
if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
#endif
if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
@@
-304,7
+299,7
@@
bool setup_myself(void) {
if(!get_config_string(lookup_config(myself->connection->config_tree, "Cipher"), &cipher))
cipher = xstrdup("blowfish");
if(!get_config_string(lookup_config(myself->connection->config_tree, "Cipher"), &cipher))
cipher = xstrdup("blowfish");
- if(!cipher_open_by_name(&myself->cipher, cipher)) {
+ if(!cipher_open_by_name(&myself->
in
cipher, cipher)) {
logger(LOG_ERR, _("Unrecognized cipher type!"));
return false;
}
logger(LOG_ERR, _("Unrecognized cipher type!"));
return false;
}
@@
-319,18
+314,18
@@
bool setup_myself(void) {
if(!get_config_string(lookup_config(myself->connection->config_tree, "Digest"), &digest))
digest = xstrdup("sha1");
if(!get_config_string(lookup_config(myself->connection->config_tree, "Digest"), &digest))
digest = xstrdup("sha1");
- if(!digest_open_by_name(&myself->digest, digest)) {
+ if(!digest_open_by_name(&myself->
in
digest, digest)) {
logger(LOG_ERR, _("Unrecognized digest type!"));
return false;
}
logger(LOG_ERR, _("Unrecognized digest type!"));
return false;
}
- if(!get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->maclength))
+ if(!get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->
in
maclength))
- if(digest_active(&myself->digest)) {
- if(myself->
maclength > digest_length(&myself->
digest)) {
+ if(digest_active(&myself->
in
digest)) {
+ if(myself->
inmaclength > digest_length(&myself->in
digest)) {
logger(LOG_ERR, _("MAC length exceeds size of digest!"));
return false;
logger(LOG_ERR, _("MAC length exceeds size of digest!"));
return false;
- } else if(myself->maclength < 0) {
+ } else if(myself->
in
maclength < 0) {
logger(LOG_ERR, _("Bogus MAC length!"));
return false;
}
logger(LOG_ERR, _("Bogus MAC length!"));
return false;
}
@@
-338,13
+333,13
@@
bool setup_myself(void) {
/* Compression */
/* Compression */
- if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"), &myself->compression)) {
- if(myself->
compression < 0 || myself->
compression > 11) {
+ if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"), &myself->
in
compression)) {
+ if(myself->
incompression < 0 || myself->in
compression > 11) {
logger(LOG_ERR, _("Bogus compression level!"));
return false;
}
} else
logger(LOG_ERR, _("Bogus compression level!"));
return false;
}
} else
- myself->compression = 0;
+ myself->
in
compression = 0;
myself->connection->outcompression = 0;
myself->connection->outcompression = 0;
@@
-466,9
+461,10
@@
bool setup_myself(void) {
}
/*
}
/*
- setup all initial network connections
+ initialize network
*/
*/
-bool setup_network_connections(void) {
+bool setup_network(void)
+{
cp();
init_connections();
cp();
init_connections();
@@
-490,13
+486,11
@@
bool setup_network_connections(void) {
pingtimeout = pinginterval;
if(!get_config_int(lookup_config(config_tree, "MaxOutputBufferSize"), &maxoutbufsize))
pingtimeout = pinginterval;
if(!get_config_int(lookup_config(config_tree, "MaxOutputBufferSize"), &maxoutbufsize))
- maxoutbufsize =
4
* MTU;
+ maxoutbufsize =
10
* MTU;
if(!setup_myself())
return false;
if(!setup_myself())
return false;
- try_outgoing_connections();
-
return true;
}
return true;
}
@@
-514,21
+508,16
@@
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;
-
- if(c->outgoing) {
- if(c->outgoing->ai)
- freeaddrinfo(c->outgoing->ai);
- free(c->outgoing->name);
- free(c->outgoing);
- c->outgoing = NULL;
- }
-
+ c->outgoing = false;
terminate_connection(c, false);
}
terminate_connection(c, false);
}
+ list_delete_list(outgoing_list);
+
if(myself && myself->connection) {
subnet_update(myself, NULL, false);
terminate_connection(myself->connection, false);
if(myself && myself->connection) {
subnet_update(myself, NULL, false);
terminate_connection(myself->connection, false);
+ free_connection(myself->connection);
}
for(i = 0; i < listen_sockets; i++) {
}
for(i = 0; i < listen_sockets; i++) {
@@
-552,6
+541,8
@@
void close_network_connections(void) {
execute_script("tinc-down", envp);
execute_script("tinc-down", envp);
+ if(myport) free(myport);
+
for(i = 0; i < 4; i++)
free(envp[i]);
for(i = 0; i < 4; i++)
free(envp[i]);