net: add rte prefix to ether structures

[dpdk.git] / examples / l3fwd / l3fwd_lpm.c

diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index 3191fc4..b373047 100644 (file)
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -13,6 +13,8 @@
 #include <errno.h>
 #include <getopt.h>
 #include <stdbool.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
 
 #include <rte_debug.h>
 #include <rte_ether.h>
@@ -106,18 +108,18 @@ lpm_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
 {
        struct ipv6_hdr *ipv6_hdr;
        struct ipv4_hdr *ipv4_hdr;
-       struct ether_hdr *eth_hdr;
+       struct rte_ether_hdr *eth_hdr;
 
        if (RTE_ETH_IS_IPV4_HDR(pkt->packet_type)) {
 
-               eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *);
+               eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
                ipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);
 
                return lpm_get_ipv4_dst_port(ipv4_hdr, portid,
                                             qconf->ipv4_lookup_struct);
        } else if (RTE_ETH_IS_IPV6_HDR(pkt->packet_type)) {
 
-               eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *);
+               eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
                ipv6_hdr = (struct ipv6_hdr *)(eth_hdr + 1);
 
                return lpm_get_ipv6_dst_port(ipv6_hdr, portid,
@@ -138,7 +140,7 @@ lpm_get_dst_port_with_ipv4(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
 {
        uint32_t next_hop;
        struct ipv6_hdr *ipv6_hdr;
-       struct ether_hdr *eth_hdr;
+       struct rte_ether_hdr *eth_hdr;
 
        if (RTE_ETH_IS_IPV4_HDR(pkt->packet_type)) {
                return (uint16_t) ((rte_lpm_lookup(qconf->ipv4_lookup_struct,
@@ -147,7 +149,7 @@ lpm_get_dst_port_with_ipv4(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
 
        } else if (RTE_ETH_IS_IPV6_HDR(pkt->packet_type)) {
 
-               eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *);
+               eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
                ipv6_hdr = (struct ipv6_hdr *)(eth_hdr + 1);
 
                return (uint16_t) ((rte_lpm6_lookup(qconf->ipv6_lookup_struct,
@@ -260,6 +262,7 @@ setup_lpm(const int socketid)
        unsigned i;
        int ret;
        char s[64];
+       char abuf[INET6_ADDRSTRLEN];
 
        /* create the LPM table */
        config_ipv4.max_rules = IPV4_L3FWD_LPM_MAX_RULES;
@@ -275,6 +278,7 @@ setup_lpm(const int socketid)
 
        /* populate the LPM table */
        for (i = 0; i < IPV4_L3FWD_LPM_NUM_ROUTES; i++) {
+               struct in_addr in;
 
                /* skip unused ports */
                if ((1 << ipv4_l3fwd_lpm_route_array[i].if_out &
@@ -292,8 +296,9 @@ setup_lpm(const int socketid)
                                i, socketid);
                }
 
-               printf("LPM: Adding route 0x%08x / %d (%d)\n",
-                       (unsigned)ipv4_l3fwd_lpm_route_array[i].ip,
+               in.s_addr = htonl(ipv4_l3fwd_lpm_route_array[i].ip);
+               printf("LPM: Adding route %s / %d (%d)\n",
+                      inet_ntop(AF_INET, &in, abuf, sizeof(abuf)),
                        ipv4_l3fwd_lpm_route_array[i].depth,
                        ipv4_l3fwd_lpm_route_array[i].if_out);
        }
@@ -331,9 +336,10 @@ setup_lpm(const int socketid)
                }
 
                printf("LPM: Adding route %s / %d (%d)\n",
-                       "IPV6",
-                       ipv6_l3fwd_lpm_route_array[i].depth,
-                       ipv6_l3fwd_lpm_route_array[i].if_out);
+                      inet_ntop(AF_INET6, ipv6_l3fwd_lpm_route_array[i].ip,
+                                abuf, sizeof(abuf)),
+                      ipv6_l3fwd_lpm_route_array[i].depth,
+                      ipv6_l3fwd_lpm_route_array[i].if_out);
        }
 }
 
@@ -374,11 +380,11 @@ lpm_check_ptype(int portid)
 static inline void
 lpm_parse_ptype(struct rte_mbuf *m)
 {
-       struct ether_hdr *eth_hdr;
+       struct rte_ether_hdr *eth_hdr;
        uint32_t packet_type = RTE_PTYPE_UNKNOWN;
        uint16_t ether_type;
 
-       eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
+       eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
        ether_type = eth_hdr->ether_type;
        if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv4))
                packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;