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

Merge branch 'master' into 1.1

Browse source 
Conflicts:
	src/subnet.c
This commit is contained in:
Guus Sliepen 2009-12-11 22:31:27 +01:00
commit d6c50eb73a
4 changed files with 16 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/route.c
View file

@ -141,7 +141,7 @@ static void learn_mac(mac_t *address) {
splay_node_t *node;
connection_t *c;
subnet = lookup_subnet_mac(address);
subnet = lookup_subnet_mac(myself, address);
/* If we don't know this MAC address yet, store it */
@ -720,7 +720,7 @@ static void route_mac(node_t *source, vpn_packet_t *packet) {
/* Lookup destination address */
memcpy(&dest, &packet->data[0], sizeof dest);
subnet = lookup_subnet_mac(&dest);
subnet = lookup_subnet_mac(NULL, &dest);
if(!subnet) {
broadcast_packet(source, packet);