From patchwork Tue Nov 3 23:48:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 539642 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 0A6711402B2 for ; Wed, 4 Nov 2015 10:49:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nicira_com.20150623.gappssmtp.com header.i=@nicira_com.20150623.gappssmtp.com header.b=Y7FQ9hXn; dkim-atps=neutral Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id C7DC610615; Tue, 3 Nov 2015 15:49:00 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 469EB10605 for ; Tue, 3 Nov 2015 15:48:59 -0800 (PST) Received: from bar4.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id CCCBE162EFC for ; Tue, 3 Nov 2015 16:48:58 -0700 (MST) X-ASG-Debug-ID: 1446594538-03dc2118c94cd00001-byXFYA Received: from mx3-pf1.cudamail.com ([192.168.14.2]) by bar4.cudamail.com with ESMTP id NAxMGQ6HXazCfAN1 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 03 Nov 2015 16:48:58 -0700 (MST) X-Barracuda-Envelope-From: jpettit@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.2 Received: from unknown (HELO mail-pa0-f50.google.com) (209.85.220.50) by mx3-pf1.cudamail.com with ESMTPS (RC4-SHA encrypted); 3 Nov 2015 23:48:58 -0000 Received-SPF: unknown (mx3-pf1.cudamail.com: Multiple SPF records returned) X-Barracuda-Apparent-Source-IP: 209.85.220.50 X-Barracuda-RBL-IP: 209.85.220.50 Received: by padhx2 with SMTP id hx2so24659184pad.1 for ; Tue, 03 Nov 2015 15:48:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nicira_com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=n8/KMpt+706vMIpGROKscVEbcoqx5LAFbOaHwJo0Ims=; b=Y7FQ9hXn6yQ9IXRrVa/QHAc3V7ZnQQUnOFkn2IMG6bKpuqENdAbTRQ/WgxhU4dy2pT LmTRKP+MixuLyRNf0OXQc4ayE3wbqrfh5e8rF8KkVjs7/lJm9FyXZ4TCkDlEWNqY+9Hl X1UQyDzXR1cx9YK2yk6SO5Kj4Gqpq9DLpXpgkf1nVMGjF6mWrI98/qqF+SyLH5SVwy8i riRaj6r1rARIQDJ2mmpcd3R/jnTTlolTMhCvo0ThhFG20bcl4OWrk5I0Pk5iaKl5L2dv agaPrayIss1MZw5oiTOPCTQjfR8VU2ic26Jr2Ibbrp2L3kBhIPGeaMVwiUHfNPfXPtkC joNA== 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=n8/KMpt+706vMIpGROKscVEbcoqx5LAFbOaHwJo0Ims=; b=l6LDM9qXh3Xv0FPZqCHCB3lD7wC3sQs3J5Mao95rP3AaxVFuNXxyALUMRYNyiCeXz2 1Vy8G4+VmiuH7up6IdozkKQ2IQHn24G0QEyeBwv4yL3GQ+GskXDs+FO07kMSKJJ0OuGg OOTER/44ejltXWiaA6aWoMo7tGOP4tCTW0ImJ1xIsNqRsnxG1wb50KYOXMo/jAgetjj6 azLEHErxaypf7g4agKNyEVQBHx+vYuCvxZF/YxHdKCtzfrx69PzNeh1qi7Pg4rL4HZ6q X92q36JjaKLvLDKmtlB9GG/Ax0gZZB7BXHmkZzCChL3ie1G6qElfV+ZNjcR7JPBSzZNX TCLg== X-Gm-Message-State: ALoCoQnXdwl3snxLkmm5JOXzfb+XfHVH4MbnQ8Yt/qjVDcr+Yl0S2ZBB2L9LZaDBZs6Mpjq2VKFG X-Received: by 10.68.130.198 with SMTP id og6mr37374908pbb.85.1446594538053; Tue, 03 Nov 2015 15:48:58 -0800 (PST) Received: from localhost.localdomain (c-67-161-8-206.hsd1.ca.comcast.net. [67.161.8.206]) by smtp.gmail.com with ESMTPSA id qf2sm28725441pbb.3.2015.11.03.15.48.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Nov 2015 15:48:57 -0800 (PST) X-CudaMail-Envelope-Sender: jpettit@nicira.com From: Justin Pettit To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V1-1102065426 X-CudaMail-DTE: 110315 X-CudaMail-Originating-IP: 209.85.220.50 Date: Tue, 3 Nov 2015 15:48:48 -0800 X-ASG-Orig-Subj: [##CM-V1-1102065426##][ICMP v2 5/7] packets: Add support for modifying ICMP type and code. Message-Id: <1446594530-22162-6-git-send-email-jpettit@nicira.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1446594530-22162-1-git-send-email-jpettit@nicira.com> References: <1446594530-22162-1-git-send-email-jpettit@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.14.2] X-Barracuda-Start-Time: 1446594538 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] [ICMP v2 5/7] 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 Acked-by: Flavio Leitner --- 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..701a5ec 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); + ovs_be16 orig_tc = htons(ih->icmp_type << 8 | ih->icmp_code); + ovs_be16 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);