From patchwork Mon Oct 19 04:28:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Yamamoto X-Patchwork-Id: 532117 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 0615D140307 for ; Mon, 19 Oct 2015 15:29:32 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 3320C108AD; Sun, 18 Oct 2015 21:29:30 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id C2B6A1088A for ; Sun, 18 Oct 2015 21:29:26 -0700 (PDT) Received: from bar2.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id 239DA4201D5 for ; Sun, 18 Oct 2015 22:29:26 -0600 (MDT) X-ASG-Debug-ID: 1445228965-03dc5361ed61410001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar2.cudamail.com with ESMTP id ifFntyJM38dSQYSE (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 18 Oct 2015 22:29:25 -0600 (MDT) X-Barracuda-Envelope-From: yamamoto@midokura.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mail-pa0-f46.google.com) (209.85.220.46) by mx1-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 19 Oct 2015 04:29:25 -0000 Received-SPF: neutral (mx1-pf2.cudamail.com: 209.85.220.46 is neither permitted nor denied by SPF record at spf.mandrillapp.com) X-Barracuda-Apparent-Source-IP: 209.85.220.46 X-Barracuda-RBL-IP: 209.85.220.46 Received: by pacfv9 with SMTP id fv9so82047478pac.3 for ; Sun, 18 Oct 2015 21:29:24 -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:cc:subject:date:message-id:in-reply-to :references; bh=tsfwfeZESQMFuRu7Ioi1vZ4Q0RZS4ZfJNzraa5Zlo3w=; b=H/BThjWZY5HyYNBv65dDpzPtWCqDnKy/ru1p/q4Wv04IYj56DggpWe2UjzzDnZenwa UY4AsVUp7LueXPaaTaoi2I9zcwyV7idu66exrAWfzwPfdf3D8Mj9fIULs0vHv+Dubw+x seC8v6DKfpn8yyJ5RLrYtozx9rlytDf0w4SkWMABCx8GKFGKg+biQ/sFd1vmkr2EaCsS o4vyZuwcFAwE7r8AYhL9T8lruVMmFMohYBTchFKOdMNLAqwcuoLfPQ1TPCLS0XyTQzdp NaxLXitwFvEt/9Mxhr9S2g6315LCozg99JXLB3/HurGH1Zvc4qUalae0kB4gUJ3sfEMX cENg== X-Gm-Message-State: ALoCoQlGb1Md7nG3Eu3ak4vcblpocUStM6TkZom0p3fZsfpxw5BuwkG2JkJ7FlCUzEGQCUBiqAO5 X-Received: by 10.68.165.34 with SMTP id yv2mr31911450pbb.112.1445228964536; Sun, 18 Oct 2015 21:29:24 -0700 (PDT) Received: from giraffe.local.net (p2916125-ipngn18101marunouchi.tokyo.ocn.ne.jp. [153.226.221.125]) by smtp.gmail.com with ESMTPSA id we9sm33794799pab.3.2015.10.18.21.29.22 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 18 Oct 2015 21:29:23 -0700 (PDT) X-CudaMail-Envelope-Sender: yamamoto@midokura.com From: YAMAMOTO Takashi To: dev@openvswitch.org X-CudaMail-MID: CM-E2-1017034093 X-CudaMail-DTE: 101815 X-CudaMail-Originating-IP: 209.85.220.46 Date: Mon, 19 Oct 2015 13:28:53 +0900 X-ASG-Orig-Subj: [##CM-E2-1017034093##][PATCH 02/21] ofp-actions: Define IPPORT_FTP by ourselves Message-Id: <1445228952-22445-2-git-send-email-yamamoto@midokura.com> X-Mailer: git-send-email 2.3.8 (Apple Git-58) In-Reply-To: <1445228952-22445-1-git-send-email-yamamoto@midokura.com> References: <1445228952-22445-1-git-send-email-yamamoto@midokura.com> X-GBUdb-Analysis: 0, 209.85.220.46, Ugly c=0.425302 p=-0.419355 Source Normal X-MessageSniffer-Rules: 0-0-0-3597-c X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1445228965 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.60 X-Barracuda-Spam-Status: No, SCORE=0.60 using per-user scores of TAG_LEVEL=3.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=3.0 tests=BSF_SC5_MJ1963, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.23618 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Cc: YAMAMOTO Takashi Subject: [ovs-dev] [PATCH 02/21] ofp-actions: Define IPPORT_FTP by ourselves 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" IPPORT_FTP is not always provided by system headers. (eg. NetBSD, OS X) This hides the enum on Linux but I don't think it causes a problem. Signed-off-by: YAMAMOTO Takashi Acked-by: Ben Pfaff --- lib/ofp-actions.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/ofp-actions.h b/lib/ofp-actions.h index 773b617..f5a5b78 100644 --- a/lib/ofp-actions.h +++ b/lib/ofp-actions.h @@ -499,6 +499,10 @@ struct { \ uint8_t recirc_table; \ } +#if !defined(IPPORT_FTP) +#define IPPORT_FTP 21 +#endif + /* OFPACT_CT. * * Used for NXAST_CT. */