git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/bnxt: fix build with some compilers
[dpdk.git]
/
app
/
test-pmd
/
util.c
diff --git
a/app/test-pmd/util.c
b/app/test-pmd/util.c
index
687bfa4
..
a1164b7
100644
(file)
--- a/
app/test-pmd/util.c
+++ b/
app/test-pmd/util.c
@@
-14,10
+14,10
@@
#include "testpmd.h"
static inline void
#include "testpmd.h"
static inline void
-print_ether_addr(const char *what, struct ether_addr *eth_addr)
+print_ether_addr(const char *what, struct
rte_
ether_addr *eth_addr)
{
{
- char buf[ETHER_ADDR_FMT_SIZE];
-
ether_format_addr(buf,
ETHER_ADDR_FMT_SIZE, eth_addr);
+ char buf[
RTE_
ETHER_ADDR_FMT_SIZE];
+
rte_ether_format_addr(buf, RTE_
ETHER_ADDR_FMT_SIZE, eth_addr);
printf("%s%s", what, buf);
}
printf("%s%s", what, buf);
}
@@
-26,7
+26,7
@@
dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
uint16_t nb_pkts, int is_rx)
{
struct rte_mbuf *mb;
uint16_t nb_pkts, int is_rx)
{
struct rte_mbuf *mb;
- struct ether_hdr *eth_hdr;
+ struct
rte_
ether_hdr *eth_hdr;
uint16_t eth_type;
uint64_t ol_flags;
uint16_t i, packet_type;
uint16_t eth_type;
uint64_t ol_flags;
uint16_t i, packet_type;
@@
-36,6
+36,7
@@
dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
uint32_t sw_packet_type;
uint16_t udp_port;
uint32_t vx_vni;
uint32_t sw_packet_type;
uint16_t udp_port;
uint32_t vx_vni;
+ const char *reason;
if (!nb_pkts)
return;
if (!nb_pkts)
return;
@@
-45,7
+46,7
@@
dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
(unsigned int) nb_pkts);
for (i = 0; i < nb_pkts; i++) {
mb = pkts[i];
(unsigned int) nb_pkts);
for (i = 0; i < nb_pkts; i++) {
mb = pkts[i];
- eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
+ eth_hdr = rte_pktmbuf_mtod(mb, struct
rte_
ether_hdr *);
eth_type = RTE_BE_TO_CPU_16(eth_hdr->ether_type);
ol_flags = mb->ol_flags;
packet_type = mb->packet_type;
eth_type = RTE_BE_TO_CPU_16(eth_hdr->ether_type);
ol_flags = mb->ol_flags;
packet_type = mb->packet_type;
@@
-102,38
+103,38
@@
dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
if (sw_packet_type & RTE_PTYPE_INNER_L4_MASK)
printf(" - inner_l4_len=%d", hdr_lens.inner_l4_len);
if (is_encapsulation) {
if (sw_packet_type & RTE_PTYPE_INNER_L4_MASK)
printf(" - inner_l4_len=%d", hdr_lens.inner_l4_len);
if (is_encapsulation) {
- struct ipv4_hdr *ipv4_hdr;
- struct ipv6_hdr *ipv6_hdr;
- struct udp_hdr *udp_hdr;
+ struct
rte_
ipv4_hdr *ipv4_hdr;
+ struct
rte_
ipv6_hdr *ipv6_hdr;
+ struct
rte_
udp_hdr *udp_hdr;
uint8_t l2_len;
uint8_t l3_len;
uint8_t l4_len;
uint8_t l4_proto;
uint8_t l2_len;
uint8_t l3_len;
uint8_t l4_len;
uint8_t l4_proto;
- struct vxlan_hdr *vxlan_hdr;
+ struct
rte_
vxlan_hdr *vxlan_hdr;
- l2_len = sizeof(struct ether_hdr);
+ l2_len = sizeof(struct
rte_
ether_hdr);
/* Do not support ipv4 option field */
if (RTE_ETH_IS_IPV4_HDR(packet_type)) {
/* Do not support ipv4 option field */
if (RTE_ETH_IS_IPV4_HDR(packet_type)) {
- l3_len = sizeof(struct ipv4_hdr);
+ l3_len = sizeof(struct
rte_
ipv4_hdr);
ipv4_hdr = rte_pktmbuf_mtod_offset(mb,
ipv4_hdr = rte_pktmbuf_mtod_offset(mb,
- struct ipv4_hdr *,
+ struct
rte_
ipv4_hdr *,
l2_len);
l4_proto = ipv4_hdr->next_proto_id;
} else {
l2_len);
l4_proto = ipv4_hdr->next_proto_id;
} else {
- l3_len = sizeof(struct ipv6_hdr);
+ l3_len = sizeof(struct
rte_
ipv6_hdr);
ipv6_hdr = rte_pktmbuf_mtod_offset(mb,
ipv6_hdr = rte_pktmbuf_mtod_offset(mb,
- struct ipv6_hdr *,
+ struct
rte_
ipv6_hdr *,
l2_len);
l4_proto = ipv6_hdr->proto;
}
if (l4_proto == IPPROTO_UDP) {
udp_hdr = rte_pktmbuf_mtod_offset(mb,
l2_len);
l4_proto = ipv6_hdr->proto;
}
if (l4_proto == IPPROTO_UDP) {
udp_hdr = rte_pktmbuf_mtod_offset(mb,
- struct udp_hdr *,
+ struct
rte_
udp_hdr *,
l2_len + l3_len);
l2_len + l3_len);
- l4_len = sizeof(struct udp_hdr);
+ l4_len = sizeof(struct
rte_
udp_hdr);
vxlan_hdr = rte_pktmbuf_mtod_offset(mb,
vxlan_hdr = rte_pktmbuf_mtod_offset(mb,
- struct vxlan_hdr *,
+ struct
rte_
vxlan_hdr *,
l2_len + l3_len + l4_len);
udp_port = RTE_BE_TO_CPU_16(udp_hdr->dst_port);
vx_vni = rte_be_to_cpu_32(vxlan_hdr->vx_vni);
l2_len + l3_len + l4_len);
udp_port = RTE_BE_TO_CPU_16(udp_hdr->dst_port);
vx_vni = rte_be_to_cpu_32(vxlan_hdr->vx_vni);
@@
-147,6
+148,8
@@
dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
printf("\n");
rte_get_rx_ol_flag_list(mb->ol_flags, buf, sizeof(buf));
printf(" ol_flags: %s\n", buf);
printf("\n");
rte_get_rx_ol_flag_list(mb->ol_flags, buf, sizeof(buf));
printf(" ol_flags: %s\n", buf);
+ if (rte_mbuf_check(mb, 1, &reason) < 0)
+ printf("INVALID mbuf: %s\n", reason);
}
}
}
}