From: Konstantin Ananyev <konstantin.ananyev@intel.com>
To: dev@dpdk.org
Cc: Konstantin Ananyev <konstantin.ananyev@intel.com>, stable@dpdk.org
Subject: [dpdk-stable] [PATCH v2 2/2] examples/ip_fragmentation: fix set IPv4 for unknown packet types
Date: Thu, 18 Jul 2019 11:11:13 +0100 [thread overview]
Message-ID: <20190718101113.13909-3-konstantin.ananyev@intel.com> (raw)
In-Reply-To: <20190718101113.13909-1-konstantin.ananyev@intel.com>
Right now app blindly set IPv4 ether type for all non IPv6 packets.
Instead we can save and later restore original type value.
Fixes: 74de12b7b63a ("examples/ip_fragmentation: overhaul")
Cc: stable@dpdk.org
Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
examples/ip_fragmentation/main.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index c30dd5b5a..b6a1cf9e5 100644
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -242,18 +242,21 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
{
struct rx_queue *rxq;
uint32_t i, len, next_hop;
- uint8_t ipv6;
- uint16_t port_out;
+ uint16_t port_out, ether_type;
int32_t len2;
uint64_t ol_flags;
+ const struct rte_ether_hdr *eth;
- ipv6 = 0;
ol_flags = 0;
rxq = &qconf->rx_queue_list[queueid];
/* by default, send everything back to the source port */
port_out = port_in;
+ /* save ether type of the incoming packet */
+ eth = rte_pktmbuf_mtod(m, const struct rte_ether_hdr *);
+ ether_type = eth->ether_type;
+
/* Remove the Ethernet header and trailer from the input packet */
rte_pktmbuf_adj(m, (uint16_t)sizeof(struct rte_ether_hdr));
@@ -302,8 +305,6 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
/* if this is an IPv6 packet */
struct rte_ipv6_hdr *ip_hdr;
- ipv6 = 1;
-
/* Read the lookup key (i.e. ip_dst) from the input packet */
ip_hdr = rte_pktmbuf_mtod(m, struct rte_ipv6_hdr *);
@@ -364,13 +365,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
/* src addr */
rte_ether_addr_copy(&ports_eth_addr[port_out],
ð_hdr->s_addr);
- if (ipv6) {
- eth_hdr->ether_type =
- rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV6);
- } else {
- eth_hdr->ether_type =
- rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4);
- }
+ eth_hdr->ether_type = ether_type;
}
len += len2;
--
2.17.1
parent reply other threads:[~2019-07-18 10:11 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20190718101113.13909-1-konstantin.ananyev@intel.com>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190718101113.13909-3-konstantin.ananyev@intel.com \
--to=konstantin.ananyev@intel.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).