net: add rte prefix to ICMP defines

[dpdk.git] / app / test-pmd / icmpecho.c

diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c
index 3cc4d25..949cc55 100644 (file)
--- a/app/test-pmd/icmpecho.c
+++ b/app/test-pmd/icmpecho.c
@@ -223,9 +223,9 @@ ipv4_addr_to_dot(uint32_t be_ipv4_addr, char *buf)
 static void
 ether_addr_dump(const char *what, const struct rte_ether_addr *ea)
 {
-       char buf[ETHER_ADDR_FMT_SIZE];
+       char buf[RTE_ETHER_ADDR_FMT_SIZE];
 
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, ea);
+       rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, ea);
        if (what)
                printf("%s", what);
        printf("%s", buf);
@@ -279,7 +279,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
        struct rte_vlan_hdr *vlan_h;
        struct rte_arp_hdr  *arp_h;
        struct ipv4_hdr *ip_h;
-       struct icmp_hdr *icmp_h;
+       struct rte_icmp_hdr *icmp_h;
        struct rte_ether_addr eth_addr;
        uint32_t retry;
        uint32_t ip_addr;
@@ -330,7 +330,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
                        ether_addr_dump("  ETH:  src=", &eth_h->s_addr);
                        ether_addr_dump(" dst=", &eth_h->d_addr);
                }
