support diffrent GW MAC for IPv4/v6 on netif

Author: GIC-de

code/bngblaster/src/bbl_network.c

@@ -102,6 +102,7 @@ bbl_network_interfaces_add()
 
         /* Copy gateway MAC from config (default 00:00:00:00:00:00) */
         memcpy(network_interface->gateway_mac, network_config->gateway_mac, ETH_ADDR_LEN);
+        memcpy(network_interface->gateway6_mac, network_config->gateway_mac, ETH_ADDR_LEN);
 
         /* Init IPv4 */
         if(network_config->ip.address && network_config->gateway) {
@@ -350,7 +351,7 @@ bbl_network_rx_arp(bbl_network_interface_s *interface, bbl_ethernet_header_s *et
     bbl_arp_s *arp = (bbl_arp_s*)eth->next;
     if(arp->sender_ip == interface->gateway) {
         interface->arp_resolved = true;
-        if(*(uint32_t*)interface->gateway_mac == 0) {
+        if(memcmp(interface->gateway_mac, "\x00\x00\x00\x00\x00\x00", ETH_ADDR_LEN) == 0) {
             memcpy(interface->gateway_mac, arp->sender, ETH_ADDR_LEN);
         }
     }
@@ -385,13 +386,13 @@ bbl_network_rx_icmpv6(bbl_network_interface_s *interface,
     if(icmpv6->type == IPV6_ICMPV6_NEIGHBOR_ADVERTISEMENT) {
         if(memcmp(icmpv6->prefix.address, interface->gateway6, IPV6_ADDR_LEN) == 0) {
             interface->icmpv6_nd_resolved = true;
-            if(*(uint32_t*)interface->gateway_mac == 0) {
+            if(memcmp(interface->gateway6_mac, "\x00\x00\x00\x00\x00\x00", ETH_ADDR_LEN) == 0) {
                 if(icmpv6->dst_mac == NULL) {
                     gw_mac = eth->src;
                 } else {
                     gw_mac = icmpv6->dst_mac;
                 }
-                memcpy(interface->gateway_mac, gw_mac, ETH_ADDR_LEN);
+                memcpy(interface->gateway6_mac, gw_mac, ETH_ADDR_LEN);
             }
         }
     } else if(icmpv6->type == IPV6_ICMPV6_NEIGHBOR_SOLICITATION) {

code/bngblaster/src/bbl_network.h

@@ -30,6 +30,7 @@ typedef struct bbl_network_interface_
 
     uint8_t mac[ETH_ADDR_LEN];
     uint8_t gateway_mac[ETH_ADDR_LEN];
+    uint8_t gateway6_mac[ETH_ADDR_LEN];
 
     uint32_t send_requests;
 

code/bngblaster/src/bbl_stream.c

@@ -676,7 +676,6 @@ bbl_stream_build_network_packet(bbl_stream_s *stream)
         return false;
     }
 
-    eth.dst = network_interface->gateway_mac;
     eth.src = network_interface->mac;
     eth.vlan_outer = network_interface->vlan;
     eth.vlan_outer_priority = config->vlan_priority;
@@ -723,6 +722,7 @@ bbl_stream_build_network_packet(bbl_stream_s *stream)
     bbl.direction = BBL_DIRECTION_DOWN;
     switch(stream->sub_type) {
         case BBL_SUB_TYPE_IPV4:
+            eth.dst = network_interface->gateway_mac;
             eth.type = ETH_TYPE_IPV4;
             eth.next = &ipv4;
 
@@ -773,6 +773,7 @@ bbl_stream_build_network_packet(bbl_stream_s *stream)
             break;
         case BBL_SUB_TYPE_IPV6:
         case BBL_SUB_TYPE_IPV6PD:
+            eth.dst = network_interface->gateway6_mac;
             eth.type = ETH_TYPE_IPV6;
             eth.next = &ipv6;
             /* Source address */

code/bngblaster/src/bbl_tcp.c

@@ -1070,7 +1070,7 @@ bbl_tcp_netif_output_ipv6(struct netif *netif, struct pbuf *p, const ip6_addr_t
     bbl_ethernet_header_s eth = {0};
     UNUSED(ipaddr);
 
-    eth.dst = interface->gateway_mac;
+    eth.dst = interface->gateway6_mac;
     eth.src = interface->mac;
     eth.vlan_outer = interface->vlan;
     eth.type = ETH_TYPE_IPV6;