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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/graph.c
View file

@ -378,6 +378,9 @@ void check_reachability() {
free(envp[i]); free(envp[i]);
subnet_update(n, NULL, n->status.reachable); subnet_update(n, NULL, n->status.reachable);
if(!n->status.reachable)
update_node_udp(n, NULL);
} }
} }
} }

4
src/route.c
View file

@ -141,7 +141,7 @@ static void learn_mac(mac_t *address) {
splay_node_t *node; splay_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 */
@ -720,7 +720,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);

32
src/subnet.c
View file

@ -330,8 +330,8 @@ subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
return splay_search(owner->subnet_tree, subnet); return splay_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;
splay_node_t *n; splay_node_t *n;
int i; int i;
@ -340,20 +340,18 @@ 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];
} }
// Search all subnets for a matching one // Search all subnets for a matching one
subnet.type = SUBNET_MAC; for(n = owner ? owner->subnet_tree->head : subnet_tree->head; n; n = n->next) {
subnet.net.mac.address = *address;
subnet.owner = NULL;
for(n = 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)) {
@ -374,7 +372,7 @@ subnet_t *lookup_subnet_mac(const mac_t *address) {
} }
subnet_t *lookup_subnet_ipv4(const ipv4_t *address) { subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
subnet_t *p, *r = NULL, subnet = {0}; subnet_t *p, *r = NULL;
splay_node_t *n; splay_node_t *n;
int i; int i;
@ -389,15 +387,10 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
// Search all subnets for a matching one // Search all subnets for a matching one
subnet.type = SUBNET_IPV4;
subnet.net.ipv4.address = *address;
subnet.net.ipv4.prefixlength = 32;
subnet.owner = NULL;
for(n = subnet_tree->head; n; n = n->next) { for(n = subnet_tree->head; n; n = n->next) {
p = n->data; p = n->data;
if(!p || p->type != subnet.type) if(!p || p->type != SUBNET_IPV4)
continue; continue;
if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength)) { if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength)) {
@ -418,7 +411,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
} }
subnet_t *lookup_subnet_ipv6(const ipv6_t *address) { subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
subnet_t *p, *r = NULL, subnet = {0}; subnet_t *p, *r = NULL;
splay_node_t *n; splay_node_t *n;
int i; int i;
@ -433,15 +426,10 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
// Search all subnets for a matching one // Search all subnets for a matching one
subnet.type = SUBNET_IPV6;
subnet.net.ipv6.address = *address;
subnet.net.ipv6.prefixlength = 128;
subnet.owner = NULL;
for(n = subnet_tree->head; n; n = n->next) { for(n = subnet_tree->head; n; n = n->next) {
p = n->data; p = n->data;
if(!p || p->type != subnet.type) if(!p || p->type != SUBNET_IPV6)
continue; continue;
if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength)) { if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength)) {

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 bool dump_subnets(struct connection_t *); extern bool dump_subnets(struct connection_t *);