-               if (eth_type == ETHER_TYPE_VLAN) {
+               if (eth_type == RTE_ETHER_TYPE_VLAN) {
                        vlan_h = (struct rte_vlan_hdr *)
                                ((char *)eth_h + sizeof(struct rte_ether_hdr));
                        l2_len  += sizeof(struct rte_vlan_hdr);
@@ -346,7 +346,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
                }
 
                /* Reply to ARP requests */
-               if (eth_type == ETHER_TYPE_ARP) {
+               if (eth_type == RTE_ETHER_TYPE_ARP) {
                        arp_h = (struct rte_arp_hdr *) ((char *)eth_h + l2_len);
                        arp_op = RTE_BE_TO_CPU_16(arp_h->arp_opcode);
                        arp_pro = RTE_BE_TO_CPU_16(arp_h->arp_protocol);
@@ -360,7 +360,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
                        }
                        if ((RTE_BE_TO_CPU_16(arp_h->arp_hardware) !=
                             RTE_ARP_HRD_ETHER) ||
-                           (arp_pro != ETHER_TYPE_IPv4) ||
+                           (arp_pro != RTE_ETHER_TYPE_IPv4) ||
                            (arp_h->arp_hlen != 6) ||
                            (arp_h->arp_plen != 4)
                            ) {
@@ -370,12 +370,14 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
                                continue;
                        }
                        if (verbose_level > 0) {
-                               ether_addr_copy(&arp_h->arp_data.arp_sha, &eth_addr);
+                               rte_ether_addr_copy(&arp_h->arp_data.arp_sha,
+                                               &eth_addr);
                                ether_addr_dump("        sha=", &eth_addr);
                                ip_addr = arp_h->arp_data.arp_sip;
                                ipv4_addr_dump(" sip=", ip_addr);
                                printf("\n");
-                               ether_addr_copy(&arp_h->arp_data.arp_tha, &eth_addr);
+                               rte_ether_addr_copy(&arp_h->arp_data.arp_tha,
+                                               &eth_addr);
                                ether_addr_dump("        tha=", &eth_addr);
                                ip_addr = arp_h->arp_data.arp_tip;
                                ipv4_addr_dump(" tip=", ip_addr);
@@ -391,15 +393,18 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
                         */
 
                        /* Use source MAC address as destination MAC address. */
-                       ether_addr_copy(&eth_h->s_addr, &eth_h->d_addr);
+                       rte_ether_addr_copy(&eth_h->s_addr, &eth_h->d_addr);
                        /* Set source MAC address with MAC address of TX port */
-                       ether_addr_copy(&ports[fs->tx_port].eth_addr,
+                       rte_ether_addr_copy(&ports[fs->tx_port].eth_addr,
                                        &eth_h->s_addr);
 
                        arp_h->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REPLY);
-                       ether_addr_copy(&arp_h->arp_data.arp_tha, &eth_addr);
-                       ether_addr_copy(&arp_h->arp_data.arp_sha, &arp_h->arp_data.arp_tha);
-                       ether_addr_copy(&eth_h->s_addr, &arp_h->arp_data.arp_sha);
+                       rte_ether_addr_copy(&arp_h->arp_data.arp_tha,
+                                       &eth_addr);
+                       rte_ether_addr_copy(&arp_h->arp_data.arp_sha,
+                                       &arp_h->arp_data.arp_tha);
+                       rte_ether_addr_copy(&eth_h->s_addr,
+                                       &arp_h->arp_data.arp_sha);
 
                        /* Swap IP addresses in ARP payload */
                        ip_addr = arp_h->arp_data.arp_sip;
@@ -409,7 +414,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
                        continue;
                }
 
-               if (eth_type != ETHER_TYPE_IPv4) {
+               if (eth_type != RTE_ETHER_TYPE_IPv4) {
                        rte_pktmbuf_free(pkt);
                        continue;
                }
@@ -425,10 +430,10 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
                /*
                 * Check if packet is a ICMP echo request.
                 */
-               icmp_h = (struct icmp_hdr *) ((char *)ip_h +
+               icmp_h = (struct rte_icmp_hdr *) ((char *)ip_h +
                                              sizeof(struct ipv4_hdr));
                if (! ((ip_h->next_proto_id == IPPROTO_ICMP) &&
-                      (icmp_h->icmp_type == IP_ICMP_ECHO_REQUEST) &&
+                      (icmp_h->icmp_type == RTE_IP_ICMP_ECHO_REQUEST) &&
                       (icmp_h->icmp_code == 0))) {
                        rte_pktmbuf_free(pkt);
                        continue;
@@ -452,13 +457,13 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
                 *     - switch the request IP source and destination
                 *       addresses in the reply IP header,
                 *     - keep the IP header checksum unchanged.
-                * - set IP_ICMP_ECHO_REPLY in ICMP header.
+                * - set RTE_IP_ICMP_ECHO_REPLY in ICMP header.
                 * ICMP checksum is computed by assuming it is valid in the
                 * echo request and not verified.
                 */
-               ether_addr_copy(&eth_h->s_addr, &eth_addr);
-               ether_addr_copy(&eth_h->d_addr, &eth_h->s_addr);
-               ether_addr_copy(&eth_addr, &eth_h->d_addr);
+               rte_ether_addr_copy(&eth_h->s_addr, &eth_addr);
+               rte_ether_addr_copy(&eth_h->d_addr, &eth_h->s_addr);
+               rte_ether_addr_copy(&eth_addr, &eth_h->d_addr);
                ip_addr = ip_h->src_addr;
                if (is_multicast_ipv4_addr(ip_h->dst_addr)) {
                        uint32_t ip_src;
@@ -475,10 +480,10 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
                        ip_h->src_addr = ip_h->dst_addr;
                        ip_h->dst_addr = ip_addr;
                }
-               icmp_h->icmp_type = IP_ICMP_ECHO_REPLY;
+               icmp_h->icmp_type = RTE_IP_ICMP_ECHO_REPLY;
                cksum = ~icmp_h->icmp_cksum & 0xffff;
-               cksum += ~htons(IP_ICMP_ECHO_REQUEST << 8) & 0xffff;
-               cksum += htons(IP_ICMP_ECHO_REPLY << 8);
+               cksum += ~htons(RTE_IP_ICMP_ECHO_REQUEST << 8) & 0xffff;
+               cksum += htons(RTE_IP_ICMP_ECHO_REPLY << 8);
                cksum = (cksum & 0xffff) + (cksum >> 16);
                cksum = (cksum & 0xffff) + (cksum >> 16);
                icmp_h->icmp_cksum = ~cksum;