From patchwork Mon Mar 21 18:58:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ben@skyportsystems.com X-Patchwork-Id: 600280 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3qTQCC2W26z9ryW for ; Tue, 22 Mar 2016 06:00:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=skyportsystems.com header.i=@skyportsystems.com header.b=RjtCux+q; dkim-atps=neutral Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 3A40710518; Mon, 21 Mar 2016 11:59:02 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 97CAE10539 for ; Mon, 21 Mar 2016 11:58:57 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 0FB041E00A2 for ; Mon, 21 Mar 2016 12:58:57 -0600 (MDT) X-ASG-Debug-ID: 1458586735-09eadd305f94a960001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id 0dgDAAeSCgxpxSaQ (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 21 Mar 2016 12:58:55 -0600 (MDT) X-Barracuda-Envelope-From: ben@skyportsystems.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mail-pf0-f176.google.com) (209.85.192.176) by mx1-pf1.cudamail.com with ESMTPS (RC4-SHA encrypted); 21 Mar 2016 18:58:55 -0000 Received-SPF: pass (mx1-pf1.cudamail.com: SPF record at _netblocks.google.com designates 209.85.192.176 as permitted sender) X-Barracuda-RBL-Trusted-Forwarder: 209.85.192.176 Received: by mail-pf0-f176.google.com with SMTP id n5so275143807pfn.2 for ; Mon, 21 Mar 2016 11:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skyportsystems.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=mkpaYoqBp5p6RbLejNY9hU3I/TswQjwGhGHzN83KeGE=; b=RjtCux+quIJLXeRGaYrpJEy4MPirCRc2NdB53IibUvz4erAV5wHSTxMOIVDutXZblT A/EPJpQVyrs14DA271aFZMH7t45lV5ma9ymQGyvg9TqZOIFBee/4HuNl402zTlR/hLyp 3igSmwlUKFSGbPaAfhaBRbgLottor/Lj4dIFs= 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:in-reply-to:references; bh=mkpaYoqBp5p6RbLejNY9hU3I/TswQjwGhGHzN83KeGE=; b=bSEhnCeqVE1Ua2DT6EKM8GlXKE7qPtdiZ3YjbET9xtwcKOi0AQN4FRHWzQREAXBxqF PpTceiu3LqKrg30e/4l5HUnjQHn/XGBLJ4gnIvyKugYwh8L5eTX18QAHXVJP81WVF5Ec uO5BSQYMkErW2uv2x1YcNK7mVdjK8FJwmi84LMWMPhKHlvSquhoV2TCcGOwhsGUVVKBr M7S4IgOsC8185aDL7Yf6ht2PKHKtSfWk3GqukU/guxL5a5VyhooGottcYNGMT15ChHp8 Um8iI3+SAOBCGGls1+ZloEJUvv+sDGf55tEk0Z6xEbRNT2iufeerkVBVWgfMtQofD0ZF Z//Q== X-Gm-Message-State: AD7BkJLMSeL0+q/oQNd5+whREw12+GoTvn7YpNhbapJjDPofs6W0YQtzMrSZp6cTpIV97/KC X-Received: by 10.66.100.196 with SMTP id fa4mr47807457pab.37.1458586734706; Mon, 21 Mar 2016 11:58:54 -0700 (PDT) Received: from Arrow.corp.skyportsystems.com (67-207-112-138.static.wiline.com. [67.207.112.138]) by smtp.gmail.com with ESMTPSA id a22sm42472831pfj.2.2016.03.21.11.58.53 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 21 Mar 2016 11:58:54 -0700 (PDT) X-CudaMail-Envelope-Sender: ben@skyportsystems.com X-Barracuda-Apparent-Source-IP: 67.207.112.138 From: ben@skyportsystems.com To: dev@openvswitch.org X-CudaMail-MID: CM-E1-320058835 X-CudaMail-DTE: 032116 X-CudaMail-Originating-IP: 209.85.192.176 Date: Mon, 21 Mar 2016 11:58:25 -0700 X-ASG-Orig-Subj: [##CM-E1-320058835##][PATCH v3 17/21] Assorted #include additions Message-Id: <7fdd5716477380e1d2a8fe683dcd8424557f795e.1458586229.git.ben@skyportsystems.com> X-Mailer: git-send-email 2.5.4 (Apple Git-61) In-Reply-To: References: In-Reply-To: References: X-GBUdb-Analysis: 0, 209.85.192.176, Ugly c=0.484386 p=-0.381818 Source Normal X-MessageSniffer-Rules: 0-0-0-9308-c X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1458586735 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: 1.10 X-Barracuda-Spam-Status: No, SCORE=1.10 using per-user scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=4.0 tests=BSF_RULE7568M, BSF_SC5_MJ1963, DKIM_SIGNED, NO_REAL_NAME, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.28027 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 NO_REAL_NAME From: does not include a real name 0.00 DKIM_SIGNED Domain Keys Identified Mail: message has a signature 0.50 BSF_RULE7568M Custom Rule 7568M 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Cc: Ben Warren Subject: [ovs-dev] [PATCH v3 17/21] Assorted #include additions 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" From: Ben Warren Necessary in preparation for making ofp-util.h public Signed-off-by: Ben Warren --- ofproto/ofproto-dpif-ipfix.c | 1 + ovn/controller/ofctrl.c | 3 +++ ovn/controller/physical.c | 2 ++ ovn/controller/pinctrl.c | 1 + ovn/lib/actions.c | 1 + ovn/lib/expr.c | 1 + tests/test-ovn.c | 1 + tests/test-ovsdb.c | 1 + 8 files changed, 11 insertions(+) diff --git a/ofproto/ofproto-dpif-ipfix.c b/ofproto/ofproto-dpif-ipfix.c index 46d0bb1..6d088a6 100644 --- a/ofproto/ofproto-dpif-ipfix.c +++ b/ofproto/ofproto-dpif-ipfix.c @@ -22,6 +22,7 @@ #include "flow.h" #include "hash.h" #include "hmap.h" +#include "netdev.h" #include "openvswitch/list.h" #include "openvswitch/ofpbuf.h" #include "ofproto.h" diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c index b0f0932..98e778d 100644 --- a/ovn/controller/ofctrl.c +++ b/ovn/controller/ofctrl.c @@ -14,8 +14,10 @@ */ #include +#include "byte-order.h" #include "ofctrl.h" #include "dirs.h" +#include "hash.h" #include "openvswitch/dynamic-string.h" #include "hmap.h" #include "openvswitch/match.h" @@ -30,6 +32,7 @@ #include "physical.h" #include "rconn.h" #include "socket-util.h" +#include "util.h" #include "vswitch-idl.h" VLOG_DEFINE_THIS_MODULE(ofctrl); diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c index 4eb253f..61f9eb6 100644 --- a/ovn/controller/physical.c +++ b/ovn/controller/physical.c @@ -15,6 +15,8 @@ #include #include "physical.h" +#include "byte-order.h" +#include "flow.h" #include "lflow.h" #include "openvswitch/match.h" #include "ofctrl.h" diff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c index 3fcab99..bd8bb40 100644 --- a/ovn/controller/pinctrl.c +++ b/ovn/controller/pinctrl.c @@ -20,6 +20,7 @@ #include "coverage.h" #include "dirs.h" #include "dp-packet.h" +#include "flow.h" #include "lport.h" #include "ofp-actions.h" #include "ovn/lib/actions.h" diff --git a/ovn/lib/actions.c b/ovn/lib/actions.c index 44957c7..e65169f 100644 --- a/ovn/lib/actions.c +++ b/ovn/lib/actions.c @@ -18,6 +18,7 @@ #include "actions.h" #include #include +#include "byte-order.h" #include "compiler.h" #include "openvswitch/dynamic-string.h" #include "expr.h" diff --git a/ovn/lib/expr.c b/ovn/lib/expr.c index c4a600f..b3c7ce3 100644 --- a/ovn/lib/expr.c +++ b/ovn/lib/expr.c @@ -15,6 +15,7 @@ */ #include +#include "byte-order.h" #include "expr.h" #include "openvswitch/dynamic-string.h" #include "json.h" diff --git a/tests/test-ovn.c b/tests/test-ovn.c index 52e0ac3..fae105f 100644 --- a/tests/test-ovn.c +++ b/tests/test-ovn.c @@ -21,6 +21,7 @@ #include #include "openvswitch/dynamic-string.h" #include "fatal-signal.h" +#include "flow.h" #include "openvswitch/match.h" #include "ofp-actions.h" #include "openvswitch/ofpbuf.h" diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c index e6af729..dbb6897 100644 --- a/tests/test-ovsdb.c +++ b/tests/test-ovsdb.c @@ -23,6 +23,7 @@ #include #include +#include "byte-order.h" #include "command-line.h" #include "openvswitch/dynamic-string.h" #include "json.h"