projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused variable.
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
2c07ec6
..
d03869e
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-1,7
+1,7
@@
/*
net_setup.c -- Setup.
/*
net_setup.c -- Setup.
- Copyright (C) 1998-200
3 Ivo Timmermans <ivo@o2w.nl>
,
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 1998-200
5 Ivo Timmermans
,
+ 2000-200
6 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
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id
: net_setup.c,v 1.1.2.47 2003/12/07 14:28:39 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
@@
-150,17
+150,23
@@
bool read_rsa_public_key(connection_t *c)
bool read_rsa_private_key(void)
{
FILE *fp;
bool read_rsa_private_key(void)
{
FILE *fp;
- char *fname, *key;
+ char *fname, *key
, *pubkey
;
struct stat s;
cp();
if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) {
struct stat s;
cp();
if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) {
+ if(!get_config_string(lookup_config(myself->connection->config_tree, "PublicKey"), &pubkey)) {
+ logger(LOG_ERR, _("PrivateKey used but no PublicKey found!"));
+ return false;
+ }
myself->connection->rsa_key = RSA_new();
// RSA_blinding_on(myself->connection->rsa_key, NULL);
BN_hex2bn(&myself->connection->rsa_key->d, key);
myself->connection->rsa_key = RSA_new();
// RSA_blinding_on(myself->connection->rsa_key, NULL);
BN_hex2bn(&myself->connection->rsa_key->d, key);
+ BN_hex2bn(&myself->connection->rsa_key->n, pubkey);
BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
free(key);
BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
free(key);
+ free(pubkey);
return true;
}
return true;
}
@@
-242,19
+248,15
@@
bool setup_myself(void)
myself->name = name;
myself->connection->name = xstrdup(name);
myself->name = name;
myself->connection->name = xstrdup(name);
- if(!read_rsa_private_key())
- return false;
-
if(!read_connection_config(myself->connection)) {
logger(LOG_ERR, _("Cannot open host configuration file for myself!"));
return false;
}
if(!read_connection_config(myself->connection)) {
logger(LOG_ERR, _("Cannot open host configuration file for myself!"));
return false;
}
- if(!read_rsa_p
ublic_key(myself->connection
))
+ if(!read_rsa_p
rivate_key(
))
return false;
return false;
- if(!get_config_string
- (lookup_config(myself->connection->config_tree, "Port"), &myport))
+ if(!get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
asprintf(&myport, "655");
/* Read in all the subnets specified in the host configuration file */
asprintf(&myport, "655");
/* Read in all the subnets specified in the host configuration file */
@@
-272,21
+274,20
@@
bool setup_myself(void)
/* Check some options */
/* Check some options */
- if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice))
- if(choice)
- myself->options |= OPTION_INDIRECT;
+ if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice) && choice)
+ myself->options |= OPTION_INDIRECT;
- if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice))
- if(choice)
- myself->options |= OPTION_TCPONLY;
+ if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice) && choice)
+ myself->options |= OPTION_TCPONLY;
- if(get_config_bool(lookup_config(myself->connection->config_tree, "IndirectData"), &choice))
- if(choice)
- myself->options |= OPTION_INDIRECT;
+ if(get_config_bool(lookup_config(myself->connection->config_tree, "IndirectData"), &choice) && choice)
+ myself->options |= OPTION_INDIRECT;
+
+ 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))
- if(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;
@@
-367,7
+368,7
@@
bool setup_myself(void)
myself->connection->outcipher = EVP_bf_ofb();
myself->key = xmalloc(myself->keylength);
myself->connection->outcipher = EVP_bf_ofb();
myself->key = xmalloc(myself->keylength);
- RAND_pseudo_bytes(myself->key, myself->keylength);
+ RAND_pseudo_bytes(
(unsigned char *)
myself->key, myself->keylength);
if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
keylifetime = 3600;
if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
keylifetime = 3600;
@@
-376,7
+377,7
@@
bool setup_myself(void)
if(myself->cipher) {
EVP_CIPHER_CTX_init(&packet_ctx);
if(myself->cipher) {
EVP_CIPHER_CTX_init(&packet_ctx);
- if(!EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL,
myself->key,
myself->key + myself->cipher->key_len)) {
+ if(!EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL,
(unsigned char *)myself->key, (unsigned char *)
myself->key + myself->cipher->key_len)) {
logger(LOG_ERR, _("Error during initialisation of cipher for %s (%s): %s"),
myself->name, myself->hostname, ERR_error_string(ERR_get_error(), NULL));
return false;
logger(LOG_ERR, _("Error during initialisation of cipher for %s (%s): %s"),
myself->name, myself->hostname, ERR_error_string(ERR_get_error(), NULL));
return false;
@@
-459,6
+460,10
@@
bool setup_myself(void)
for(i = 0; i < 5; i++)
free(envp[i]);
for(i = 0; i < 5; i++)
free(envp[i]);
+ /* Run subnet-up scripts for our own subnets */
+
+ subnet_update(myself, NULL, true);
+
/* Open sockets */
get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
/* Open sockets */
get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
@@
-497,7
+502,7
@@
bool setup_myself(void)
free(hostname);
}
free(hostname);
}
-
listen_socket[listen_sockets].sa.sa = *aip->ai_addr
;
+
memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen)
;
listen_sockets++;
}
listen_sockets++;
}
@@
-529,12
+534,20
@@
bool setup_network_connections(void)
init_events();
init_requests();
init_events();
init_requests();
- if(get_config_int(lookup_config(config_tree, "Ping
Timeout"), &pingtimeout
)) {
- if(ping
timeout
< 1) {
- ping
timeout
= 86400;
+ if(get_config_int(lookup_config(config_tree, "Ping
Interval"), &pinginterval
)) {
+ if(ping
interval
< 1) {
+ ping
interval
= 86400;
}
} else
}
} else
- pingtimeout = 60;
+ pinginterval = 60;
+
+ if(!get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout))
+ pingtimeout = 5;
+ if(pingtimeout < 1 || pingtimeout > pinginterval)
+ pingtimeout = pinginterval;
+
+ if(!get_config_int(lookup_config(config_tree, "MaxOutputBufferSize"), &maxoutbufsize))
+ maxoutbufsize = 4 * MTU;
if(!setup_myself())
return false;
if(!setup_myself())
return false;
@@
-565,14
+578,22
@@
void close_network_connections(void)
terminate_connection(c, false);
}
terminate_connection(c, false);
}
- if(myself && myself->connection)
+ if(myself && myself->connection) {
+ subnet_update(myself, NULL, false);
terminate_connection(myself->connection, false);
terminate_connection(myself->connection, false);
+ }
for(i = 0; i < listen_sockets; i++) {
close(listen_socket[i].tcp);
close(listen_socket[i].udp);
}
for(i = 0; i < listen_sockets; i++) {
close(listen_socket[i].tcp);
close(listen_socket[i].udp);
}
+ asprintf(&envp[0], "NETNAME=%s", netname ? : "");
+ asprintf(&envp[1], "DEVICE=%s", device ? : "");
+ asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
+ asprintf(&envp[3], "NAME=%s", myself->name);
+ envp[4] = NULL;
+
exit_requests();
exit_events();
exit_edges();
exit_requests();
exit_events();
exit_edges();
@@
-580,12
+601,6
@@
void close_network_connections(void)
exit_nodes();
exit_connections();
exit_nodes();
exit_connections();
- asprintf(&envp[0], "NETNAME=%s", netname ? : "");
- asprintf(&envp[1], "DEVICE=%s", device ? : "");
- asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
- asprintf(&envp[3], "NAME=%s", myself->name);
- envp[4] = NULL;
-
execute_script("tinc-down", envp);
for(i = 0; i < 4; i++)
execute_script("tinc-down", envp);
for(i = 0; i < 4; i++)