net: change arp header struct declaration

Changed MAC address type from uint8_t[6] to struct ether_addr and IP
address type from uint8_t[4] to uint32_t to make it consistent with
other DPDK code using MAC and IP addresses. It allows us to use
is_same_ether_addr and ether_addr_copy functions on MAC addresses in ARP header.  Also
removed union from arp_hdr struct to make calls to arp_data items
shorter. Updated test-pmd to match new arp_hdr version.

Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
Acked-by: Declan Doherty <declan.doherty@intel.com>
[Thomas: doxygenize comments]

diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c
index 08ea01d..010c5a9 100644 (file)
--- a/app/test-pmd/icmpecho.c
+++ b/app/test-pmd/icmpecho.c
@@ -371,18 +371,14 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
                                continue;
                        }
                        if (verbose_level > 0) {
-                               memcpy(&eth_addr,
-                                      arp_h->arp_data.arp_ip.arp_sha, 6);
+                               ether_addr_copy(&arp_h->arp_data.arp_sha, &eth_addr);
                                ether_addr_dump("        sha=", &eth_addr);
-                               memcpy(&ip_addr,
-                                      arp_h->arp_data.arp_ip.arp_sip, 4);
+                               ip_addr = arp_h->arp_data.arp_sip;
                                ipv4_addr_dump(" sip=", ip_addr);
                                printf("\n");
-                               memcpy(&eth_addr,
-                                      arp_h->arp_data.arp_ip.arp_tha, 6);
+                               ether_addr_copy(&arp_h->arp_data.arp_tha, &eth_addr);
                                ether_addr_dump("        tha=", &eth_addr);
-                               memcpy(&ip_addr,
-                                      arp_h->arp_data.arp_ip.arp_tip, 4);
+                               ip_addr = arp_h->arp_data.arp_tip;
                                ipv4_addr_dump(" tip=", ip_addr);
                                printf("\n");
                        }
@@ -402,17 +398,14 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
                                        &eth_h->s_addr);
 
                        arp_h->arp_op = rte_cpu_to_be_16(ARP_OP_REPLY);
-                       memcpy(&eth_addr, arp_h->arp_data.arp_ip.arp_tha, 6);
-                       memcpy(arp_h->arp_data.arp_ip.arp_tha,
-                              arp_h->arp_data.arp_ip.arp_sha, 6);
-                       memcpy(arp_h->arp_data.arp_ip.arp_sha,
-                              &eth_h->s_addr, 6);
+                       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_addr, &arp_h->arp_data.arp_sha);
 
                        /* Swap IP addresses in ARP payload */
-                       memcpy(&ip_addr, arp_h->arp_data.arp_ip.arp_sip, 4);
-                       memcpy(arp_h->arp_data.arp_ip.arp_sip,
-                              arp_h->arp_data.arp_ip.arp_tip, 4);
-                       memcpy(arp_h->arp_data.arp_ip.arp_tip, &ip_addr, 4);
+                       ip_addr = arp_h->arp_data.arp_sip;
+                       arp_h->arp_data.arp_sip = arp_h->arp_data.arp_tip;
+                       arp_h->arp_data.arp_tip = ip_addr;
                        pkts_burst[nb_replies++] = pkt;
                        continue;
                }

diff --git a/lib/librte_net/rte_arp.h b/lib/librte_net/rte_arp.h
index c7b0e51..1836418 100644 (file)
--- a/lib/librte_net/rte_arp.h
+++ b/lib/librte_net/rte_arp.h
@@ -39,6 +39,7 @@
  */
 
 #include <stdint.h>
+#include <rte_ether.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,10 +49,10 @@ extern "C" {
  * ARP header IPv4 payload.
  */
 struct arp_ipv4 {
-       uint8_t  arp_sha[6]; /* sender hardware address */
-       uint8_t  arp_sip[4]; /* sender IP address */
-       uint8_t  arp_tha[6]; /* target hardware address */
-       uint8_t  arp_tip[4]; /* target IP address */
+       struct ether_addr arp_sha;  /**< sender hardware address */
+       uint32_t          arp_sip;  /**< sender IP address */
+       struct ether_addr arp_tha;  /**< target hardware address */
+       uint32_t          arp_tip;  /**< target IP address */
 } __attribute__((__packed__));
 
 /**
@@ -72,9 +73,7 @@ struct arp_hdr {
 #define        ARP_OP_INVREQUEST 8 /* request to identify peer */
 #define        ARP_OP_INVREPLY   9 /* response identifying peer */
 
-       union {
-               struct arp_ipv4 arp_ip;
-       } arp_data;
+       struct arp_ipv4 arp_data;
 } __attribute__((__packed__));
 
 #ifdef __cplusplus