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

Merge branch 'master' into 1.1

Browse source 
Conflicts:
	NEWS
	README
	configure.in
	src/net.c
	src/net.h
This commit is contained in:
Guus Sliepen 2010-04-17 12:21:53 +02:00
commit 79e46d08a4
14 changed files with 96 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/net_setup.c
View file

@ -157,14 +157,14 @@ void regenerate_key() {
/*
Read Subnets from all host config files
*/
static void load_all_subnets(void) {
void load_all_subnets(void) {
DIR *dir;
struct dirent *ent;
char *dname;
char *fname;
splay_tree_t *config_tree;
config_t *cfg;
subnet_t *s;
subnet_t *s, *s2;
node_t *n;
bool result;
@ -181,9 +181,6 @@ static void load_all_subnets(void) {
continue;
n = lookup_node(ent->d_name);
if(n)
continue;
#ifdef _DIRENT_HAVE_D_TYPE
//if(ent->d_type != DT_REG)
// continue;
@ -196,15 +193,21 @@ static void load_all_subnets(void) {
if(!result)
continue;
n = new_node();
n->name = xstrdup(ent->d_name);
node_add(n);
if(!n) {
n = new_node();
n->name = xstrdup(ent->d_name);
node_add(n);
}
for(cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
if(!get_config_subnet(cfg, &s))
continue;
subnet_add(n, s);
if((s2 = lookup_subnet(n, s))) {
s2->expires = -1;
} else {
subnet_add(n, s);
}
}
exit_configuration(&config_tree);
@ -262,6 +265,16 @@ bool setup_myself(void) {
&& !get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
myport = xstrdup("655");
if(!atoi(myport)) {
struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
sockaddr_t sa;
if(!ai || !ai->ai_addr)
return false;
free(myport);
memcpy(&sa, ai->ai_addr, ai->ai_addrlen);
sockaddr2str(&sa, NULL, &myport);
}
/* Read in all the subnets specified in the host configuration file */
cfg = lookup_config(myself->connection->config_tree, "Subnet");