X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Froute.c;h=17f1c71a18e13b4f14e988d45e27a4f7f5ef8f16;hb=19e42b76f546dc3baee4a5d6a4f161155d279c74;hp=189637424bf7e4f79fcf324140036ded91e833f8;hpb=cc3c69c892b0dad9a6ece0a0f4ccd429a22fcbff;p=tinc

diff --git a/src/route.c b/src/route.c
index 18963742..17f1c71a 100644
--- a/src/route.c
+++ b/src/route.c
@@ -203,7 +203,7 @@ static void age_subnets(void *data) {
 			}
 
 			for list_each(connection_t, c, connection_list)
-				if(c->status.active)
+				if(c->edge)
 					send_del_subnet(c, s);
 
 			subnet_del(myself, s);
@@ -223,13 +223,13 @@ static void learn_mac(mac_t *address) {
 	/* If we don't know this MAC address yet, store it */
 
 	if(!subnet) {
-		logger(DEBUG_TRAFFIC, LOG_INFO, "Learned new MAC address %hx:%hx:%hx:%hx:%hx:%hx",
+		logger(DEBUG_TRAFFIC, LOG_INFO, "Learned new MAC address %x:%x:%x:%x:%x:%x",
 				   address->x[0], address->x[1], address->x[2], address->x[3],
 				   address->x[4], address->x[5]);
 
 		subnet = new_subnet();
 		subnet->type = SUBNET_MAC;
-		subnet->expires = time(NULL) + macexpire;
+		subnet->expires = now.tv_sec + macexpire;
 		subnet->net.mac.address = *address;
 		subnet->weight = 10;
 		subnet_add(myself, subnet);
@@ -238,13 +238,13 @@ static void learn_mac(mac_t *address) {
 		/* And tell all other tinc daemons it's our MAC */
 
 		for list_each(connection_t, c, connection_list)
-			if(c->status.active)
+			if(c->edge)
 				send_add_subnet(c, subnet);
 
 		timeout_add(&age_subnets_timeout, age_subnets, NULL, &(struct timeval){10, rand() % 100000});
 	} else {
 		if(subnet->expires)
-			subnet->expires = time(NULL) + macexpire;
+			subnet->expires = now.tv_sec + macexpire;
 	}
 }
 
@@ -371,7 +371,10 @@ static void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet, length_t et
 	}
 }
 
-static void route_ipv4_unicast(node_t *source, vpn_packet_t *packet) {
+static void route_ipv4(node_t *source, vpn_packet_t *packet) {
+	if(!checklength(source, packet, ether_size + ip_size))
+		return;
+
 	subnet_t *subnet;
 	node_t *via;
 	ipv4_t dest;
@@ -391,6 +394,11 @@ static void route_ipv4_unicast(node_t *source, vpn_packet_t *packet) {
 		return;
 	}
 
+	if (!subnet->owner) {
+		broadcast_packet(source, packet);
+		return;
+	}
+
 	if(subnet->owner == source) {
 		logger(DEBUG_TRAFFIC, LOG_WARNING, "Packet looping back to %s (%s)!", source->name, source->hostname);
 		return;
@@ -432,20 +440,6 @@ static void route_ipv4_unicast(node_t *source, vpn_packet_t *packet) {
 	send_packet(subnet->owner, packet);
 }
 
-static void route_ipv4(node_t *source, vpn_packet_t *packet) {
-	if(!checklength(source, packet, ether_size + ip_size))
-		return;
-
-	if(broadcast_mode && (((packet->data[30] & 0xf0) == 0xe0) || (
-			packet->data[30] == 255 &&
-			packet->data[31] == 255 &&
-			packet->data[32] == 255 &&
-			packet->data[33] == 255)))
-		broadcast_packet(source, packet);
-	else
-		route_ipv4_unicast(source, packet);
-}
-
 /* RFC 2463 */
 
 static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, length_t ether_size, uint8_t type, uint8_t code) {
@@ -526,7 +520,17 @@ static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, length_
 	send_packet(source, packet);
 }
 
-static void route_ipv6_unicast(node_t *source, vpn_packet_t *packet) {
+static void route_neighborsol(node_t *source, vpn_packet_t *packet);
+
+static void route_ipv6(node_t *source, vpn_packet_t *packet) {
+	if(!checklength(source, packet, ether_size + ip6_size))
+		return;
+
+	if(packet->data[20] == IPPROTO_ICMPV6 && checklength(source, packet, ether_size + ip6_size + icmp6_size) && packet->data[54] == ND_NEIGHBOR_SOLICIT) {
+		route_neighborsol(source, packet);
+		return;
+	}
+
 	subnet_t *subnet;
 	node_t *via;
 	ipv6_t dest;
@@ -550,6 +554,11 @@ static void route_ipv6_unicast(node_t *source, vpn_packet_t *packet) {
 		return;
 	}
 
+	if (!subnet->owner) {
+		broadcast_packet(source, packet);
+		return;
+	}
+
 	if(subnet->owner == source) {
 		logger(DEBUG_TRAFFIC, LOG_WARNING, "Packet looping back to %s (%s)!", source->name, source->hostname);
 		return;
@@ -724,21 +733,6 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet) {
 	send_packet(source, packet);
 }
 
-static void route_ipv6(node_t *source, vpn_packet_t *packet) {
-	if(!checklength(source, packet, ether_size + ip6_size))
-		return;
-
-	if(packet->data[20] == IPPROTO_ICMPV6 && checklength(source, packet, ether_size + ip6_size + icmp6_size) && packet->data[54] == ND_NEIGHBOR_SOLICIT) {
-		route_neighborsol(source, packet);
-		return;
-	}
-
-	if(broadcast_mode && packet->data[38] == 255)
-		broadcast_packet(source, packet);
-	else
-		route_ipv6_unicast(source, packet);
-}
-
 /* RFC 826 */
 
 static void route_arp(node_t *source, vpn_packet_t *packet) {
@@ -822,7 +816,7 @@ static void route_mac(node_t *source, vpn_packet_t *packet) {
 	memcpy(&dest, &packet->data[0], sizeof dest);
 	subnet = lookup_subnet_mac(NULL, &dest);
 
-	if(!subnet) {
+	if(!subnet || !subnet->owner) {
 		broadcast_packet(source, packet);
 		return;
 	}