Support packets in flight

[samplevnf.git] / VNFs / DPPD-PROX / handle_routing.c

diff --git a/VNFs/DPPD-PROX/handle_routing.c b/VNFs/DPPD-PROX/handle_routing.c
index 8cdc842..4683ede 100644 (file)
--- a/VNFs/DPPD-PROX/handle_routing.c
+++ b/VNFs/DPPD-PROX/handle_routing.c
@@ -37,10 +37,10 @@
 #include "mpls.h"
 #include "qinq.h"
 #include "prox_cfg.h"
-#include "ip6_addr.h"
 #include "prox_shared.h"
 #include "prox_cksum.h"
 #include "mbuf_utils.h"
+#include "prox_compat.h"
 
 struct task_routing {
        struct task_base                base;
@@ -177,14 +177,14 @@ static int handle_routing_bulk(struct task_base *tbase, struct rte_mbuf **mbufs,
 
 static void set_l2(struct task_routing *task, struct rte_mbuf *mbuf, uint8_t nh_idx)
 {
-       struct ether_hdr *peth = rte_pktmbuf_mtod(mbuf, struct ether_hdr *);
+       prox_rte_ether_hdr *peth = rte_pktmbuf_mtod(mbuf, prox_rte_ether_hdr *);
        *((uint64_t *)(&peth->d_addr)) = task->next_hops[nh_idx].mac_port_8bytes;
        *((uint64_t *)(&peth->s_addr)) = task->src_mac[task->next_hops[nh_idx].mac_port.out_idx];
 }
 
 static void set_l2_mpls(struct task_routing *task, struct rte_mbuf *mbuf, uint8_t nh_idx)
 {
-       struct ether_hdr *peth = (struct ether_hdr *)rte_pktmbuf_prepend(mbuf, sizeof(struct mpls_hdr));
+       prox_rte_ether_hdr *peth = (prox_rte_ether_hdr *)rte_pktmbuf_prepend(mbuf, sizeof(struct mpls_hdr));
 
        *((uint64_t *)(&peth->d_addr)) = task->next_hops[nh_idx].mac_port_8bytes;
        *((uint64_t *)(&peth->s_addr)) = task->src_mac[task->next_hops[nh_idx].mac_port.out_idx];
@@ -192,8 +192,7 @@ static void set_l2_mpls(struct task_routing *task, struct rte_mbuf *mbuf, uint8_
        struct mpls_hdr *mpls = (struct mpls_hdr *)(peth + 1);
 
        if (task->runtime_flags & TASK_MARK) {
-                  enum rte_meter_color color = rte_sched_port_pkt_read_color(mbuf);
-
+                  enum prox_rte_color color = rte_sched_port_pkt_read_color(mbuf);
                 *(uint32_t *)mpls = task->next_hops[nh_idx].mpls | task->marking[color] | 0x00010000; // Set BoS to 1
        }
        else {
@@ -203,8 +202,8 @@ static void set_l2_mpls(struct task_routing *task, struct rte_mbuf *mbuf, uint8_
 
 static uint8_t route_ipv4(struct task_routing *task, uint8_t *beg, uint32_t ip_offset, struct rte_mbuf *mbuf)
 {
-       struct ipv4_hdr *ip = (struct ipv4_hdr*)(beg + ip_offset);
-       struct ether_hdr *peth_out;
+       prox_rte_ipv4_hdr *ip = (prox_rte_ipv4_hdr*)(beg + ip_offset);
+       prox_rte_ether_hdr *peth_out;
        uint8_t tx_port;
        uint32_t dst_ip;
 
@@ -218,7 +217,7 @@ static uint8_t route_ipv4(struct task_routing *task, uint8_t *beg, uint32_t ip_o
        switch(ip->next_proto_id) {
        case IPPROTO_GRE: {
                struct gre_hdr *pgre = (struct gre_hdr *)(ip + 1);
-               dst_ip = ((struct ipv4_hdr *)(pgre + 1))->dst_addr;
+               dst_ip = ((prox_rte_ipv4_hdr *)(pgre + 1))->dst_addr;
                break;
        }
        case IPPROTO_TCP:
@@ -260,7 +259,7 @@ static uint8_t route_ipv4(struct task_routing *task, uint8_t *beg, uint32_t ip_o
 static inline uint8_t handle_routing(struct task_routing *task, struct rte_mbuf *mbuf)
 {
        struct qinq_hdr *qinq;
-       struct ether_hdr *peth = rte_pktmbuf_mtod(mbuf, struct ether_hdr *);
+       prox_rte_ether_hdr *peth = rte_pktmbuf_mtod(mbuf, prox_rte_ether_hdr *);
 
        switch (peth->ether_type) {
        case ETYPE_8021ad: {
@@ -277,7 +276,7 @@ static inline uint8_t handle_routing(struct task_routing *task, struct rte_mbuf
        case ETYPE_MPLSU: {
                /* skip MPLS headers if any for routing */
                struct mpls_hdr *mpls = (struct mpls_hdr *)(peth + 1);
-               uint32_t count = sizeof(struct ether_hdr);
+               uint32_t count = sizeof(prox_rte_ether_hdr);
                while (!(mpls->bytes & 0x00010000)) {
                        mpls++;
                        count += sizeof(struct mpls_hdr);