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

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

View file

@ -524,7 +524,7 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
if(n->mtu >= origlen)
n->mtu = origlen - 1;
} 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: