Prepare for DPDK 19.08 support

This commit prepares PROX for supporting changes from DPDK 19.08
Mainly, the "sed" listed below were run.
In addition,
- some forward definition have been removed,
- prox_compat.h has been updated
- prox_compat.h has been included where necessary.

Hence such a commit is rather easy to review and to reapply
on other branches if necessary.

sed -i 's/struct ether_hdr/prox_rte_ether_hdr/g' *.h
sed -i 's/struct ether_hdr/prox_rte_ether_hdr/g' *.c
sed -i 's/struct ether_addr/prox_rte_ether_addr/g' *.c
sed -i 's/struct ether_addr/prox_rte_ether_addr/g' *.h
sed -i 's/prox_rte_ether_addr_port/struct ether_addr_port/g' *.c
sed -i 's/prox_rte_ether_addr_port/struct ether_addr_port/g' *.h
sed -i 's/struct vlan_hdr/prox_rte_vlan_hdr/g' *.c
sed -i 's/struct vlan_hdr/prox_rte_vlan_hdr/g' *.h
sed -i 's/struct ipv4_hdr/prox_rte_ipv4_hdr/g' *.h
sed -i 's/struct ipv4_hdr/prox_rte_ipv4_hdr/g' *.c
sed -i 's/struct ipv6_hdr/prox_rte_ipv6_hdr/g' *.c
sed -i 's/struct ipv6_hdr/prox_rte_ipv6_hdr/g' *.h
sed -i 's/struct udp_hdr/prox_rte_udp_hdr/g' *.c
sed -i 's/struct udp_hdr/prox_rte_udp_hdr/g' *.h
sed -i 's/struct tcp_hdr/prox_rte_tcp_hdr/g' *.c
sed -i 's/struct tcp_hdr/prox_rte_tcp_hdr/g' *.h
sed -i 's/struct prox_rte_ether_addr_copy/ether_addr_copy/g' *.c
sed -i 's/struct prox_rte_ether_addr_copy/ether_addr_copy/g' *.h
sed -i 's/struct prox_rte_ether_addr_copy/prox_rte_ether_addr_copy/g' *.c
sed -i 's/struct prox_rte_ether_addr_copy/ether_addr_copy/g' *.h
sed -i 's/prox_rte_ether_addr_copy/ether_addr_copy/g' *.h
sed -i 's/prox_rte_ether_addr_copy/ether_addr_copy/g' *.c
sed -i 's/ether_addr_copy/prox_rte_ether_addr_copy/g' *.c
sed -i 's/ether_addr_copy/prox_rte_ether_addr_copy/g' *.h
sed -i 's/prox_rte_ether_hdr_arp/struct ether_hdr_arp/g' *.h
sed -i 's/prox_rte_ether_hdr_arp/struct ether_hdr_arp/g' *.c
sed -i 's/struct vxlan_gpe_hdr/prox_rte_vxlan_gpe_hdr/g' *.h
sed -i 's/struct vxlan_gpe_hdr/prox_rte_vxlan_gpe_hdr/g' *.c
sed -i 's/eth_random_addr/prox_rte_eth_random_addr/g' *.c
sed -i 's/eth_random_addr/prox_rte_eth_random_addr/g' *.h
sed -i 's/ETHER_CRC_LEN/PROX_RTE_ETHER_CRC_LEN/g' *.c
sed -i 's/ETHER_CRC_LEN/PROX_RTE_ETHER_CRC_LEN/g' *.h
sed -i 's/ETHER_HDR_LEN/PROX_RTE_ETHER_HDR_LEN/g' *.c
sed -i 's/ETHER_HDR_LEN/PROX_RTE_ETHER_HDR_LEN/g' *.h
sed -i 's/ETHER_MAX_LEN/PROX_RTE_ETHER_MAX_LEN/g' *.c
sed -i 's/ETHER_MAX_LEN/PROX_RTE_ETHER_MAX_LEN/g' *.h
sed -i 's/ETHER_MIN_LEN/PROX_RTE_ETHER_MIN_LEN/g' *.c
sed -i 's/ETHER_MIN_LEN/PROX_RTE_ETHER_MIN_LEN/g' *.h
sed -i 's/TCP_SYN_FLAG/PROX_RTE_TCP_SYN_FLAG/g' *.c
sed -i 's/TCP_RST_FLAG/PROX_RTE_TCP_RST_FLAG/g' *.c
sed -i 's/TCP_FIN_FLAG/PROX_RTE_TCP_FIN_FLAG/g' *.c
sed -i 's/TCP_ACK_FLAG/PROX_RTE_TCP_ACK_FLAG/g' *.c

Change-Id: I4dfe8be68e618c94dcaae28754579fbeb571bb00
Signed-off-by: Xavier Simonart <xavier.simonart@intel.com>

1 files changed, 16 insertions, 15 deletions

diff --git a/VNFs/DPPD-PROX/pkt_parser.h b/VNFs/DPPD-PROX/pkt_parser.h
index 285d42f9..746830bf 100644
--- a/VNFs/DPPD-PROX/pkt_parser.h
+++ b/VNFs/DPPD-PROX/pkt_parser.h
@@ -24,6 +24,7 @@
 #include <rte_tcp.h>
 #include <rte_byteorder.h>
 
+#include "prox_compat.h"
 #include "log.h"
 #include "etypes.h"
 
