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

When learning MAC addresses, only check our own Subnets for previous entries.

Browse source 
Before it would check all addresses, and not learn an address if another node
already claimed that address. This caused fast roaming to fail, the code from
commit 6f6f426b35 was never triggered.
This commit is contained in:
Guus Sliepen 2009-11-28 11:52:23 +00:00
parent 44834d0304
commit 92aefd25bf
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/route.c
View file

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

8
src/subnet.c
View file

@ -329,7 +329,7 @@ subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
return avl_search(owner->subnet_tree, subnet); return avl_search(owner->subnet_tree, subnet);
} }
subnet_t *lookup_subnet_mac(const mac_t *address) { subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
subnet_t *p, *r = NULL, subnet = {0}; subnet_t *p, *r = NULL, subnet = {0};
avl_node_t *n; avl_node_t *n;
int i; int i;
@ -339,6 +339,8 @@ subnet_t *lookup_subnet_mac(const mac_t *address) {
for(i = 0; i < 2; i++) { for(i = 0; i < 2; i++) {
if(!cache_mac_valid[i]) if(!cache_mac_valid[i])
continue; continue;
if(owner && cache_mac_subnet[i] && cache_mac_subnet[i]->owner != owner)
continue;
if(!memcmp(address, &cache_mac_address[i], sizeof *address)) if(!memcmp(address, &cache_mac_address[i], sizeof *address))
return cache_mac_subnet[i]; return cache_mac_subnet[i];
} }
@ -349,10 +351,10 @@ subnet_t *lookup_subnet_mac(const mac_t *address) {
subnet.net.mac.address = *address; subnet.net.mac.address = *address;
subnet.owner = NULL; subnet.owner = NULL;
for(n = subnet_tree->head; n; n = n->next) { for(n = owner ? owner->subnet_tree->head : subnet_tree->head; n; n = n->next) {
p = n->data; p = n->data;
if(!p || p->type != subnet.type) if(!p || p->type != SUBNET_MAC)
continue; continue;
if(!memcmp(address, &p->net.mac.address, sizeof *address)) { if(!memcmp(address, &p->net.mac.address, sizeof *address)) {

2
src/subnet.h
View file

@ -77,7 +77,7 @@ extern void subnet_update(struct node_t *, subnet_t *, bool);
extern bool net2str(char *, int, const subnet_t *); extern bool net2str(char *, int, const subnet_t *);
extern bool str2net(subnet_t *, const char *); extern bool str2net(subnet_t *, const char *);
extern subnet_t *lookup_subnet(const struct node_t *, const subnet_t *); extern subnet_t *lookup_subnet(const struct node_t *, const subnet_t *);
extern subnet_t *lookup_subnet_mac(const mac_t *); extern subnet_t *lookup_subnet_mac(const struct node_t *, const mac_t *);
extern subnet_t *lookup_subnet_ipv4(const ipv4_t *); extern subnet_t *lookup_subnet_ipv4(const ipv4_t *);
extern subnet_t *lookup_subnet_ipv6(const ipv6_t *); extern subnet_t *lookup_subnet_ipv6(const ipv6_t *);
extern void dump_subnets(void); extern void dump_subnets(void);