From patchwork Wed Oct 21 07:24:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 533622 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id 6B733140787 for ; Wed, 21 Oct 2015 18:25:28 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id F25191063A; Wed, 21 Oct 2015 00:24:55 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v1.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id E4F4410617 for ; Wed, 21 Oct 2015 00:24:54 -0700 (PDT) Received: from bar4.cudamail.com (bar2 [192.168.15.2]) by mx3v1.cudamail.com (Postfix) with ESMTP id 65EDC618AC9 for ; Wed, 21 Oct 2015 01:24:54 -0600 (MDT) X-ASG-Debug-ID: 1445412294-03dc210f8d15dd30001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar4.cudamail.com with ESMTP id xnOlIPF87O8YTKNg (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 21 Oct 2015 01:24:54 -0600 (MDT) X-Barracuda-Envelope-From: jpettit@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO mail-pa0-f53.google.com) (209.85.220.53) by mx3-pf3.cudamail.com with ESMTPS (RC4-SHA encrypted); 21 Oct 2015 07:24:53 -0000 Received-SPF: unknown (mx3-pf3.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.53 Received: by pabrc13 with SMTP id rc13so46731191pab.0 for ; Wed, 21 Oct 2015 00:24:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=+g8tVhb3TzTUgkHL9gog6fa01hu6AraV8hYY3EEMij0=; b=S+9YYvz3EUYxEPSyzwtTvGSm/P2f7bW91/dIpBhpwHtiieuwvDMHonOOcObSQp1dk7 rSa84k2/pKzs/Q5xhySUXgseHRU8TEbYszxTcRA8U3htaZgjAnmKrmQqSY8xN4o9i54z r2Z1N4+CcuylJF7bsPcSjtcjzw0W4lxsHtd5JRjr5h21UqFgVJ9YxI2fsRg+klM0LeS6 LzmhL73eWGIRI4tXr7VsSLrNTiZI8dOZDskOvBupLtXPvvrYiIpQV1ZMyI0fzVafsblC 0xADhiyr2NPCTknH37GkvN7C26VvNQvNfNt2OuxQo1lWBmJQ0hvJt8FDqPx+yP+3XuWV o3vg== X-Gm-Message-State: ALoCoQlE6pOMb3VCzIopb8NBm+xpQNYC2ieOvQYm1vfqzcxAsMd/AxFlYW0W4t3AtbV8C9lcV4d1 X-Received: by 10.68.131.6 with SMTP id oi6mr8918235pbb.3.1445412293416; Wed, 21 Oct 2015 00:24:53 -0700 (PDT) Received: from localhost.localdomain (c-67-161-8-206.hsd1.ca.comcast.net. [67.161.8.206]) by smtp.gmail.com with ESMTPSA id x6sm7469097pbt.3.2015.10.21.00.24.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 21 Oct 2015 00:24:52 -0700 (PDT) X-CudaMail-Envelope-Sender: jpettit@nicira.com X-Barracuda-Apparent-Source-IP: 67.161.8.206 From: Justin Pettit To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V3-1020001292 X-CudaMail-DTE: 102115 X-CudaMail-Originating-IP: 209.85.220.53 Date: Wed, 21 Oct 2015 00:24:29 -0700 X-ASG-Orig-Subj: [##CM-V3-1020001292##][PATCH 08/10] packets: Add support for modifying ICMP type and code. Message-Id: <1445412271-22019-8-git-send-email-jpettit@nicira.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1445412271-22019-1-git-send-email-jpettit@nicira.com> References: <1445412271-22019-1-git-send-email-jpettit@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1445412294 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH 08/10] packets: Add support for modifying ICMP type and code. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Justin Pettit --- lib/packets.c | 18 ++++++++++++++++++ lib/packets.h | 1 + 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/lib/packets.c b/lib/packets.c index 342d8b7..0303801 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -905,6 +905,24 @@ packet_set_sctp_port(struct dp_packet *packet, ovs_be16 src, ovs_be16 dst) put_16aligned_be32(&sh->sctp_csum, old_csum ^ old_correct_csum ^ new_csum); } +/* Sets the ICMP type and code of the ICMP header contained in 'packet'. + * 'packet' must be a valid ICMP packet with its l4 offset properly + * populated. */ +void +packet_set_icmp(struct dp_packet *packet, uint8_t type, uint8_t code) +{ + struct icmp_header *ih = dp_packet_l4(packet); + uint16_t orig_tc = htons(ih->icmp_type << 8 | ih->icmp_code); + uint16_t new_tc = htons(type << 8 | code); + + if (orig_tc != new_tc) { + ih->icmp_type = type; + ih->icmp_code = code; + + ih->icmp_csum = recalc_csum16(ih->icmp_csum, orig_tc, new_tc); + } +} + void packet_set_nd(struct dp_packet *packet, const ovs_be32 target[4], const struct eth_addr sll, const struct eth_addr tll) { diff --git a/lib/packets.h b/lib/packets.h index 67f635e..de8d4b6 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -975,6 +975,7 @@ void packet_set_ipv6(struct dp_packet *, uint8_t proto, const ovs_be32 src[4], void packet_set_tcp_port(struct dp_packet *, ovs_be16 src, ovs_be16 dst); void packet_set_udp_port(struct dp_packet *, ovs_be16 src, ovs_be16 dst); void packet_set_sctp_port(struct dp_packet *, ovs_be16 src, ovs_be16 dst); +void packet_set_icmp(struct dp_packet *, uint8_t type, uint8_t code); void packet_set_nd(struct dp_packet *, const ovs_be32 target[4], const struct eth_addr sll, const struct eth_addr tll);