@@ -69,28 +70,28 @@ static void pkt_tuple_debug(const struct pkt_tuple *pt)
 /* Return 0 on success, i.e. packets parsed without any error. */
 static int parse_pkt(struct rte_mbuf *mbuf, struct pkt_tuple *pt, struct l4_meta *l4_meta)
 {
-	struct ether_hdr *peth = rte_pktmbuf_mtod(mbuf, struct ether_hdr *);
+	prox_rte_ether_hdr *peth = rte_pktmbuf_mtod(mbuf, prox_rte_ether_hdr *);
 	size_t l2_types_count = 0;
-	struct ipv4_hdr* pip = 0;
+	prox_rte_ipv4_hdr* pip = 0;
 
 	/* L2 */
 	pt->l2_types[l2_types_count++] = peth->ether_type;
 
 	switch (peth->ether_type) {
 	case ETYPE_IPv4:
-			pip = (struct ipv4_hdr *)(peth + 1);
+			pip = (prox_rte_ipv4_hdr *)(peth + 1);
 		break;
 	case ETYPE_VLAN: {
-		struct vlan_hdr *vlan = (struct vlan_hdr *)(peth + 1);
+		prox_rte_vlan_hdr *vlan = (prox_rte_vlan_hdr *)(peth + 1);
 		pt->l2_types[l2_types_count++] = vlan->eth_proto;
 		if (vlan->eth_proto == ETYPE_IPv4) {
-			pip = (struct ipv4_hdr *)(peth + 1);
+			pip = (prox_rte_ipv4_hdr *)(peth + 1);
 		}
 		else if (vlan->eth_proto == ETYPE_VLAN) {
-			struct vlan_hdr *vlan = (struct vlan_hdr *)(peth + 1);
+			prox_rte_vlan_hdr *vlan = (prox_rte_vlan_hdr *)(peth + 1);
 			pt->l2_types[l2_types_count++] = vlan->eth_proto;
 			if (vlan->eth_proto == ETYPE_IPv4) {
-				pip = (struct ipv4_hdr *)(peth + 1);
+				pip = (prox_rte_ipv4_hdr *)(peth + 1);
 			}
 			else if (vlan->eth_proto == ETYPE_IPv6) {
 				return 1;
@@ -103,13 +104,13 @@ static int parse_pkt(struct rte_mbuf *mbuf, struct pkt_tuple *pt, struct l4_meta
 	}
 		break;
 	case ETYPE_8021ad: {
-		struct vlan_hdr *vlan = (struct vlan_hdr *)(peth + 1);
+		prox_rte_vlan_hdr *vlan = (prox_rte_vlan_hdr *)(peth + 1);
 		pt->l2_types[l2_types_count++] = vlan->eth_proto;
 		if (vlan->eth_proto == ETYPE_VLAN) {
-			struct vlan_hdr *vlan = (struct vlan_hdr *)(peth + 1);
+			prox_rte_vlan_hdr *vlan = (prox_rte_vlan_hdr *)(peth + 1);
 			pt->l2_types[l2_types_count++] = vlan->eth_proto;
 			if (vlan->eth_proto == ETYPE_IPv4) {
-				pip = (struct ipv4_hdr *)(peth + 1);
+				pip = (prox_rte_ipv4_hdr *)(peth + 1);
 			}
 			else {
 				return 1;
@@ -148,21 +149,21 @@ static int parse_pkt(struct rte_mbuf *mbuf, struct pkt_tuple *pt, struct l4_meta
 
 	/* L4 parser */
 	if (pt->proto_id == IPPROTO_UDP) {
-		struct udp_hdr *udp = (struct udp_hdr*)(pip + 1);
+		prox_rte_udp_hdr *udp = (prox_rte_udp_hdr*)(pip + 1);
 		l4_meta->l4_hdr = (uint8_t*)udp;
 		pt->src_port = udp->src_port;
 		pt->dst_port = udp->dst_port;
-		l4_meta->payload = ((uint8_t*)udp) + sizeof(struct udp_hdr);
-		l4_meta->len = rte_be_to_cpu_16(udp->dgram_len) - sizeof(struct udp_hdr);
+		l4_meta->payload = ((uint8_t*)udp) + sizeof(prox_rte_udp_hdr);
+		l4_meta->len = rte_be_to_cpu_16(udp->dgram_len) - sizeof(prox_rte_udp_hdr);
 	}
 	else if (pt->proto_id == IPPROTO_TCP) {
-		struct tcp_hdr *tcp = (struct tcp_hdr*)(pip + 1);
+		prox_rte_tcp_hdr *tcp = (prox_rte_tcp_hdr*)(pip + 1);
 		l4_meta->l4_hdr = (uint8_t*)tcp;
 		pt->src_port = tcp->src_port;
 		pt->dst_port = tcp->dst_port;
 
 		l4_meta->payload = ((uint8_t*)tcp) + ((tcp->data_off >> 4)*4);
-		l4_meta->len = rte_be_to_cpu_16(pip->total_length) - sizeof(struct ipv4_hdr) - ((tcp->data_off >> 4)*4);
+		l4_meta->len = rte_be_to_cpu_16(pip->total_length) - sizeof(prox_rte_ipv4_hdr) - ((tcp->data_off >> 4)*4);
 	}
 	else {
 		plog_err("unsupported protocol %d\n", pt->proto_id);