diff options
| -rw-r--r-- | VNFs/vCGNAPT/Makefile | 4 | ||||
| -rw-r--r-- | VNFs/vCGNAPT/config/sample_hwlb_2port_2WT.tc | 11 | ||||
| -rw-r--r-- | VNFs/vCGNAPT/config/sample_swlb_2port_2WT.tc | 8 | ||||
| -rw-r--r-- | VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.c | 386 | ||||
| -rw-r--r-- | VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h | 8 |
5 files changed, 166 insertions, 251 deletions
diff --git a/VNFs/vCGNAPT/Makefile b/VNFs/vCGNAPT/Makefile index e349f627..a6feb730 100644 --- a/VNFs/vCGNAPT/Makefile +++ b/VNFs/vCGNAPT/Makefile @@ -41,6 +41,7 @@ VPATH += $(SRCDIR)/pipeline VPATH += $(VNF_CORE)/common/VIL/pipeline_txrx VPATH += $(VNF_CORE)/common/VIL/alg VPATH += $(VNF_CORE)/common/VIL/l2l3_stack +VPATH += $(VNF_CORE)/common/VIL/gateway INC += $(wildcard *.h) INC += $(wildcard pipeline/*.h) @@ -54,6 +55,7 @@ INC += $(wildcard $(VNF_CORE)/common/VIL/pipeline_passthrough/*.h) INC += $(wildcard $(VNF_CORE)/common/VIL/pipeline_txrx/*.h) INC += $(wildcard $(VNF_CORE)/common/VIL/conntrack/*.h) INC += $(wildcard $(VNF_CORE)/common/VIL/alg/*.h) +INC += $(wildcard $(VNF_CORE)/common/VIL/gateway/*.h) CFLAGS += -I$(SRCDIR) -mrtm -mhle -I$(SRCDIR)/pipeline -I$(VNF_CORE)/common/vnf_common CFLAGS += -I$(VNF_CORE)/common/VIL/l2l3_stack -I$(VNF_CORE)/common/VIL/conntrack @@ -61,6 +63,7 @@ CFLAGS += -I$(VNF_CORE)/common/VIL/pipeline_common -I$(VNF_CORE)/common/VIL/pipe CFLAGS += -I$(VNF_CORE)/common/VIL/pipeline_master -I$(VNF_CORE)/common/VIL/pipeline_passthrough CFLAGS += -I$(VNF_CORE)/common/VIL/pipeline_txrx -I$(VNF_CORE)/common/VIL/alg CFLAGS += -I$(VNF_CORE)/common/VIL/pipeline_arpicmp +CFLAGS += -I$(VNF_CORE)/common/VIL/gateway # all source are stored in SRCS-y SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := main.c @@ -106,6 +109,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += cgnapt_pcp_be.c SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += cgnapt_pcp_fe.c SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += lib_sip_alg.c SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += lib_ftp_alg.c +SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += gateway.c CFLAGS += -O3 CFLAGS += -DIPV6 diff --git a/VNFs/vCGNAPT/config/sample_hwlb_2port_2WT.tc b/VNFs/vCGNAPT/config/sample_hwlb_2port_2WT.tc index 47ee0633..3cb90c9a 100644 --- a/VNFs/vCGNAPT/config/sample_hwlb_2port_2WT.tc +++ b/VNFs/vCGNAPT/config/sample_hwlb_2port_2WT.tc @@ -19,12 +19,13 @@ link 1 up ;p 1 arpadd 0 0064:ff9b:0:0:0:0:ca10:6414 00:00:00:00:00:01 ;p 1 arpadd 1 0064:ff9b:0:0:0:0:ac10:2814 00:00:00:00:00:02 -routeadd 0 202.16.100.20 0xff000000 -routeadd 2 172.16.40.20 0xff000000 +; routeadd <net/host> <port #> <ipv4 nhip address in decimal> <Mask/NotApplicable> +routeadd net 0 202.16.100.20 0xff000000 +routeadd net 1 172.16.40.20 0xff000000 -;routeadd <port #> <ipv6 nhip address in hex> <Depth> -;routeadd 0 0064:ff9b:0:0:0:0:ca10:6414 64 -;routeadd 1 0064:ff9b:0:0:0:0:ac10:6414 64 +;routeadd <net/host> <port #> <ipv6 nhip address in hex> <Depth/NotApplicable> +;routeadd net 0 0064:ff9b:0:0:0:0:ca10:6414 64 +;routeadd net 1 0064:ff9b:0:0:0:0:ac10:6414 64 set fwd rxonly diff --git a/VNFs/vCGNAPT/config/sample_swlb_2port_2WT.tc b/VNFs/vCGNAPT/config/sample_swlb_2port_2WT.tc index 05ed058d..d7465690 100644 --- a/VNFs/vCGNAPT/config/sample_swlb_2port_2WT.tc +++ b/VNFs/vCGNAPT/config/sample_swlb_2port_2WT.tc @@ -20,8 +20,8 @@ link 1 up ;p 1 arpadd 1 0064:ff9b:0:0:0:0:ac10:2814 00:00:00:00:00:02 routeadd 0 202.16.100.20 0xff000000 -routeadd 2 172.16.40.20 0xff000000 +routeadd 1 172.16.40.20 0xff000000 -;routeadd <port #> <ipv6 nhip address in hex> <Depth> -;routeadd 0 0064:ff9b:0:0:0:0:ca10:6414 64 -;routeadd 1 0064:ff9b:0:0:0:0:ac10:6414 64 +; routeadd <net/host> <port #> <ipv4 nhip address in decimal> <Mask/NotApplicable> +;routeadd net 0 0064:ff9b:0:0:0:0:ca10:6414 64 +;routeadd net 1 0064:ff9b:0:0:0:0:ac10:6414 64 diff --git a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.c b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.c index eb0aca96..f02fd164 100644 --- a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.c +++ b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.c @@ -64,6 +64,7 @@ #include "vnf_common.h" #include "lib_sip_alg.h" #include "lib_icmpv6.h" +#include "gateway.h" #include "pipeline_common_fe.h" #ifdef CT_CGNAT @@ -177,21 +178,6 @@ uint8_t well_known_prefix[16] = { 0x00, 0x00, 0x00, 0x00 }; -static uint32_t local_get_nh_ipv4( - uint32_t ip, - uint32_t *port, - uint32_t *nhip, - struct pipeline_cgnapt *p_nat); -static void do_local_nh_ipv4_cache( - uint32_t dest_if, - struct pipeline_cgnapt *p_nat); - -static uint32_t local_get_nh_ipv6( - uint8_t *ip, - uint32_t *port, - uint8_t nhip[], - struct pipeline_cgnapt *p_nat); - static uint8_t check_arp_icmp( struct rte_mbuf *pkt, uint64_t pkt_mask, @@ -219,123 +205,6 @@ uint64_t nextPowerOf2(uint64_t n) return n; } -void remove_local_cache(uint8_t port) -{ - link_hw_laddr_valid[port] = 0; -} - -/** - * Function to get IPv4-IP NH from thread local array - * - * @params ip - * IPv4 - IP - * @params port - * NH port number - * @params nhip - * NHIP of IPv4 type - * @params p_nat - * CGNAPT pipeline ptr - * - * @return - * 1 on success, 0 for failure - */ - -static uint32_t local_get_nh_ipv4( - uint32_t ip, - uint32_t *port, - uint32_t *nhip, - struct pipeline_cgnapt *p_nat) -{ - int i; - for (i = 0; i < p_nat->local_lib_arp_route_ent_cnt; i++) { - if (((p_nat->local_lib_arp_route_table[i].ip & - p_nat->local_lib_arp_route_table[i].mask) == - (ip & p_nat->local_lib_arp_route_table[i].mask))) { - *port = p_nat->local_lib_arp_route_table[i].port; - - *nhip = p_nat->local_lib_arp_route_table[i].nh; - return 1; - } - } - return 0; -} - -/** - * Function to make local copy for NH of type IPv4 - * - * @params dest_if - * Physical port number - * @params p_nat - * CGNAPT pipeline ptr - * - */ - -static void do_local_nh_ipv4_cache( - uint32_t dest_if, - struct pipeline_cgnapt *p_nat) -{ - return; -} - - -/** - * Function to get IPv6-IP NH from thread local array - * - * @params ip - * Pointer to starting addr of IPv6 - * @params port - * NH port number - * @params nhip - * NHIP of IPv6 type - * @params p_nat - * CGNAPT pipeline ptr - * - * @return - * 1 on success, 0 for failure - */ - -static uint32_t local_get_nh_ipv6( - uint8_t *ip, - uint32_t *port, - uint8_t nhip[], - struct pipeline_cgnapt *p_nat) -{ - int i = 0; - uint8_t netmask_ipv6[16]; - uint8_t k = 0, l = 0, depthflags = 0, depthflags1 = 0; - - for (i = 0; i < p_nat->local_lib_nd_route_ent_cnt; i++) { - - convert_prefixlen_to_netmask_ipv6( - p_nat->local_lib_nd_route_table[i].depth, - netmask_ipv6); - - for (k = 0; k < 16; k++) - if (p_nat->local_lib_nd_route_table[i].ipv6[k] & - netmask_ipv6[k]) - depthflags++; - - for (l = 0; l < 16; l++) - if (ip[l] & netmask_ipv6[l]) - depthflags1++; - - int j = 0; - if (depthflags == depthflags1) { - *port = p_nat->local_lib_nd_route_table[i].port; - - for (j = 0; j < 16; j++) - nhip[j] = p_nat->local_lib_nd_route_table[i]. - nhipv6[j]; - return 1; - } - - depthflags = 0; - depthflags1 = 0; - } - return 0; -} - - #ifdef SIP_ALG /* Commented code may be required for future usage, Please keep it*/ #if 0 @@ -2078,7 +1947,7 @@ static int cgnapt_in_port_ah_mix(struct rte_pipeline *rte_p, uint8_t nh_ipv6[16]; uint32_t nhip = 0; - uint32_t dest_if = 0xff; + uint32_t dest_if = INVALID_DESTIF; uint32_t ret; uint16_t *outport_id = @@ -2091,52 +1960,54 @@ static int cgnapt_in_port_ah_mix(struct rte_pipeline *rte_p, && rte_be_to_cpu_16(*dst_port) == 53) { p_nat->invalid_packets |= 1LLU << pkt_index; p_nat->naptDroppedPktCount++; - #ifdef CGNAPT_DEBUGGING +#ifdef CGNAPT_DEBUGGING p_nat->naptDroppedPktCount6++; - #endif +#endif continue; } dest_address = rte_bswap32(*dst_addr); - ret = local_get_nh_ipv4(dest_address, &dest_if, - &nhip, p_nat); - if (!ret) { - dest_if = get_prv_to_pub_port(&dest_address, - IP_VERSION_4); - if (dest_if == INVALID_DESTIF) { - p_nat->invalid_packets |= - 1LLU << pkt_index; - p_nat->naptDroppedPktCount++; - #ifdef CGNAPT_DEBUGGING - p_nat->naptDroppedPktCount6++; - #endif - continue; - } - do_local_nh_ipv4_cache(dest_if, p_nat); - } + /* Gateway Proc Starts */ - *outport_id = p_nat->outport_id[dest_if]; - struct arp_entry_data *ret_arp_data; - ret_arp_data = get_dest_mac_addr_port(dest_address, - &dest_if, (struct ether_addr *)eth_dest); + struct arp_entry_data *ret_arp_data = NULL; + uint32_t src_phy_port = *src_port; - if (unlikely(ret_arp_data == NULL)) { + gw_get_nh_port_ipv4(dest_address, + &dest_if, &nhip); - #ifdef CGNAPT_DEBUGGING - printf("%s: NHIP Not Found, nhip: %x, " - "outport_id: %d\n", __func__, nhip, - *outport_id); - #endif - /* Drop the pkt */ - p_nat->invalid_packets |= pkt_mask; + if (dest_if == INVALID_DESTIF) { + p_nat->invalid_packets |= + 1LLU << pkt_index; p_nat->naptDroppedPktCount++; - - #ifdef CGNAPT_DEBUGGING - p_nat->naptDroppedPktCount4++; - #endif +#ifdef CGNAPT_DEBUGGING + p_nat->naptDroppedPktCount6++; +#endif continue; } + *outport_id = p_nat->outport_id[dest_if]; + + ret_arp_data = get_dest_mac_addr_ipv4(nhip, dest_if, &hw_addr); + + if (unlikely(ret_arp_data == NULL)) { + + #ifdef CGNAPT_DEBUGGING + printf("%s: NHIP Not Found, nhip: %x, " + "outport_id: %d\n", __func__, nhip, + *outport_id); + #endif + /* Drop the pkt */ + p_nat->invalid_packets |= pkt_mask; + p_nat->naptDroppedPktCount++; + + #ifdef CGNAPT_DEBUGGING + p_nat->naptDroppedPktCount4++; + #endif + continue; + } + + /* Gateway Proc Ends */ + if (ret_arp_data->status == COMPLETE) { if (ret_arp_data->num_pkts) { @@ -2267,21 +2138,28 @@ static int cgnapt_in_port_ah_mix(struct rte_pipeline *rte_p, &entry->data.u.prv_ipv6[0], 16); memset(nh_ipv6, 0, 16); struct nd_entry_data *ret_nd_data = NULL; - ret_nd_data = get_dest_mac_address_ipv6_port((uint8_t *) - &dst_addr[0], &dest_if, - &hw_addr, &nh_ipv6[0]); + + dest_if = INVALID_DESTIF; + + uint32_t src_phy_port = pkts[pkt_index]->port; + + gw_get_nh_port_ipv6((uint8_t *) &dst_addr[0], + &dest_if, &nh_ipv6[0]); + + ret_nd_data = get_dest_mac_addr_ipv6(&nh_ipv6[0], + dest_if, &hw_addr); *outport_id = p_nat->outport_id[dest_if]; if (nd_cache_dest_mac_present(dest_if)) { ether_addr_copy(get_link_hw_addr(dest_if), - (struct ether_addr *)eth_src); + (struct ether_addr *)eth_src); update_nhip_access(dest_if); if (unlikely(ret_nd_data && ret_nd_data->num_pkts)) { p_nat->naptedPktCount += ret_nd_data->num_pkts; nd_send_buffered_pkts(ret_nd_data, - (struct ether_addr *)eth_dest, - *outport_id); + (struct ether_addr *)eth_dest, + *outport_id); } } else { if (unlikely(ret_nd_data == NULL)) { @@ -2335,46 +2213,49 @@ static int cgnapt_in_port_ah_mix(struct rte_pipeline *rte_p, } else { *dst_addr = rte_bswap32(entry->data.u.prv_ip); dest_address = entry->data.u.prv_ip; - ret = local_get_nh_ipv4(dest_address, &dest_if, - &nhip, p_nat); - if (!ret) { - dest_if = get_pub_to_prv_port( - &dest_address, IP_VERSION_4); + /* Gateway Proc Starts */ + + struct arp_entry_data *ret_arp_data = NULL; + dest_if = INVALID_DESTIF; + uint32_t src_phy_port = *src_port; + + gw_get_nh_port_ipv4(dest_address, + &dest_if, &nhip); + if (dest_if == INVALID_DESTIF) { p_nat->invalid_packets |= 1LLU << pkt_index; p_nat->naptDroppedPktCount++; - #ifdef CGNAPT_DEBUGGING +#ifdef CGNAPT_DEBUGGING p_nat->naptDroppedPktCount6++; - #endif +#endif continue; } - do_local_nh_ipv4_cache(dest_if, p_nat); - }; *outport_id = p_nat->outport_id[dest_if]; - struct arp_entry_data *ret_arp_data; - ret_arp_data = get_dest_mac_addr_port(dest_address, - &dest_if, (struct ether_addr *)eth_dest); + + ret_arp_data = get_dest_mac_addr_ipv4(nhip, + dest_if, (struct ether_addr *)eth_dest); if (unlikely(ret_arp_data == NULL)) { - #ifdef CGNAPT_DEBUGGING +#ifdef CGNAPT_DEBUGGING printf("%s: NHIP Not Found, nhip: %x, " - "outport_id: %d\n", __func__, nhip, - *outport_id); - #endif - + "outport_id: %d\n", __func__, nhip, + *outport_id); +#endif /* Drop the pkt */ p_nat->invalid_packets |= pkt_mask; p_nat->naptDroppedPktCount++; - #ifdef CGNAPT_DEBUGGING +#ifdef CGNAPT_DEBUGGING p_nat->naptDroppedPktCount4++; - #endif +#endif continue; } + /* Gateway Proc Ends */ + if (ret_arp_data->status == COMPLETE) { if (ret_arp_data->num_pkts) { @@ -3713,7 +3594,7 @@ pkt_work_cgnapt_ipv4_prv( uint8_t protocol = RTE_MBUF_METADATA_UINT8(pkt, PROT_OFST_IP4); - uint32_t dest_if = 0xff; /* Added for Multiport */ + uint32_t dest_if = INVALID_DESTIF; /* Added for Multiport */ uint16_t *outport_id = RTE_MBUF_METADATA_UINT16_PTR(pkt, cgnapt_meta_offset); @@ -3822,7 +3703,6 @@ pkt_work_cgnapt_ipv4_prv( if (entry->data.ttl == NAPT_ENTRY_STALE) entry->data.ttl = NAPT_ENTRY_VALID; - struct ether_addr hw_addr; uint32_t dest_address = 0; /* Egress */ @@ -3840,8 +3720,14 @@ pkt_work_cgnapt_ipv4_prv( dest_address = rte_bswap32(*dst_addr); uint32_t nhip = 0; struct arp_entry_data *ret_arp_data = NULL; - ret_arp_data = get_dest_mac_addr_port(dest_address, - &dest_if, (struct ether_addr *)eth_dest); + + uint32_t src_phy_port = *src_port; + + gw_get_nh_port_ipv4(dest_address, &dest_if, &nhip); + + ret_arp_data = get_dest_mac_addr_ipv4(nhip, dest_if, + (struct ether_addr *)eth_dest); + *outport_id = p_nat->outport_id[dest_if]; if (arp_cache_dest_mac_present(dest_if)) { @@ -3850,7 +3736,7 @@ pkt_work_cgnapt_ipv4_prv( if (unlikely(ret_arp_data && ret_arp_data->num_pkts)) { p_nat->naptedPktCount += ret_arp_data->num_pkts; arp_send_buffered_pkts(ret_arp_data, - (struct ether_addr *)eth_dest, *outport_id); + (struct ether_addr *)eth_dest, *outport_id); } } else { @@ -4083,7 +3969,7 @@ pkt_work_cgnapt_ipv4_pub( uint8_t protocol = RTE_MBUF_METADATA_UINT8(pkt, PROT_OFST_IP4); - uint32_t dest_if = 0xff; /* Added for Multiport */ + uint32_t dest_if = INVALID_DESTIF; /* Added for Multiport */ uint16_t *outport_id = RTE_MBUF_METADATA_UINT16_PTR(pkt, cgnapt_meta_offset); @@ -4166,7 +4052,6 @@ pkt_work_cgnapt_ipv4_pub( if (entry->data.ttl == NAPT_ENTRY_STALE) entry->data.ttl = NAPT_ENTRY_VALID; - struct ether_addr hw_addr; uint32_t dest_address = 0; /* Multiport Changes */ @@ -4188,8 +4073,13 @@ pkt_work_cgnapt_ipv4_pub( dest_address = entry->data.u.prv_ip; struct arp_entry_data *ret_arp_data = NULL; - ret_arp_data = get_dest_mac_addr_port(dest_address, - &dest_if, (struct ether_addr *)eth_dest); + + uint32_t src_phy_port = *src_port; + + gw_get_nh_port_ipv4(dest_address, &dest_if, &nhip); + + ret_arp_data = get_dest_mac_addr_ipv4(nhip, dest_if, + (struct ether_addr *)eth_dest); *outport_id = p_nat->outport_id[dest_if]; if (arp_cache_dest_mac_present(dest_if)) { @@ -4441,7 +4331,7 @@ pkt4_work_cgnapt_ipv4_prv( __rte_unused void *arg, struct pipeline_cgnapt *p_nat) { - uint32_t dest_if = 0xff; /* Added for Multiport */ + uint32_t dest_if = INVALID_DESTIF; /* Added for Multiport */ struct rte_mbuf *pkt; uint8_t i; uint8_t pkt_num; @@ -4602,7 +4492,6 @@ pkt4_work_cgnapt_ipv4_prv( if (entry->data.ttl == NAPT_ENTRY_STALE) entry->data.ttl = NAPT_ENTRY_VALID; - struct ether_addr hw_addr; uint32_t dest_address = 0; /*Multiport Changes */ uint32_t nhip = 0; @@ -4626,9 +4515,15 @@ pkt4_work_cgnapt_ipv4_prv( dest_address = rte_bswap32(*dst_addr); struct arp_entry_data *ret_arp_data = NULL; uint64_t start, end; - ret_arp_data = get_dest_mac_addr_port(dest_address, - &dest_if, (struct ether_addr *)eth_dest); + uint32_t src_phy_port = *src_port; + + gw_get_nh_port_ipv4(dest_address, &dest_if, &nhip); + + ret_arp_data = get_dest_mac_addr_ipv4(nhip, dest_if, + (struct ether_addr *)eth_dest); + *outport_id = p_nat->outport_id[dest_if]; + if (arp_cache_dest_mac_present(dest_if)) { ether_addr_copy(get_link_hw_addr(dest_if), (struct ether_addr *)eth_src); @@ -4882,7 +4777,7 @@ pkt4_work_cgnapt_ipv4_pub( uint8_t protocol = RTE_MBUF_METADATA_UINT8(pkt, PROT_OFST_IP4); - uint32_t dest_if = 0xff; /* Added for Multiport */ + uint32_t dest_if = INVALID_DESTIF; /* Added for Multiport */ uint16_t *outport_id = RTE_MBUF_METADATA_UINT16_PTR(pkt, cgnapt_meta_offset); @@ -4971,7 +4866,6 @@ pkt4_work_cgnapt_ipv4_pub( if (entry->data.ttl == NAPT_ENTRY_STALE) entry->data.ttl = NAPT_ENTRY_VALID; - struct ether_addr hw_addr; uint32_t dest_address = 0; /* Multiport Changes */ uint32_t nhip = 0; @@ -4991,23 +4885,29 @@ pkt4_work_cgnapt_ipv4_pub( } dest_address = entry->data.u.prv_ip; struct arp_entry_data *ret_arp_data = NULL; - ret_arp_data = get_dest_mac_addr_port(dest_address, - &dest_if, (struct ether_addr *)eth_dest); + uint32_t src_phy_port = *src_port; + + gw_get_nh_port_ipv4(dest_address, &dest_if, &nhip); + + ret_arp_data = get_dest_mac_addr_ipv4(nhip, dest_if, + (struct ether_addr *)eth_dest); + *outport_id = p_nat->outport_id[dest_if]; - if (arp_cache_dest_mac_present(dest_if)) { - ether_addr_copy(get_link_hw_addr(dest_if), (struct ether_addr *)eth_src); - update_nhip_access(dest_if); + if (arp_cache_dest_mac_present(dest_if)) { + ether_addr_copy(get_link_hw_addr(dest_if), + (struct ether_addr *)eth_src); + update_nhip_access(dest_if); - if (ret_arp_data && ret_arp_data->num_pkts) { - p_nat->naptedPktCount += ret_arp_data->num_pkts; - arp_send_buffered_pkts(ret_arp_data, - (struct ether_addr *)eth_dest, *outport_id); - } + if (ret_arp_data && ret_arp_data->num_pkts) { + p_nat->naptedPktCount += ret_arp_data->num_pkts; + arp_send_buffered_pkts(ret_arp_data, + (struct ether_addr *)eth_dest, *outport_id); + } - } else { + } else { - if (unlikely(ret_arp_data == NULL)) { + if (unlikely(ret_arp_data == NULL)) { #ifdef CGNAPT_DEBUGGING printf("%s: NHIP Not Found, nhip: %x, " @@ -6058,7 +5958,6 @@ pkt_work_cgnapt_ipv6_prv( struct ipv6_hdr ipv6_hdr; - struct ether_addr hw_addr; uint32_t dest_address = 0; uint32_t nhip = 0; /* Egress */ @@ -6164,9 +6063,16 @@ pkt_work_cgnapt_ipv6_prv( #endif struct arp_entry_data *ret_arp_data; - ret_arp_data = get_dest_mac_addr_port(dest_address, - &dest_if, (struct ether_addr *)eth_dest); + + uint32_t src_phy_port = *src_port; + + gw_get_nh_port_ipv4(dest_address, &dest_if, &nhip); + + ret_arp_data = get_dest_mac_addr_ipv4(nhip, dest_if, + (struct ether_addr *)eth_dest); + *outport_id = p_nat->outport_id[dest_if]; + if (arp_cache_dest_mac_present(dest_if)) { ether_addr_copy(get_link_hw_addr(dest_if), (struct ether_addr *)eth_src); @@ -6342,11 +6248,16 @@ pkt_work_cgnapt_ipv6_pub( memset(nh_ipv6, 0, 16); struct nd_entry_data *ret_nd_data = NULL; - ret_nd_data = get_dest_mac_address_ipv6_port( - &dest_addr_ipv6[0], - &dest_if, - (struct ether_addr *)eth_dest, - &nh_ipv6[0]); + + dest_if = INVALID_DESTIF; + + uint32_t src_phy_port = pkt->port; + + gw_get_nh_port_ipv6((uint8_t *) &dest_addr_ipv6[0], + &dest_if, &nh_ipv6[0]); + + ret_nd_data = get_dest_mac_addr_ipv6(&nh_ipv6[0], + dest_if, (struct ether_addr *)eth_dest); *outport_id = p_nat->outport_id[dest_if]; @@ -6536,7 +6447,6 @@ pkt4_work_cgnapt_ipv6_prv( p_nat->entries[pkt_num] = &(entry->head); struct ipv6_hdr ipv6_hdr; - struct ether_addr hw_addr; uint32_t dest_address = 0; uint8_t nh_ipv6[16]; uint32_t nhip = 0; @@ -6645,15 +6555,18 @@ pkt4_work_cgnapt_ipv6_prv( { struct arp_entry_data *ret_arp_data; - ret_arp_data = get_dest_mac_addr_port(dest_address, - &dest_if, (struct ether_addr *)eth_dest); + uint32_t src_phy_port = *src_port; + + gw_get_nh_port_ipv4(dest_address, &dest_if, &nhip); + + ret_arp_data = get_dest_mac_addr_ipv4(nhip, dest_if, + (struct ether_addr *)eth_dest); *outport_id = p_nat->outport_id[dest_if]; if (arp_cache_dest_mac_present(dest_if)) { ether_addr_copy(get_link_hw_addr(dest_if), (struct ether_addr *)eth_src); update_nhip_access(dest_if); - if (unlikely(ret_arp_data && ret_arp_data->num_pkts)) { p_nat->naptedPktCount += ret_arp_data->num_pkts; arp_send_buffered_pkts(ret_arp_data, @@ -6846,10 +6759,15 @@ pkt4_work_cgnapt_ipv6_pub( memset(nh_ipv6, 0, 16); struct nd_entry_data *ret_nd_data = NULL; - ret_nd_data = get_dest_mac_address_ipv6_port - (&dest_addr_ipv6[0], &dest_if, - (struct ether_addr *)eth_dest, &nh_ipv6[0]); + dest_if = INVALID_DESTIF; + + uint32_t src_phy_port = pkt->port; + + gw_get_nh_port_ipv6((uint8_t *) &dest_addr_ipv6[0], + &dest_if, &nh_ipv6[0]); + ret_nd_data = get_dest_mac_addr_ipv6(&nh_ipv6[0], + dest_if, (struct ether_addr *)eth_dest); *outport_id = p_nat->outport_id[dest_if]; if (nd_cache_dest_mac_present(dest_if)) { diff --git a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h index 943d0fc7..7fde0c5a 100644 --- a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h +++ b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h @@ -418,14 +418,6 @@ struct pipeline_cgnapt { uint8_t vnf_set; /* to identify as separate LB-CGNAPT set */ - /* Local ARP & ND Tables */ - struct lib_arp_route_table_entry - local_lib_arp_route_table[MAX_ARP_RT_ENTRY]; - uint8_t local_lib_arp_route_ent_cnt; - struct lib_nd_route_table_entry - local_lib_nd_route_table[MAX_ND_RT_ENTRY]; - uint8_t local_lib_nd_route_ent_cnt; - /* For internal debugging purpose */ #ifdef CGNAPT_TIMING_INST uint64_t in_port_exit_timestamp; |