X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=inline;f=app%2Ftest%2Fpacket_burst_generator.c;h=f203f9d09efc7eecc75a36348973e5550cab99d8;hb=c87ba0f07965970ea3042a85fa59a6bdd84caa4d;hp=02afc554766faec80dd1ba987b3ae0c1539d8565;hpb=a7c528e5d71ff3f569898d268f9de129fdfc152b;p=dpdk.git diff --git a/app/test/packet_burst_generator.c b/app/test/packet_burst_generator.c index 02afc55476..f203f9d09e 100644 --- a/app/test/packet_burst_generator.c +++ b/app/test/packet_burst_generator.c @@ -4,6 +4,7 @@ #include #include +#include #include "packet_burst_generator.h" @@ -12,9 +13,6 @@ #define IP_DEFTTL 64 /* from RFC 1340. */ -#define IP_VERSION 0x40 -#define IP_HDRLEN 0x05 /* default IP header length == five 32-bits words. */ -#define IP_VHL_DEF (IP_VERSION | IP_HDRLEN) static void copy_buf_to_pkt_segs(void *buf, unsigned len, struct rte_mbuf *pkt, @@ -82,7 +80,7 @@ initialize_arp_header(struct rte_arp_hdr *arp_hdr, uint32_t opcode) { arp_hdr->arp_hardware = rte_cpu_to_be_16(RTE_ARP_HRD_ETHER); - arp_hdr->arp_protocol = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + arp_hdr->arp_protocol = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); arp_hdr->arp_hlen = RTE_ETHER_ADDR_LEN; arp_hdr->arp_plen = sizeof(uint32_t); arp_hdr->arp_opcode = rte_cpu_to_be_16(opcode); @@ -93,12 +91,12 @@ initialize_arp_header(struct rte_arp_hdr *arp_hdr, } uint16_t -initialize_udp_header(struct udp_hdr *udp_hdr, uint16_t src_port, +initialize_udp_header(struct rte_udp_hdr *udp_hdr, uint16_t src_port, uint16_t dst_port, uint16_t pkt_data_len) { uint16_t pkt_len; - pkt_len = (uint16_t) (pkt_data_len + sizeof(struct udp_hdr)); + pkt_len = (uint16_t) (pkt_data_len + sizeof(struct rte_udp_hdr)); udp_hdr->src_port = rte_cpu_to_be_16(src_port); udp_hdr->dst_port = rte_cpu_to_be_16(dst_port); @@ -109,14 +107,14 @@ initialize_udp_header(struct udp_hdr *udp_hdr, uint16_t src_port, } uint16_t -initialize_tcp_header(struct tcp_hdr *tcp_hdr, uint16_t src_port, +initialize_tcp_header(struct rte_tcp_hdr *tcp_hdr, uint16_t src_port, uint16_t dst_port, uint16_t pkt_data_len) { uint16_t pkt_len; - pkt_len = (uint16_t) (pkt_data_len + sizeof(struct tcp_hdr)); + pkt_len = (uint16_t) (pkt_data_len + sizeof(struct rte_tcp_hdr)); - memset(tcp_hdr, 0, sizeof(struct tcp_hdr)); + memset(tcp_hdr, 0, sizeof(struct rte_tcp_hdr)); tcp_hdr->src_port = rte_cpu_to_be_16(src_port); tcp_hdr->dst_port = rte_cpu_to_be_16(dst_port); @@ -124,12 +122,12 @@ initialize_tcp_header(struct tcp_hdr *tcp_hdr, uint16_t src_port, } uint16_t -initialize_sctp_header(struct sctp_hdr *sctp_hdr, uint16_t src_port, +initialize_sctp_header(struct rte_sctp_hdr *sctp_hdr, uint16_t src_port, uint16_t dst_port, uint16_t pkt_data_len) { uint16_t pkt_len; - pkt_len = (uint16_t) (pkt_data_len + sizeof(struct udp_hdr)); + pkt_len = (uint16_t) (pkt_data_len + sizeof(struct rte_udp_hdr)); sctp_hdr->src_port = rte_cpu_to_be_16(src_port); sctp_hdr->dst_port = rte_cpu_to_be_16(dst_port); @@ -167,7 +165,7 @@ initialize_ipv4_header(struct rte_ipv4_hdr *ip_hdr, uint32_t src_addr, */ pkt_len = (uint16_t) (pkt_data_len + sizeof(struct rte_ipv4_hdr)); - ip_hdr->version_ihl = IP_VHL_DEF; + ip_hdr->version_ihl = RTE_IPV4_VHL_DEF; ip_hdr->type_of_service = 0; ip_hdr->fragment_offset = 0; ip_hdr->time_to_live = IP_DEFTTL; @@ -215,7 +213,7 @@ initialize_ipv4_header_proto(struct rte_ipv4_hdr *ip_hdr, uint32_t src_addr, */ pkt_len = (uint16_t) (pkt_data_len + sizeof(struct rte_ipv4_hdr)); - ip_hdr->version_ihl = IP_VHL_DEF; + ip_hdr->version_ihl = RTE_IPV4_VHL_DEF; ip_hdr->type_of_service = 0; ip_hdr->fragment_offset = 0; ip_hdr->time_to_live = IP_DEFTTL; @@ -260,7 +258,7 @@ initialize_ipv4_header_proto(struct rte_ipv4_hdr *ip_hdr, uint32_t src_addr, int generate_packet_burst(struct rte_mempool *mp, struct rte_mbuf **pkts_burst, struct rte_ether_hdr *eth_hdr, uint8_t vlan_enabled, - void *ip_hdr, uint8_t ipv4, struct udp_hdr *udp_hdr, + void *ip_hdr, uint8_t ipv4, struct rte_udp_hdr *udp_hdr, int nb_pkt_per_burst, uint8_t pkt_len, uint8_t nb_pkt_segs) { int i, nb_pkt = 0; @@ -324,10 +322,10 @@ nomore_mbuf: pkt->l2_len = eth_hdr_size; if (ipv4) { - pkt->vlan_tci = RTE_ETHER_TYPE_IPv4; + pkt->vlan_tci = RTE_ETHER_TYPE_IPV4; pkt->l3_len = sizeof(struct rte_ipv4_hdr); } else { - pkt->vlan_tci = RTE_ETHER_TYPE_IPv6; + pkt->vlan_tci = RTE_ETHER_TYPE_IPV6; pkt->l3_len = sizeof(struct rte_ipv6_hdr); } @@ -390,19 +388,19 @@ nomore_mbuf: switch (proto) { case IPPROTO_UDP: copy_buf_to_pkt(proto_hdr, - sizeof(struct udp_hdr), pkt, + sizeof(struct rte_udp_hdr), pkt, eth_hdr_size + sizeof(struct rte_ipv4_hdr)); break; case IPPROTO_TCP: copy_buf_to_pkt(proto_hdr, - sizeof(struct tcp_hdr), pkt, + sizeof(struct rte_tcp_hdr), pkt, eth_hdr_size + sizeof(struct rte_ipv4_hdr)); break; case IPPROTO_SCTP: copy_buf_to_pkt(proto_hdr, - sizeof(struct sctp_hdr), pkt, + sizeof(struct rte_sctp_hdr), pkt, eth_hdr_size + sizeof(struct rte_ipv4_hdr)); break; @@ -415,19 +413,19 @@ nomore_mbuf: switch (proto) { case IPPROTO_UDP: copy_buf_to_pkt(proto_hdr, - sizeof(struct udp_hdr), pkt, + sizeof(struct rte_udp_hdr), pkt, eth_hdr_size + sizeof(struct rte_ipv6_hdr)); break; case IPPROTO_TCP: copy_buf_to_pkt(proto_hdr, - sizeof(struct tcp_hdr), pkt, + sizeof(struct rte_tcp_hdr), pkt, eth_hdr_size + sizeof(struct rte_ipv6_hdr)); break; case IPPROTO_SCTP: copy_buf_to_pkt(proto_hdr, - sizeof(struct sctp_hdr), pkt, + sizeof(struct rte_sctp_hdr), pkt, eth_hdr_size + sizeof(struct rte_ipv6_hdr)); break; @@ -445,10 +443,10 @@ nomore_mbuf: pkt->l2_len = eth_hdr_size; if (ipv4) { - pkt->vlan_tci = RTE_ETHER_TYPE_IPv4; + pkt->vlan_tci = RTE_ETHER_TYPE_IPV4; pkt->l3_len = sizeof(struct rte_ipv4_hdr); } else { - pkt->vlan_tci = RTE_ETHER_TYPE_IPv6; + pkt->vlan_tci = RTE_ETHER_TYPE_IPV6; pkt->l3_len = sizeof(struct rte_ipv6_hdr); }