}
static void
-ether_addr_dump(const char *what, const struct ether_addr *ea)
+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);
}
static uint16_t
-ipv4_hdr_cksum(struct ipv4_hdr *ip_h)
+ipv4_hdr_cksum(struct rte_ipv4_hdr *ip_h)
{
uint16_t *v16_h;
uint32_t ip_cksum;
{
struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
struct rte_mbuf *pkt;
- struct ether_hdr *eth_h;
- struct vlan_hdr *vlan_h;
+ struct rte_ether_hdr *eth_h;
+ struct rte_vlan_hdr *vlan_h;
struct rte_arp_hdr *arp_h;
- struct ipv4_hdr *ip_h;
- struct icmp_hdr *icmp_h;
- struct ether_addr eth_addr;
+ struct rte_ipv4_hdr *ip_h;
+ struct rte_icmp_hdr *icmp_h;
+ struct rte_ether_addr eth_addr;
uint32_t retry;
uint32_t ip_addr;
uint16_t nb_rx;
rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],
void *));
pkt = pkts_burst[i];
- eth_h = rte_pktmbuf_mtod(pkt, struct ether_hdr *);
+ eth_h = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
eth_type = RTE_BE_TO_CPU_16(eth_h->ether_type);
- l2_len = sizeof(struct ether_hdr);
+ l2_len = sizeof(struct rte_ether_hdr);
if (verbose_level > 0) {
printf("\nPort %d pkt-len=%u nb-segs=%u\n",
fs->rx_port, pkt->pkt_len, pkt->nb_segs);
ether_addr_dump(" ETH: src=", ð_h->s_addr);
ether_addr_dump(" dst=", ð_h->d_addr);
}
- if (eth_type == ETHER_TYPE_VLAN) {
- vlan_h = (struct vlan_hdr *)
- ((char *)eth_h + sizeof(struct ether_hdr));
- l2_len += sizeof(struct vlan_hdr);
+ 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);
eth_type = rte_be_to_cpu_16(vlan_h->eth_proto);
if (verbose_level > 0) {
vlan_id = rte_be_to_cpu_16(vlan_h->vlan_tci)
}
/* 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);
}
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)
) {
continue;
}
if (verbose_level > 0) {
- ether_addr_copy(&arp_h->arp_data.arp_sha, ð_addr);
+ rte_ether_addr_copy(&arp_h->arp_data.arp_sha,
+ ð_addr);
ether_addr_dump(" sha=", ð_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, ð_addr);
+ rte_ether_addr_copy(&arp_h->arp_data.arp_tha,
+ ð_addr);
ether_addr_dump(" tha=", ð_addr);
ip_addr = arp_h->arp_data.arp_tip;
ipv4_addr_dump(" tip=", ip_addr);
*/
/* Use source MAC address as destination MAC address. */
- ether_addr_copy(ð_h->s_addr, ð_h->d_addr);
+ rte_ether_addr_copy(ð_h->s_addr, ð_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,
ð_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, ð_addr);
- ether_addr_copy(&arp_h->arp_data.arp_sha, &arp_h->arp_data.arp_tha);
- ether_addr_copy(ð_h->s_addr, &arp_h->arp_data.arp_sha);
+ rte_ether_addr_copy(&arp_h->arp_data.arp_tha,
+ ð_addr);
+ rte_ether_addr_copy(&arp_h->arp_data.arp_sha,
+ &arp_h->arp_data.arp_tha);
+ rte_ether_addr_copy(ð_h->s_addr,
+ &arp_h->arp_data.arp_sha);
/* Swap IP addresses in ARP payload */
ip_addr = arp_h->arp_data.arp_sip;
continue;
}
- if (eth_type != ETHER_TYPE_IPv4) {
+ if (eth_type != RTE_ETHER_TYPE_IPV4) {
rte_pktmbuf_free(pkt);
continue;
}
- ip_h = (struct ipv4_hdr *) ((char *)eth_h + l2_len);
+ ip_h = (struct rte_ipv4_hdr *) ((char *)eth_h + l2_len);
if (verbose_level > 0) {
ipv4_addr_dump(" IPV4: src=", ip_h->src_addr);
ipv4_addr_dump(" dst=", ip_h->dst_addr);
/*
* Check if packet is a ICMP echo request.
*/
- icmp_h = (struct icmp_hdr *) ((char *)ip_h +
- sizeof(struct ipv4_hdr));
+ icmp_h = (struct rte_icmp_hdr *) ((char *)ip_h +
+ sizeof(struct rte_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;
* - 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(ð_h->s_addr, ð_addr);
- ether_addr_copy(ð_h->d_addr, ð_h->s_addr);
- ether_addr_copy(ð_addr, ð_h->d_addr);
+ rte_ether_addr_copy(ð_h->s_addr, ð_addr);
+ rte_ether_addr_copy(ð_h->d_addr, ð_h->s_addr);
+ rte_ether_addr_copy(ð_addr, ð_h->d_addr);
ip_addr = ip_h->src_addr;
if (is_multicast_ipv4_addr(ip_h->dst_addr)) {
uint32_t ip_src;
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;