From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-ft5.fr.colt.net (smtp-ft5.fr.colt.net [213.41.78.197]) by dpdk.org (Postfix) with ESMTP id 5DC46C32A for ; Thu, 28 May 2015 17:05:37 +0200 (CEST) Received: from smtp-ex1.fr.colt.net (smtp-ex1.fr.colt.net [213.41.78.194]) by smtp-ft5.fr.colt.net (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id t4SF5bTn030116 for ; Thu, 28 May 2015 17:05:37 +0200 Received: from 33.106-14-84.ripe.coltfrance.com ([84.14.106.33] helo=proxy.6wind.com) by smtp-ex1.fr.colt.net with esmtp (Exim) (envelope-from ) id 1YxzNI-0002nv-1Z for ; Thu, 28 May 2015 17:05:37 +0200 Received: from 6wind.com (unknown [10.16.0.189]) by proxy.6wind.com (Postfix) with SMTP id 41A8E281D5; Thu, 28 May 2015 17:05:35 +0200 (CEST) Received: by 6wind.com (sSMTP sendmail emulation); Thu, 28 May 2015 17:05:32 +0200 From: Ivan Boule To: dev@dpdk.org Date: Thu, 28 May 2015 17:05:23 +0200 Message-Id: <1432825523-19006-6-git-send-email-ivan.boule@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1432825523-19006-1-git-send-email-ivan.boule@6wind.com> References: <1432825523-19006-1-git-send-email-ivan.boule@6wind.com> X-ACL-Warn: 1/1 recipients OK. Subject: [dpdk-dev] [PATCH 5/5] app/testpmd: fix reply to a multicast ICMP request X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2015 15:05:38 -0000 Set the IP source and destination addresses in the IP header of the ICMP reply as follows: - Use the request IP source address as the reply IP destination address - If the request IP destination address is a multicast IP address - choose a reply IP source address different from the request IP source address, - re-compute the IP header checksum. Otherwise - switch the request IP source and destination addresses in the reply, - keep the IP header checksum unchanged. Signed-off-by: Ivan Boule --- app/test-pmd/icmpecho.c | 65 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c index 010c5a9..9e6f5e9 100644 --- a/app/test-pmd/icmpecho.c +++ b/app/test-pmd/icmpecho.c @@ -272,6 +272,30 @@ ipv4_addr_dump(const char *what, uint32_t be_ipv4_addr) printf("%s", buf); } +static uint16_t +ipv4_hdr_cksum(struct ipv4_hdr *ip_h) +{ + uint16_t *v16_h; + uint32_t ip_cksum; + + /* + * Compute the sum of successive 16-bit words of the IPv4 header, + * skipping the checksum field of the header. + */ + v16_h = (uint16_t *) ip_h; + ip_cksum = v16_h[0] + v16_h[1] + v16_h[2] + v16_h[3] + + v16_h[4] + v16_h[6] + v16_h[7] + v16_h[8] + v16_h[9]; + + /* reduce 32 bit checksum to 16 bits and complement it */ + ip_cksum = (ip_cksum & 0xffff) + (ip_cksum >> 16); + ip_cksum = (ip_cksum & 0xffff) + (ip_cksum >> 16); + ip_cksum = (~ip_cksum) & 0x0000FFFF; + return (ip_cksum == 0) ? 0xFFFF : (uint16_t) ip_cksum; +} + +#define is_multicast_ipv4_addr(ipv4_addr) \ + (((rte_be_to_cpu_32((ipv4_addr)) >> 24) & 0x000000FF) == 0xE0) + /* * Receive a burst of packets, lookup for ICMP echo requets, and, if any, * send back ICMP echo replies. @@ -295,6 +319,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs) uint16_t vlan_id; uint16_t arp_op; uint16_t arp_pro; + uint32_t cksum; uint8_t i; int l2_len; #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES @@ -442,19 +467,47 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs) /* * Prepare ICMP echo reply to be sent back. * - switch ethernet source and destinations addresses, - * - switch IPv4 source and destinations addresses, + * - use the request IP source address as the reply IP + * destination address, + * - if the request IP destination address is a multicast + * address: + * - choose a reply IP source address different from the + * request IP source address, + * - re-compute the IP header checksum. + * Otherwise: + * - 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. - * No need to re-compute the IP header checksum. - * Reset ICMP checksum. + * 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); ip_addr = ip_h->src_addr; - ip_h->src_addr = ip_h->dst_addr; - ip_h->dst_addr = ip_addr; + if (is_multicast_ipv4_addr(ip_h->dst_addr)) { + uint32_t ip_src; + + ip_src = rte_be_to_cpu_32(ip_addr); + if ((ip_src & 0x00000003) == 1) + ip_src = (ip_src & 0xFFFFFFFC) | 0x00000002; + else + ip_src = (ip_src & 0xFFFFFFFC) | 0x00000001; + ip_h->src_addr = rte_cpu_to_be_32(ip_src); + ip_h->dst_addr = ip_addr; + ip_h->hdr_checksum = ipv4_hdr_cksum(ip_h); + } else { + 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_cksum = 0; + cksum = ~icmp_h->icmp_cksum & 0xffff; + cksum += ~htons(IP_ICMP_ECHO_REQUEST << 8) & 0xffff; + cksum += htons(IP_ICMP_ECHO_REPLY << 8); + cksum = (cksum & 0xffff) + (cksum >> 16); + cksum = (cksum & 0xffff) + (cksum >> 16); + icmp_h->icmp_cksum = ~cksum; pkts_burst[nb_replies++] = pkt; } -- 1.7.10.4