From patchwork Fri Mar 25 21:10:45 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: 602105 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 3qWwyR3zYQz9sBf for ; Sat, 26 Mar 2016 08:13:35 +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=0EBrtBcz; dkim-atps=neutral Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 47A4510A89; Fri, 25 Mar 2016 14:11:17 -0700 (PDT) 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 F0834109C1 for ; Fri, 25 Mar 2016 14:11:12 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 85596162208 for ; Fri, 25 Mar 2016 15:11:12 -0600 (MDT) X-ASG-Debug-ID: 1458940271-0b323711be3fcd50001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar6.cudamail.com with ESMTP id hyNTAKXYk3EV5U8C (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 25 Mar 2016 15:11:11 -0600 (MDT) X-Barracuda-Envelope-From: ben@skyportsystems.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO mail-pa0-f53.google.com) (209.85.220.53) by mx3-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 25 Mar 2016 21:11:10 -0000 Received-SPF: pass (mx3-pf2.cudamail.com: SPF record at _netblocks.google.com designates 209.85.220.53 as permitted sender) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.53 Received: by mail-pa0-f53.google.com with SMTP id tt10so53474895pab.3 for ; Fri, 25 Mar 2016 14:11:10 -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=KfczdwtLFHN/GVsiRESyYJxMqJaJ3dcYFR9n58ZlPiA=; b=0EBrtBcznwaYJQ40rFADHefCQKU6meSNs23Z4OU+ZdUVBVdSuuY4pS7tLBCXw8DF25 EoK5qbJvHSk0sa0hAgjzl8GcFih/4d4ahbMU5PWbCdV1arTm/0JsRTOuDYpEVd2hBamr jNyoCkOX2Ejt2+H+WIr+anKMe9+V39zPBO22s= 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=KfczdwtLFHN/GVsiRESyYJxMqJaJ3dcYFR9n58ZlPiA=; b=T1eHsDN+56P3P9qd9wS7recCh53+AqX8nqV2aeFyJTe+YrGeg31MVIaavKb3sX5UWf ce+XzibAk+VgKbJD3MoOsM/vCND6bL/qWAJt5CsFzx+MZSEZqWqTlH2/N5/ku7bU2hE6 B1Nn55gtXHaNHUxvMBplYOwdz6B89cFUlGZKLdcPcJLy96SbXp+RtglcIjz2s5svQLT+ LxglUkrDI9lZq73HrISaDyGcrFj3AQ8rLsgTY49pczRuSZ8AY9L8/m9Rq/0DnR+Dq9pP KALNjZAi0gWtoQbgtYz5+NzNrugsP7lywsvEKEWU0kSrrWI/Tzimpex6+YXm/XPIou7A eUeQ== X-Gm-Message-State: AD7BkJJyTGiFadfkyBjlbE6Q9f0SCB7dSWvZqpsDdZouDS7TIhz7kRTTLopgHkgKUqtpOG0U X-Received: by 10.67.21.231 with SMTP id hn7mr23989323pad.150.1458940270718; Fri, 25 Mar 2016 14:11:10 -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 g74sm18391627pfj.1.2016.03.25.14.11.10 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 Mar 2016 14:11:10 -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-V2-324036449 X-CudaMail-DTE: 032516 X-CudaMail-Originating-IP: 209.85.220.53 Date: Fri, 25 Mar 2016 14:10:45 -0700 X-ASG-Orig-Subj: [##CM-V2-324036449##][PATCH_v5 26/26] Move lib/ofp-print.h to include/openvswitch directory Message-Id: <153b702f985677190f4186fd8ed79765b1d6c746.1458939733.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.220.53, Ugly c=0.387593 p=-0.302326 Source Normal X-MessageSniffer-Rules: 0-0-0-32767-c X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1458940271 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.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=4.0 tests=BSF_SC5_MJ1963, DKIM_SIGNED, NO_REAL_NAME, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.28166 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.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_v5 26/26] Move lib/ofp-print.h to include/openvswitch directory 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 Signed-off-by: Ben Warren --- include/openvswitch/automake.mk | 1 + include/openvswitch/ofp-print.h | 58 +++++++++++++++++++++++++++++++++++++++++ lib/automake.mk | 1 - lib/dpif-netdev.c | 11 ++++---- lib/dpif.c | 2 +- lib/learning-switch.c | 2 +- lib/netdev-dpdk.c | 6 ++--- lib/netdev-dummy.c | 8 +++--- lib/ofp-print.c | 6 ++--- lib/ofp-print.h | 58 ----------------------------------------- lib/ofp-util.c | 4 +-- lib/stream.c | 8 +++--- lib/vconn.c | 2 +- ofproto/ofproto-dpif.c | 2 +- ofproto/ofproto.c | 2 +- ovn/controller/ofctrl.c | 2 +- ovn/controller/pinctrl.c | 2 +- tests/test-flows.c | 8 +++--- third-party/ofp-tcpdump.patch | 2 +- utilities/ovs-ofctl.c | 2 +- vswitchd/bridge.c | 22 ++++++++-------- 21 files changed, 104 insertions(+), 105 deletions(-) create mode 100644 include/openvswitch/ofp-print.h delete mode 100644 lib/ofp-print.h diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk index b366d03..3d0362d 100644 --- a/include/openvswitch/automake.mk +++ b/include/openvswitch/automake.mk @@ -13,6 +13,7 @@ openvswitchinclude_HEADERS = \ include/openvswitch/ofp-errors.h \ include/openvswitch/ofp-msgs.h \ include/openvswitch/ofp-parse.h \ + include/openvswitch/ofp-print.h \ include/openvswitch/ofp-prop.h \ include/openvswitch/ofp-util.h \ include/openvswitch/packets.h \ diff --git a/include/openvswitch/ofp-print.h b/include/openvswitch/ofp-print.h new file mode 100644 index 0000000..bbac18b --- /dev/null +++ b/include/openvswitch/ofp-print.h @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2008, 2009, 2011, 2012, 2015 Nicira, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* OpenFlow protocol pretty-printer. */ + +#ifndef OFP_PRINT_H +#define OFP_PRINT_H 1 + +#include +#include + +struct ds; +struct ofp10_match; +struct ofp_flow_mod; +struct ofp_header; +struct ofputil_flow_stats; +struct ofputil_table_features; +struct ofputil_table_stats; + +#ifdef __cplusplus +extern "C" { +#endif + +void ofp_print(FILE *, const void *, size_t, int verbosity); +void ofp_print_packet(FILE *stream, const void *data, size_t len); + +void ofp10_match_print(struct ds *, const struct ofp10_match *, int verbosity); + +char *ofp_to_string(const void *, size_t, int verbosity); +char *ofp10_match_to_string(const struct ofp10_match *, int verbosity); +char *ofp_packet_to_string(const void *data, size_t len); + +void ofp_print_flow_stats(struct ds *, struct ofputil_flow_stats *); +void ofp_print_version(const struct ofp_header *, struct ds *); +void ofp_print_table_features( + struct ds *, const struct ofputil_table_features *features, + const struct ofputil_table_features *prev_features, + const struct ofputil_table_stats *stats, + const struct ofputil_table_stats *prev_stats); + +#ifdef __cplusplus +} +#endif + +#endif /* ofp-print.h */ diff --git a/lib/automake.mk b/lib/automake.mk index bb6d489..1ec2115 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -142,7 +142,6 @@ lib_libopenvswitch_la_SOURCES = \ lib/ofp-msgs.c \ lib/ofp-parse.c \ lib/ofp-print.c \ - lib/ofp-print.h \ lib/ofp-prop.c \ lib/ofp-util.c \ lib/ofp-version-opt.h \ diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index a3c9b08..51ebd79 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -39,21 +39,22 @@ #include "dpif.h" #include "dpif-provider.h" #include "dummy.h" -#include "openvswitch/dynamic-string.h" #include "fat-rwlock.h" #include "flow.h" #include "hmapx.h" #include "latch.h" -#include "openvswitch/list.h" -#include "openvswitch/match.h" #include "netdev.h" #include "netdev-dpdk.h" #include "netdev-vport.h" #include "netlink.h" #include "odp-execute.h" #include "odp-util.h" -#include "ofp-print.h" +#include "openvswitch/dynamic-string.h" +#include "openvswitch/list.h" +#include "openvswitch/match.h" +#include "openvswitch/ofp-print.h" #include "openvswitch/ofpbuf.h" +#include "openvswitch/vlog.h" #include "ovs-numa.h" #include "ovs-rcu.h" #include "packets.h" @@ -69,8 +70,6 @@ #include "unixctl.h" #include "util.h" -#include "openvswitch/vlog.h" - VLOG_DEFINE_THIS_MODULE(dpif_netdev); #define FLOW_DUMP_MAX_BATCH 50 diff --git a/lib/dpif.c b/lib/dpif.c index 1cf894c..2c64d9e 100644 --- a/lib/dpif.c +++ b/lib/dpif.c @@ -33,7 +33,7 @@ #include "netlink.h" #include "odp-execute.h" #include "odp-util.h" -#include "ofp-print.h" +#include "openvswitch/ofp-print.h" #include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "packets.h" diff --git a/lib/learning-switch.c b/lib/learning-switch.c index afc1f76..c69ca4c 100644 --- a/lib/learning-switch.c +++ b/lib/learning-switch.c @@ -29,11 +29,11 @@ #include "flow.h" #include "hmap.h" #include "mac-learning.h" -#include "ofp-print.h" #include "openflow/openflow.h" #include "openvswitch/ofp-actions.h" #include "openvswitch/ofp-errors.h" #include "openvswitch/ofp-msgs.h" +#include "openvswitch/ofp-print.h" #include "openvswitch/ofp-util.h" #include "openvswitch/ofp-parse.h" #include "openvswitch/ofpbuf.h" diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index f8342ea..02be8bc 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -34,12 +34,13 @@ #include "dp-packet.h" #include "dpif-netdev.h" #include "fatal-signal.h" -#include "openvswitch/list.h" #include "netdev-dpdk.h" #include "netdev-provider.h" #include "netdev-vport.h" #include "odp-util.h" -#include "ofp-print.h" +#include "openvswitch/list.h" +#include "openvswitch/ofp-print.h" +#include "openvswitch/vlog.h" #include "ovs-numa.h" #include "ovs-thread.h" #include "ovs-rcu.h" @@ -50,7 +51,6 @@ #include "unaligned.h" #include "timeval.h" #include "unixctl.h" -#include "openvswitch/vlog.h" #include "rte_config.h" #include "rte_mbuf.h" diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index edc86fa..1794363 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -22,14 +22,15 @@ #include "dp-packet.h" #include "dpif-netdev.h" -#include "openvswitch/dynamic-string.h" #include "flow.h" -#include "openvswitch/list.h" #include "netdev-provider.h" #include "netdev-vport.h" #include "odp-util.h" -#include "ofp-print.h" +#include "openvswitch/dynamic-string.h" +#include "openvswitch/list.h" +#include "openvswitch/ofp-print.h" #include "openvswitch/ofpbuf.h" +#include "openvswitch/vlog.h" #include "ovs-atomic.h" #include "packets.h" #include "pcap-file.h" @@ -41,7 +42,6 @@ #include "timeval.h" #include "unixctl.h" #include "reconnect.h" -#include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(netdev_dummy); diff --git a/lib/ofp-print.c b/lib/ofp-print.c index eb98ee5..24464a1 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -15,7 +15,6 @@ */ #include -#include "ofp-print.h" #include #include @@ -30,11 +29,13 @@ #include "byte-order.h" #include "colors.h" #include "compiler.h" +#include "dp-packet.h" #include "flow.h" #include "learn.h" #include "multipath.h" #include "netdev.h" #include "nx-match.h" +#include "odp-util.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" #include "openvswitch/dynamic-string.h" @@ -42,13 +43,12 @@ #include "openvswitch/ofp-actions.h" #include "openvswitch/ofp-errors.h" #include "openvswitch/ofp-msgs.h" +#include "openvswitch/ofp-print.h" #include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openvswitch/type-props.h" #include "packets.h" -#include "dp-packet.h" #include "unaligned.h" -#include "odp-util.h" #include "util.h" #include "uuid.h" diff --git a/lib/ofp-print.h b/lib/ofp-print.h deleted file mode 100644 index bbac18b..0000000 --- a/lib/ofp-print.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2008, 2009, 2011, 2012, 2015 Nicira, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* OpenFlow protocol pretty-printer. */ - -#ifndef OFP_PRINT_H -#define OFP_PRINT_H 1 - -#include -#include - -struct ds; -struct ofp10_match; -struct ofp_flow_mod; -struct ofp_header; -struct ofputil_flow_stats; -struct ofputil_table_features; -struct ofputil_table_stats; - -#ifdef __cplusplus -extern "C" { -#endif - -void ofp_print(FILE *, const void *, size_t, int verbosity); -void ofp_print_packet(FILE *stream, const void *data, size_t len); - -void ofp10_match_print(struct ds *, const struct ofp10_match *, int verbosity); - -char *ofp_to_string(const void *, size_t, int verbosity); -char *ofp10_match_to_string(const struct ofp10_match *, int verbosity); -char *ofp_packet_to_string(const void *data, size_t len); - -void ofp_print_flow_stats(struct ds *, struct ofputil_flow_stats *); -void ofp_print_version(const struct ofp_header *, struct ds *); -void ofp_print_table_features( - struct ds *, const struct ofputil_table_features *features, - const struct ofputil_table_features *prev_features, - const struct ofputil_table_stats *stats, - const struct ofputil_table_stats *prev_stats); - -#ifdef __cplusplus -} -#endif - -#endif /* ofp-print.h */ diff --git a/lib/ofp-util.c b/lib/ofp-util.c index 83c0823..b200b93 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -15,7 +15,6 @@ */ #include -#include "ofp-print.h" #include #include #include @@ -23,6 +22,7 @@ #include #include #include +#include "bitmap.h" #include "bundle.h" #include "byte-order.h" #include "classifier.h" @@ -37,6 +37,7 @@ #include "openvswitch/ofp-actions.h" #include "openvswitch/ofp-errors.h" #include "openvswitch/ofp-msgs.h" +#include "openvswitch/ofp-print.h" #include "openvswitch/ofp-prop.h" #include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" @@ -47,7 +48,6 @@ #include "random.h" #include "tun-metadata.h" #include "unaligned.h" -#include "bitmap.h" #include "uuid.h" VLOG_DEFINE_THIS_MODULE(ofp_util); diff --git a/lib/stream.c b/lib/stream.c index 3fc69c1..f6ea849 100644 --- a/lib/stream.c +++ b/lib/stream.c @@ -23,21 +23,21 @@ #include #include #include "coverage.h" -#include "openvswitch/dynamic-string.h" #include "fatal-signal.h" #include "flow.h" #include "jsonrpc.h" -#include "ofp-print.h" -#include "openvswitch/ofpbuf.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" +#include "openvswitch/dynamic-string.h" +#include "openvswitch/ofp-print.h" +#include "openvswitch/ofpbuf.h" +#include "openvswitch/vlog.h" #include "ovs-thread.h" #include "packets.h" #include "poll-loop.h" #include "random.h" #include "socket-util.h" #include "util.h" -#include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(stream); diff --git a/lib/vconn.c b/lib/vconn.c index 97d71da..50b4047 100644 --- a/lib/vconn.c +++ b/lib/vconn.c @@ -25,12 +25,12 @@ #include "coverage.h" #include "fatal-signal.h" #include "flow.h" -#include "ofp-print.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" #include "openvswitch/dynamic-string.h" #include "openvswitch/ofp-errors.h" #include "openvswitch/ofp-msgs.h" +#include "openvswitch/ofp-print.h" #include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openvswitch/vlog.h" diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index d6456c9..734a301 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -40,7 +40,6 @@ #include "nx-match.h" #include "odp-util.h" #include "odp-execute.h" -#include "ofp-print.h" #include "ofproto/ofproto-dpif.h" #include "ofproto/ofproto-provider.h" #include "ofproto-dpif-ipfix.h" @@ -54,6 +53,7 @@ #include "openvswitch/dynamic-string.h" #include "openvswitch/meta-flow.h" #include "openvswitch/ofp-parse.h" +#include "openvswitch/ofp-print.h" #include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openvswitch/vlog.h" diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index fa766f6..ff6affd 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -34,7 +34,6 @@ #include "hmap.h" #include "netdev.h" #include "nx-match.h" -#include "ofp-print.h" #include "ofproto.h" #include "ofproto-provider.h" #include "openflow/nicira-ext.h" @@ -44,6 +43,7 @@ #include "openvswitch/ofp-actions.h" #include "openvswitch/ofp-errors.h" #include "openvswitch/ofp-msgs.h" +#include "openvswitch/ofp-print.h" #include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openvswitch/vlog.h" diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c index edd6f2a..b9e2153 100644 --- a/ovn/controller/ofctrl.c +++ b/ovn/controller/ofctrl.c @@ -19,12 +19,12 @@ #include "hash.h" #include "hmap.h" #include "ofctrl.h" -#include "ofp-print.h" #include "openflow/openflow.h" #include "openvswitch/dynamic-string.h" #include "openvswitch/match.h" #include "openvswitch/ofp-actions.h" #include "openvswitch/ofp-msgs.h" +#include "openvswitch/ofp-print.h" #include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openvswitch/vlog.h" diff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c index 9e9cd89..cbac50e 100644 --- a/ovn/controller/pinctrl.c +++ b/ovn/controller/pinctrl.c @@ -22,9 +22,9 @@ #include "dp-packet.h" #include "flow.h" #include "lport.h" -#include "ofp-print.h" #include "openvswitch/ofp-actions.h" #include "openvswitch/ofp-msgs.h" +#include "openvswitch/ofp-print.h" #include "openvswitch/ofp-util.h" #include "openvswitch/vlog.h" #include "ovn-controller.h" diff --git a/tests/test-flows.c b/tests/test-flows.c index 040953b..4a1b65e 100644 --- a/tests/test-flows.c +++ b/tests/test-flows.c @@ -22,16 +22,16 @@ #include #include #include "classifier.h" -#include "openvswitch/ofpbuf.h" -#include "ofp-print.h" -#include "openvswitch/ofp-util.h" #include "openflow/openflow.h" +#include "openvswitch/ofp-print.h" +#include "openvswitch/ofp-util.h" +#include "openvswitch/ofpbuf.h" +#include "openvswitch/vlog.h" #include "ovstest.h" #include "dp-packet.h" #include "pcap-file.h" #include "timeval.h" #include "util.h" -#include "openvswitch/vlog.h" static void test_flows_main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) diff --git a/third-party/ofp-tcpdump.patch b/third-party/ofp-tcpdump.patch index 72d33b8..56b3571 100644 --- a/third-party/ofp-tcpdump.patch +++ b/third-party/ofp-tcpdump.patch @@ -93,7 +93,7 @@ + +#include "interface.h" +#include "openflow/openflow.h" -+#include "../../lib/ofp-print.h" ++#include "openvswitch/ofp-print.h" + +void +openflow_print(const u_char *sp, u_int length) diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 6edb30c..a8116d9 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -40,7 +40,6 @@ #include "fatal-signal.h" #include "nx-match.h" #include "odp-util.h" -#include "ofp-print.h" #include "ofp-version-opt.h" #include "ofproto/ofproto.h" #include "openflow/nicira-ext.h" @@ -50,6 +49,7 @@ #include "openvswitch/ofp-actions.h" #include "openvswitch/ofp-errors.h" #include "openvswitch/ofp-msgs.h" +#include "openvswitch/ofp-print.h" #include "openvswitch/ofp-util.h" #include "openvswitch/ofp-parse.h" #include "openvswitch/ofpbuf.h" diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 2c224f5..700f65c 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -28,28 +28,31 @@ #include "daemon.h" #include "dirs.h" #include "dpif.h" -#include "openvswitch/dynamic-string.h" #include "hash.h" #include "hmap.h" #include "hmapx.h" +#include "if-notifier.h" #include "jsonrpc.h" #include "lacp.h" -#include "openvswitch/list.h" -#include "ovs-lldp.h" #include "mac-learning.h" #include "mcast-snooping.h" -#include "openvswitch/meta-flow.h" #include "netdev.h" #include "nx-match.h" -#include "ofp-print.h" -#include "openvswitch/ofp-util.h" -#include "openvswitch/ofpbuf.h" #include "ofproto/bond.h" #include "ofproto/ofproto.h" +#include "openvswitch/dynamic-string.h" +#include "openvswitch/list.h" +#include "openvswitch/meta-flow.h" +#include "openvswitch/ofp-print.h" +#include "openvswitch/ofp-util.h" +#include "openvswitch/ofpbuf.h" +#include "openvswitch/vlog.h" +#include "ovs-lldp.h" #include "ovs-numa.h" +#include "packets.h" #include "poll-loop.h" -#include "if-notifier.h" #include "seq.h" +#include "sflow_api.h" #include "sha1.h" #include "shash.h" #include "smap.h" @@ -64,10 +67,7 @@ #include "vlandev.h" #include "lib/vswitch-idl.h" #include "xenserver.h" -#include "openvswitch/vlog.h" -#include "sflow_api.h" #include "vlan-bitmap.h" -#include "packets.h" VLOG_DEFINE_THIS_MODULE(bridge);