j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Run setup_device() after parsing configuration but before claiming we're ready.

Browse source
This commit is contained in:
Guus Sliepen 2003-07-22 21:13:23 +00:00
parent eefa28059a
commit 4aadb9500d
1 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/net_setup.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net_setup.c,v 1.1.2.37 2003/07/22 20:55:20 guus Exp $ $Id: net_setup.c,v 1.1.2.38 2003/07/22 21:13:23 guus Exp $
*/ */
#include "system.h" #include "system.h"
@ -201,9 +201,10 @@ bool setup_myself(void)
subnet_t *subnet; subnet_t *subnet;
char *name, *hostname, *mode, *afname, *cipher, *digest; char *name, *hostname, *mode, *afname, *cipher, *digest;
char *address = NULL; char *address = NULL;
char *envp[5];
struct addrinfo hint, *ai, *aip; struct addrinfo hint, *ai, *aip;
bool choice; bool choice;
int err; int i, err;
cp(); cp();
@ -383,8 +384,7 @@ bool setup_myself(void)
myself->connection->outdigest = EVP_sha1(); myself->connection->outdigest = EVP_sha1();
if(get_config_int if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"),
(lookup_config(myself->connection->config_tree, "MACLength"),
&myself->maclength)) { &myself->maclength)) {
if(myself->digest) { if(myself->digest) {
if(myself->maclength > myself->digest->md_size) { if(myself->maclength > myself->digest->md_size) {
@ -402,8 +402,7 @@ bool setup_myself(void)
/* Compression */ /* Compression */
if(get_config_int if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"),
(lookup_config(myself->connection->config_tree, "Compression"),
&myself->compression)) { &myself->compression)) {
if(myself->compression < 0 || myself->compression > 11) { if(myself->compression < 0 || myself->compression > 11) {
logger(LOG_ERR, _("Bogus compression level!")); logger(LOG_ERR, _("Bogus compression level!"));
@ -424,6 +423,23 @@ bool setup_myself(void)
graph(); graph();
/* Open device */
if(!setup_device())
return false;
/* Run tinc-up script to further initialize the tap interface */
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-up", envp);
for(i = 0; i < 5; i++)
free(envp[i]);
/* Open sockets */ /* Open sockets */
memset(&hint, 0, sizeof(hint)); memset(&hint, 0, sizeof(hint));
@ -485,9 +501,6 @@ bool setup_myself(void)
*/ */
bool setup_network_connections(void) bool setup_network_connections(void)
{ {
char *envp[5];
int i;
cp(); cp();
now = time(NULL); now = time(NULL);
@ -506,24 +519,9 @@ bool setup_network_connections(void)
} else } else
pingtimeout = 60; pingtimeout = 60;
if(!setup_device())
return false;
if(!setup_myself()) if(!setup_myself())
return false; return false;
/* Run tinc-up script to further initialize the tap interface */
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-up", envp);
for(i = 0; i < 5; i++)
free(envp[i]);
try_outgoing_connections(); try_outgoing_connections();
return true; return true;