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

Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Browse source 
Conflicts:
	src/net_packet.c
This commit is contained in:
Guus Sliepen 2012-03-08 21:15:08 +01:00
commit 40c2858932
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/net_packet.c
View file

@ -524,7 +524,7 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
if(n->mtu >= origlen) if(n->mtu >= origlen)
n->mtu = origlen - 1; n->mtu = origlen - 1;
} else } else
logger(DEBUG_ALWAYS, LOG_ERR, "Error sending packet to %s (%s): %s", n->name, n->hostname, sockstrerror(sockerrno)); logger(DEBUG_TRAFFIC, LOG_WARNING, "Error sending packet to %s (%s): %s", n->name, n->hostname, sockstrerror(sockerrno));
} }
end: end:

6
src/net_setup.c
View file

@ -292,7 +292,6 @@ void load_all_subnets(void) {
config_t *cfg; config_t *cfg;
subnet_t *s, *s2; subnet_t *s, *s2;
node_t *n; node_t *n;
bool result;
xasprintf(&dname, "%s/hosts", confbase); xasprintf(&dname, "%s/hosts", confbase);
dir = opendir(dname); dir = opendir(dname);
@ -314,10 +313,9 @@ void load_all_subnets(void) {
xasprintf(&fname, "%s/hosts/%s", confbase, ent->d_name); xasprintf(&fname, "%s/hosts/%s", confbase, ent->d_name);
init_configuration(&config_tree); init_configuration(&config_tree);
result = read_config_file(config_tree, fname); read_config_options(config_tree, ent->d_name);
read_config_file(config_tree, fname);
free(fname); free(fname);
if(!result)
continue;
if(!n) { if(!n) {
n = new_node(); n = new_node();