From 6b617bac12401ffad57c47ec9815860b87fa4152 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 29 Oct 2008 15:15:45 -0700 Subject: [PATCH] Move exported headers to include/openflow, private headers to lib/. This makes it easier to install the headers, or to use them directly from another software package with -I$(openflow)/include, without invading the top-level include file namespace. --- Makefile.am | 1 + controller/controller.c | 2 +- datapath/datapath.c | 2 +- datapath/datapath.h | 2 +- datapath/dp_act.c | 2 +- datapath/flow.c | 2 +- datapath/flow.h | 2 +- datapath/forward.c | 2 +- datapath/nx_act.c | 2 +- datapath/nx_act_snat.h | 2 +- datapath/nx_msg.c | 2 +- include/automake.mk | 46 +------------------- include/openflow/automake.mk | 4 ++ include/{ => openflow}/nicira-ext.h | 8 ++-- include/{ => openflow}/openflow-netlink.h | 6 +-- include/{ => openflow}/openflow.h | 6 +-- lib/automake.mk | 52 ++++++++++++++++++++--- {include => lib}/command-line.h | 0 {include => lib}/compiler.h | 0 {include => lib}/csum.h | 0 {include => lib}/daemon.h | 0 {include => lib}/dhcp-client.h | 0 {include => lib}/dhcp.h | 0 {include => lib}/dirs.h | 0 lib/dpif.c | 4 +- {include => lib}/dpif.h | 0 {include => lib}/dynamic-string.h | 0 {include => lib}/fatal-signal.h | 0 {include => lib}/fault.h | 0 lib/flow.c | 2 +- {include => lib}/flow.h | 0 {include => lib}/hash.h | 0 lib/learning-switch.c | 2 +- {include => lib}/learning-switch.h | 0 {include => lib}/list.h | 0 lib/mac-learning.c | 2 +- {include => lib}/mac-learning.h | 0 lib/netdev.c | 2 +- {include => lib}/netdev.h | 0 {include => lib}/netlink-protocol.h | 0 {include => lib}/netlink.h | 0 lib/ofp-print.c | 4 +- {include => lib}/ofp-print.h | 0 {include => lib}/ofpbuf.h | 0 {include => lib}/packets.h | 0 {include => lib}/poll-loop.h | 0 {include => lib}/port-array.h | 2 +- {include => lib}/queue.h | 0 {include => lib}/random.h | 0 lib/rconn.c | 2 +- {include => lib}/rconn.h | 0 {include => lib}/sat-math.h | 0 {include => lib}/socket-util.h | 0 {include => lib}/stp.h | 0 {include => lib}/timeval.h | 0 {include => lib}/type-props.h | 0 {include => lib}/util.h | 0 lib/vconn-netlink.c | 4 +- {include => lib}/vconn-provider.h | 0 lib/vconn-ssl.c | 2 +- {include => lib}/vconn-ssl.h | 0 lib/vconn-stream.c | 2 +- {include => lib}/vconn-stream.h | 0 lib/vconn-tcp.c | 2 +- lib/vconn-unix.c | 2 +- lib/vconn.c | 2 +- {include => lib}/vconn.h | 0 {include => lib}/vlog-modules.def | 0 {include => lib}/vlog-socket.h | 0 {include => lib}/vlog.h | 0 {include => lib}/xtoxll.h | 0 secchan/discovery.c | 2 +- secchan/executer.c | 4 +- secchan/in-band.c | 2 +- secchan/port-watcher.c | 2 +- secchan/ratelimit.c | 2 +- secchan/secchan.c | 2 +- secchan/snat.c | 4 +- secchan/status.c | 4 +- secchan/stp-secchan.c | 2 +- switch/datapath.c | 2 +- switch/dp_act.c | 2 +- switch/dp_act.h | 2 +- switch/nx_act.c | 2 +- switch/switch-flow.c | 2 +- switch/switch-flow.h | 2 +- switch/switch.c | 2 +- switch/table-linear.c | 2 +- third-party/ofp-tcpdump.patch | 2 +- utilities/dpctl.c | 6 +-- 90 files changed, 114 insertions(+), 111 deletions(-) create mode 100644 include/openflow/automake.mk rename include/{ => openflow}/nicira-ext.h (97%) rename include/{ => openflow}/openflow-netlink.h (95%) rename include/{ => openflow}/openflow.h (99%) rename {include => lib}/command-line.h (100%) rename {include => lib}/compiler.h (100%) rename {include => lib}/csum.h (100%) rename {include => lib}/daemon.h (100%) rename {include => lib}/dhcp-client.h (100%) rename {include => lib}/dhcp.h (100%) rename {include => lib}/dirs.h (100%) rename {include => lib}/dpif.h (100%) rename {include => lib}/dynamic-string.h (100%) rename {include => lib}/fatal-signal.h (100%) rename {include => lib}/fault.h (100%) rename {include => lib}/flow.h (100%) rename {include => lib}/hash.h (100%) rename {include => lib}/learning-switch.h (100%) rename {include => lib}/list.h (100%) rename {include => lib}/mac-learning.h (100%) rename {include => lib}/netdev.h (100%) rename {include => lib}/netlink-protocol.h (100%) rename {include => lib}/netlink.h (100%) rename {include => lib}/ofp-print.h (100%) rename {include => lib}/ofpbuf.h (100%) rename {include => lib}/packets.h (100%) rename {include => lib}/poll-loop.h (100%) rename {include => lib}/port-array.h (99%) rename {include => lib}/queue.h (100%) rename {include => lib}/random.h (100%) rename {include => lib}/rconn.h (100%) rename {include => lib}/sat-math.h (100%) rename {include => lib}/socket-util.h (100%) rename {include => lib}/stp.h (100%) rename {include => lib}/timeval.h (100%) rename {include => lib}/type-props.h (100%) rename {include => lib}/util.h (100%) rename {include => lib}/vconn-provider.h (100%) rename {include => lib}/vconn-ssl.h (100%) rename {include => lib}/vconn-stream.h (100%) rename {include => lib}/vconn.h (100%) rename {include => lib}/vlog-modules.def (100%) rename {include => lib}/vlog-socket.h (100%) rename {include => lib}/vlog.h (100%) rename {include => lib}/xtoxll.h (100%) diff --git a/Makefile.am b/Makefile.am index 889445ac..479d9b52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,7 @@ endif AM_CPPFLAGS = $(SSL_CFLAGS) AM_CPPFLAGS += -I $(top_srcdir)/include +AM_CPPFLAGS += -I $(top_srcdir)/lib if HAVE_EXT AM_CPPFLAGS += -I $(top_srcdir)/ext/include endif diff --git a/controller/controller.c b/controller/controller.c index d6756504..ce05aa7b 100644 --- a/controller/controller.c +++ b/controller/controller.c @@ -46,7 +46,7 @@ #include "fault.h" #include "learning-switch.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "poll-loop.h" #include "rconn.h" #include "timeval.h" diff --git a/datapath/datapath.c b/datapath/datapath.c index 27152c86..3acf2431 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -32,7 +32,7 @@ #include #include -#include "openflow-netlink.h" +#include "openflow/openflow-netlink.h" #include "datapath.h" #include "nx_act_snat.h" #include "table.h" diff --git a/datapath/datapath.h b/datapath/datapath.h index 1747c247..89c9059d 100644 --- a/datapath/datapath.h +++ b/datapath/datapath.h @@ -9,7 +9,7 @@ #include #include #include -#include "openflow.h" +#include "openflow/openflow.h" #include "flow.h" diff --git a/datapath/dp_act.c b/datapath/dp_act.c index 02e1346d..daa319a2 100644 --- a/datapath/dp_act.c +++ b/datapath/dp_act.c @@ -16,7 +16,7 @@ #include #include "forward.h" #include "dp_act.h" -#include "nicira-ext.h" +#include "openflow/nicira-ext.h" #include "nx_act.h" diff --git a/datapath/flow.c b/datapath/flow.c index 9dcec90a..af9cdba7 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -20,7 +20,7 @@ #include #include -#include "openflow.h" +#include "openflow/openflow.h" #include "compat.h" #include "snap.h" diff --git a/datapath/flow.h b/datapath/flow.h index b425f35d..4db6204f 100644 --- a/datapath/flow.h +++ b/datapath/flow.h @@ -10,7 +10,7 @@ #include #include -#include "openflow.h" +#include "openflow/openflow.h" struct sk_buff; struct ofp_flow_mod; diff --git a/datapath/forward.c b/datapath/forward.c index dc7df714..b3c2f7af 100644 --- a/datapath/forward.c +++ b/datapath/forward.c @@ -12,7 +12,7 @@ #include #include "forward.h" #include "datapath.h" -#include "nicira-ext.h" +#include "openflow/nicira-ext.h" #include "dp_act.h" #include "nx_msg.h" #include "chain.h" diff --git a/datapath/nx_act.c b/datapath/nx_act.c index 07e03f30..d96c48f9 100644 --- a/datapath/nx_act.c +++ b/datapath/nx_act.c @@ -4,7 +4,7 @@ */ /* Functions for Nicira-extended actions. */ -#include "nicira-ext.h" +#include "openflow/nicira-ext.h" #include "dp_act.h" #include "nx_act.h" #include "nx_act_snat.h" diff --git a/datapath/nx_act_snat.h b/datapath/nx_act_snat.h index cb68d60a..76797d45 100644 --- a/datapath/nx_act_snat.h +++ b/datapath/nx_act_snat.h @@ -6,7 +6,7 @@ #include #include -#include "nicira-ext.h" +#include "openflow/nicira-ext.h" #include "datapath.h" /* Cache of IP->MAC mappings on the side hidden by the SNAT */ diff --git a/datapath/nx_msg.c b/datapath/nx_msg.c index b8d7f13f..d8d23bbe 100644 --- a/datapath/nx_msg.c +++ b/datapath/nx_msg.c @@ -5,7 +5,7 @@ #include "chain.h" #include "datapath.h" -#include "nicira-ext.h" +#include "openflow/nicira-ext.h" #include "nx_act_snat.h" #include "nx_msg.h" diff --git a/include/automake.mk b/include/automake.mk index 83f3b59e..581c1085 100644 --- a/include/automake.mk +++ b/include/automake.mk @@ -1,45 +1 @@ -noinst_HEADERS += \ - include/command-line.h \ - include/compiler.h \ - include/csum.h \ - include/daemon.h \ - include/dhcp-client.h \ - include/dhcp.h \ - include/dirs.h \ - include/dynamic-string.h \ - include/dpif.h \ - include/fatal-signal.h \ - include/fault.h \ - include/flow.h \ - include/hash.h \ - include/learning-switch.h \ - include/list.h \ - include/mac-learning.h \ - include/netdev.h \ - include/netlink-protocol.h \ - include/netlink.h \ - include/nicira-ext.h \ - include/ofpbuf.h \ - include/ofp-print.h \ - include/openflow.h \ - include/openflow-netlink.h \ - include/packets.h \ - include/poll-loop.h \ - include/port-array.h \ - include/queue.h \ - include/random.h \ - include/rconn.h \ - include/sat-math.h \ - include/socket-util.h \ - include/type-props.h \ - include/timeval.h \ - include/stp.h \ - include/util.h \ - include/vconn.h \ - include/vconn-provider.h \ - include/vconn-ssl.h \ - include/vconn-stream.h \ - include/vlog-socket.h \ - include/vlog-modules.def \ - include/vlog.h \ - include/xtoxll.h +include include/openflow/automake.mk diff --git a/include/openflow/automake.mk b/include/openflow/automake.mk new file mode 100644 index 00000000..5bf7585d --- /dev/null +++ b/include/openflow/automake.mk @@ -0,0 +1,4 @@ +noinst_HEADERS += \ + include/openflow/nicira-ext.h \ + include/openflow/openflow.h \ + include/openflow/openflow-netlink.h diff --git a/include/nicira-ext.h b/include/openflow/nicira-ext.h similarity index 97% rename from include/nicira-ext.h rename to include/openflow/nicira-ext.h index 893b90dc..821ad6f7 100644 --- a/include/nicira-ext.h +++ b/include/openflow/nicira-ext.h @@ -3,10 +3,10 @@ * Copyright (c) 2008 Nicira Networks */ -#ifndef NICIRA_EXT_H -#define NICIRA_EXT_H 1 +#ifndef OPENFLOW_NICIRA_EXT_H +#define OPENFLOW_NICIRA_EXT_H 1 -#include "openflow.h" +#include "openflow/openflow.h" /* The following vendor extensions, proposed by Nicira Networks, are not yet * ready for standardization (and may never be), so they are not included in @@ -136,4 +136,4 @@ struct nx_command_reply { }; OFP_ASSERT(sizeof(struct nx_command_reply) == 20); -#endif /* nicira-ext.h */ +#endif /* openflow/nicira-ext.h */ diff --git a/include/openflow-netlink.h b/include/openflow/openflow-netlink.h similarity index 95% rename from include/openflow-netlink.h rename to include/openflow/openflow-netlink.h index eb0f8581..895fad5c 100644 --- a/include/openflow-netlink.h +++ b/include/openflow/openflow-netlink.h @@ -31,8 +31,8 @@ * derivatives without specific, written prior permission. */ -#ifndef OPENFLOW_NETLINK_H -#define OPENFLOW_NETLINK_H 1 +#ifndef OPENFLOW_OPENFLOW_NETLINK_H +#define OPENFLOW_OPENFLOW_NETLINK_H 1 #define DP_GENL_FAMILY_NAME "OpenFlow" @@ -62,4 +62,4 @@ enum dp_genl_command { DP_GENL_C_MAX = __DP_GENL_C_MAX - 1 }; -#endif /* openflow-netlink.h */ +#endif /* openflow/openflow-netlink.h */ diff --git a/include/openflow.h b/include/openflow/openflow.h similarity index 99% rename from include/openflow.h rename to include/openflow/openflow.h index 3215b192..15c73ad5 100644 --- a/include/openflow.h +++ b/include/openflow/openflow.h @@ -33,8 +33,8 @@ /* OpenFlow: protocol between controller and datapath. */ -#ifndef OPENFLOW_H -#define OPENFLOW_H 1 +#ifndef OPENFLOW_OPENFLOW_H +#define OPENFLOW_OPENFLOW_H 1 #ifdef __KERNEL__ #include @@ -764,4 +764,4 @@ struct ofp_vendor_header { }; OFP_ASSERT(sizeof(struct ofp_vendor_header) == 12); -#endif /* openflow.h */ +#endif /* openflow/openflow.h */ diff --git a/lib/automake.mk b/lib/automake.mk index 38f58e5f..6b2af618 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -2,42 +2,84 @@ noinst_LIBRARIES += lib/libopenflow.a lib_libopenflow_a_SOURCES = \ lib/command-line.c \ + lib/command-line.h \ + lib/compiler.h \ lib/csum.c \ + lib/csum.h \ lib/daemon.c \ + lib/daemon.h \ lib/dhcp-client.c \ + lib/dhcp-client.h \ lib/dhcp.c \ + lib/dhcp.h \ + lib/dhparams.h \ + lib/dirs.c \ + lib/dirs.h \ lib/dynamic-string.c \ + lib/dynamic-string.h \ lib/fatal-signal.c \ + lib/fatal-signal.h \ lib/fault.c \ + lib/fault.h \ lib/flow.c \ + lib/flow.h \ lib/hash.c \ + lib/hash.h \ lib/learning-switch.c \ + lib/learning-switch.h \ lib/list.c \ + lib/list.h \ lib/mac-learning.c \ + lib/mac-learning.h \ lib/netdev.c \ - lib/ofpbuf.c \ + lib/netdev.h \ lib/ofp-print.c \ + lib/ofp-print.h \ + lib/ofpbuf.c \ + lib/ofpbuf.h \ + lib/packets.h \ lib/poll-loop.c \ + lib/poll-loop.h \ lib/port-array.c \ + lib/port-array.h \ lib/queue.c \ + lib/queue.h \ lib/random.c \ + lib/random.h \ lib/rconn.c \ + lib/rconn.h \ + lib/sat-math.h \ lib/socket-util.c \ - lib/timeval.c \ + lib/socket-util.h \ lib/stp.c \ + lib/stp.h \ + lib/timeval.c \ + lib/timeval.h \ + lib/type-props.h \ lib/util.c \ + lib/util.h \ + lib/vconn-provider.h \ + lib/vconn-ssl.h \ + lib/vconn-stream.c \ + lib/vconn-stream.h \ lib/vconn-tcp.c \ lib/vconn-unix.c \ - lib/vconn-stream.c \ lib/vconn.c \ + lib/vconn.h \ + lib/vlog-modules.def \ lib/vlog-socket.c \ - lib/dirs.c \ - lib/vlog.c + lib/vlog-socket.h \ + lib/vlog.c \ + lib/vlog.h \ + lib/xtoxll.h if HAVE_NETLINK lib_libopenflow_a_SOURCES += \ lib/dpif.c \ + lib/dpif.h \ + lib/netlink-protocol.h \ lib/netlink.c \ + lib/netlink.h \ lib/vconn-netlink.c endif diff --git a/include/command-line.h b/lib/command-line.h similarity index 100% rename from include/command-line.h rename to lib/command-line.h diff --git a/include/compiler.h b/lib/compiler.h similarity index 100% rename from include/compiler.h rename to lib/compiler.h diff --git a/include/csum.h b/lib/csum.h similarity index 100% rename from include/csum.h rename to lib/csum.h diff --git a/include/daemon.h b/lib/daemon.h similarity index 100% rename from include/daemon.h rename to lib/daemon.h diff --git a/include/dhcp-client.h b/lib/dhcp-client.h similarity index 100% rename from include/dhcp-client.h rename to lib/dhcp-client.h diff --git a/include/dhcp.h b/lib/dhcp.h similarity index 100% rename from include/dhcp.h rename to lib/dhcp.h diff --git a/include/dirs.h b/lib/dirs.h similarity index 100% rename from include/dirs.h rename to lib/dirs.h diff --git a/lib/dpif.c b/lib/dpif.c index da06f166..5739e18a 100644 --- a/lib/dpif.c +++ b/lib/dpif.c @@ -44,8 +44,8 @@ #include "netlink.h" #include "netlink-protocol.h" #include "ofpbuf.h" -#include "openflow-netlink.h" -#include "openflow.h" +#include "openflow/openflow-netlink.h" +#include "openflow/openflow.h" #include "packets.h" #include "util.h" #include "xtoxll.h" diff --git a/include/dpif.h b/lib/dpif.h similarity index 100% rename from include/dpif.h rename to lib/dpif.h diff --git a/include/dynamic-string.h b/lib/dynamic-string.h similarity index 100% rename from include/dynamic-string.h rename to lib/dynamic-string.h diff --git a/include/fatal-signal.h b/lib/fatal-signal.h similarity index 100% rename from include/fatal-signal.h rename to lib/fatal-signal.h diff --git a/include/fault.h b/lib/fault.h similarity index 100% rename from include/fault.h rename to lib/fault.h diff --git a/lib/flow.c b/lib/flow.c index ebe9050f..8a02d7f0 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -38,7 +38,7 @@ #include #include "hash.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "packets.h" #include "vlog.h" diff --git a/include/flow.h b/lib/flow.h similarity index 100% rename from include/flow.h rename to lib/flow.h diff --git a/include/hash.h b/lib/hash.h similarity index 100% rename from include/hash.h rename to lib/hash.h diff --git a/lib/learning-switch.c b/lib/learning-switch.c index 0227913b..44d655d8 100644 --- a/lib/learning-switch.c +++ b/lib/learning-switch.c @@ -44,7 +44,7 @@ #include "mac-learning.h" #include "ofpbuf.h" #include "ofp-print.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "poll-loop.h" #include "queue.h" #include "rconn.h" diff --git a/include/learning-switch.h b/lib/learning-switch.h similarity index 100% rename from include/learning-switch.h rename to lib/learning-switch.h diff --git a/include/list.h b/lib/list.h similarity index 100% rename from include/list.h rename to lib/list.h diff --git a/lib/mac-learning.c b/lib/mac-learning.c index 8b79dc6f..b924e496 100644 --- a/lib/mac-learning.c +++ b/lib/mac-learning.c @@ -40,7 +40,7 @@ #include "hash.h" #include "list.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "timeval.h" #include "util.h" diff --git a/include/mac-learning.h b/lib/mac-learning.h similarity index 100% rename from include/mac-learning.h rename to lib/mac-learning.h diff --git a/lib/netdev.c b/lib/netdev.c index 746a3e2c..08afc390 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -61,7 +61,7 @@ #include "fatal-signal.h" #include "list.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "packets.h" #include "poll-loop.h" #include "socket-util.h" diff --git a/include/netdev.h b/lib/netdev.h similarity index 100% rename from include/netdev.h rename to lib/netdev.h diff --git a/include/netlink-protocol.h b/lib/netlink-protocol.h similarity index 100% rename from include/netlink-protocol.h rename to lib/netlink-protocol.h diff --git a/include/netlink.h b/lib/netlink.h similarity index 100% rename from include/netlink.h rename to lib/netlink.h diff --git a/lib/ofp-print.c b/lib/ofp-print.c index 25988b22..96dd4c6a 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -47,8 +47,8 @@ #include "dynamic-string.h" #include "flow.h" #include "ofpbuf.h" -#include "openflow.h" -#include "nicira-ext.h" +#include "openflow/openflow.h" +#include "openflow/nicira-ext.h" #include "packets.h" #include "util.h" diff --git a/include/ofp-print.h b/lib/ofp-print.h similarity index 100% rename from include/ofp-print.h rename to lib/ofp-print.h diff --git a/include/ofpbuf.h b/lib/ofpbuf.h similarity index 100% rename from include/ofpbuf.h rename to lib/ofpbuf.h diff --git a/include/packets.h b/lib/packets.h similarity index 100% rename from include/packets.h rename to lib/packets.h diff --git a/include/poll-loop.h b/lib/poll-loop.h similarity index 100% rename from include/poll-loop.h rename to lib/poll-loop.h diff --git a/include/port-array.h b/lib/port-array.h similarity index 99% rename from include/port-array.h rename to lib/port-array.h index 8fa8f4c6..478a073c 100644 --- a/include/port-array.h +++ b/lib/port-array.h @@ -35,7 +35,7 @@ #define PORT_ARRAY_H 1 #include -#include "openflow.h" +#include "openflow/openflow.h" #include "util.h" static inline uint16_t diff --git a/include/queue.h b/lib/queue.h similarity index 100% rename from include/queue.h rename to lib/queue.h diff --git a/include/random.h b/lib/random.h similarity index 100% rename from include/random.h rename to lib/random.h diff --git a/lib/rconn.c b/lib/rconn.c index df0807cf..e610e61a 100644 --- a/lib/rconn.c +++ b/lib/rconn.c @@ -39,7 +39,7 @@ #include #include #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "poll-loop.h" #include "sat-math.h" #include "timeval.h" diff --git a/include/rconn.h b/lib/rconn.h similarity index 100% rename from include/rconn.h rename to lib/rconn.h diff --git a/include/sat-math.h b/lib/sat-math.h similarity index 100% rename from include/sat-math.h rename to lib/sat-math.h diff --git a/include/socket-util.h b/lib/socket-util.h similarity index 100% rename from include/socket-util.h rename to lib/socket-util.h diff --git a/include/stp.h b/lib/stp.h similarity index 100% rename from include/stp.h rename to lib/stp.h diff --git a/include/timeval.h b/lib/timeval.h similarity index 100% rename from include/timeval.h rename to lib/timeval.h diff --git a/include/type-props.h b/lib/type-props.h similarity index 100% rename from include/type-props.h rename to lib/type-props.h diff --git a/include/util.h b/lib/util.h similarity index 100% rename from include/util.h rename to lib/util.h diff --git a/lib/vconn-netlink.c b/lib/vconn-netlink.c index 0149a37a..a0fcc8d1 100644 --- a/lib/vconn-netlink.c +++ b/lib/vconn-netlink.c @@ -46,8 +46,8 @@ #include "dpif.h" #include "netlink.h" #include "ofpbuf.h" -#include "openflow-netlink.h" -#include "openflow.h" +#include "openflow/openflow-netlink.h" +#include "openflow/openflow.h" #include "poll-loop.h" #include "socket-util.h" #include "util.h" diff --git a/include/vconn-provider.h b/lib/vconn-provider.h similarity index 100% rename from include/vconn-provider.h rename to lib/vconn-provider.h diff --git a/lib/vconn-ssl.c b/lib/vconn-ssl.c index 4bc123b5..65e420f2 100644 --- a/lib/vconn-ssl.c +++ b/lib/vconn-ssl.c @@ -49,7 +49,7 @@ #include #include "dynamic-string.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "packets.h" #include "poll-loop.h" #include "socket-util.h" diff --git a/include/vconn-ssl.h b/lib/vconn-ssl.h similarity index 100% rename from include/vconn-ssl.h rename to lib/vconn-ssl.h diff --git a/lib/vconn-stream.c b/lib/vconn-stream.c index f5fe9476..d8c8b471 100644 --- a/lib/vconn-stream.c +++ b/lib/vconn-stream.c @@ -41,7 +41,7 @@ #include #include #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "poll-loop.h" #include "socket-util.h" #include "util.h" diff --git a/include/vconn-stream.h b/lib/vconn-stream.h similarity index 100% rename from include/vconn-stream.h rename to lib/vconn-stream.h diff --git a/lib/vconn-tcp.c b/lib/vconn-tcp.c index 2c8522d2..79d83322 100644 --- a/lib/vconn-tcp.c +++ b/lib/vconn-tcp.c @@ -44,7 +44,7 @@ #include "packets.h" #include "socket-util.h" #include "util.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "vconn-provider.h" #include "vconn-stream.h" diff --git a/lib/vconn-unix.c b/lib/vconn-unix.c index f296ad7f..b1a7d8a7 100644 --- a/lib/vconn-unix.c +++ b/lib/vconn-unix.c @@ -44,7 +44,7 @@ #include #include #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "packets.h" #include "poll-loop.h" #include "socket-util.h" diff --git a/lib/vconn.c b/lib/vconn.c index 96b85e88..b9696282 100644 --- a/lib/vconn.c +++ b/lib/vconn.c @@ -44,7 +44,7 @@ #include "flow.h" #include "ofp-print.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "poll-loop.h" #include "random.h" #include "util.h" diff --git a/include/vconn.h b/lib/vconn.h similarity index 100% rename from include/vconn.h rename to lib/vconn.h diff --git a/include/vlog-modules.def b/lib/vlog-modules.def similarity index 100% rename from include/vlog-modules.def rename to lib/vlog-modules.def diff --git a/include/vlog-socket.h b/lib/vlog-socket.h similarity index 100% rename from include/vlog-socket.h rename to lib/vlog-socket.h diff --git a/include/vlog.h b/lib/vlog.h similarity index 100% rename from include/vlog.h rename to lib/vlog.h diff --git a/include/xtoxll.h b/lib/xtoxll.h similarity index 100% rename from include/xtoxll.h rename to lib/xtoxll.h diff --git a/secchan/discovery.c b/secchan/discovery.c index 1ffaf647..9ed51028 100644 --- a/secchan/discovery.c +++ b/secchan/discovery.c @@ -39,7 +39,7 @@ #include "dhcp-client.h" #include "dhcp.h" #include "netdev.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "packets.h" #include "port-watcher.h" #include "secchan.h" diff --git a/secchan/executer.c b/secchan/executer.c index b52d7f86..7af1af3d 100644 --- a/secchan/executer.c +++ b/secchan/executer.c @@ -45,9 +45,9 @@ #include #include "dynamic-string.h" #include "fatal-signal.h" -#include "nicira-ext.h" +#include "openflow/nicira-ext.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "poll-loop.h" #include "rconn.h" #include "secchan.h" diff --git a/secchan/in-band.c b/secchan/in-band.c index e925fa56..f9773a79 100644 --- a/secchan/in-band.c +++ b/secchan/in-band.c @@ -41,7 +41,7 @@ #include "mac-learning.h" #include "netdev.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "packets.h" #include "port-watcher.h" #include "rconn.h" diff --git a/secchan/port-watcher.c b/secchan/port-watcher.c index 8ab8ded8..2109bdac 100644 --- a/secchan/port-watcher.c +++ b/secchan/port-watcher.c @@ -39,7 +39,7 @@ #include #include "dynamic-string.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "poll-loop.h" #include "port-array.h" #include "rconn.h" diff --git a/secchan/ratelimit.c b/secchan/ratelimit.c index 5f0da2df..3736703e 100644 --- a/secchan/ratelimit.c +++ b/secchan/ratelimit.c @@ -36,7 +36,7 @@ #include #include #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "poll-loop.h" #include "queue.h" #include "rconn.h" diff --git a/secchan/secchan.c b/secchan/secchan.c index 0f55cde9..f1ac6d21 100644 --- a/secchan/secchan.c +++ b/secchan/secchan.c @@ -52,7 +52,7 @@ #include "in-band.h" #include "list.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "packets.h" #include "port-watcher.h" #include "poll-loop.h" diff --git a/secchan/snat.c b/secchan/snat.c index 9d7306c4..17aa243d 100644 --- a/secchan/snat.c +++ b/secchan/snat.c @@ -36,9 +36,9 @@ #include #include #include -#include "nicira-ext.h" +#include "openflow/nicira-ext.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "port-watcher.h" #define THIS_MODULE VLM_snat diff --git a/secchan/status.c b/secchan/status.c index be4f86bf..c1e54943 100644 --- a/secchan/status.c +++ b/secchan/status.c @@ -38,9 +38,9 @@ #include #include #include "dynamic-string.h" -#include "nicira-ext.h" +#include "openflow/nicira-ext.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "rconn.h" #include "timeval.h" #include "vconn.h" diff --git a/secchan/stp-secchan.c b/secchan/stp-secchan.c index 306f05fb..379bca26 100644 --- a/secchan/stp-secchan.c +++ b/secchan/stp-secchan.c @@ -38,7 +38,7 @@ #include "flow.h" #include "secchan.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "poll-loop.h" #include "port-watcher.h" #include "rconn.h" diff --git a/switch/datapath.c b/switch/datapath.c index 8fdc9d3a..e05365cc 100644 --- a/switch/datapath.c +++ b/switch/datapath.c @@ -44,7 +44,7 @@ #include "list.h" #include "netdev.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "packets.h" #include "poll-loop.h" #include "rconn.h" diff --git a/switch/dp_act.c b/switch/dp_act.c index f1774f33..3322d9fe 100644 --- a/switch/dp_act.c +++ b/switch/dp_act.c @@ -37,7 +37,7 @@ #include "csum.h" #include "packets.h" #include "dp_act.h" -#include "nicira-ext.h" +#include "openflow/nicira-ext.h" #include "nx_act.h" diff --git a/switch/dp_act.h b/switch/dp_act.h index f5569731..e0181fad 100644 --- a/switch/dp_act.h +++ b/switch/dp_act.h @@ -34,7 +34,7 @@ #ifndef DP_ACT_H #define DP_ACT_H 1 -#include "openflow.h" +#include "openflow/openflow.h" #include "switch-flow.h" #include "datapath.h" diff --git a/switch/nx_act.c b/switch/nx_act.c index 37d54641..e2a6d4f6 100644 --- a/switch/nx_act.c +++ b/switch/nx_act.c @@ -32,7 +32,7 @@ */ /* Functions for Nicira-extended actions. */ -#include "nicira-ext.h" +#include "openflow/nicira-ext.h" #include "nx_act.h" uint16_t diff --git a/switch/switch-flow.c b/switch/switch-flow.c index 50a0dee7..8e3b7f7a 100644 --- a/switch/switch-flow.c +++ b/switch/switch-flow.c @@ -38,7 +38,7 @@ #include #include #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "packets.h" #include "timeval.h" diff --git a/switch/switch-flow.h b/switch/switch-flow.h index 11ef27a9..38cfa6e0 100644 --- a/switch/switch-flow.h +++ b/switch/switch-flow.h @@ -35,7 +35,7 @@ #define SWITCH_FLOW_H 1 #include -#include "openflow.h" +#include "openflow/openflow.h" #include "flow.h" #include "list.h" diff --git a/switch/switch.c b/switch/switch.c index 84ed8de4..03f7dc0a 100644 --- a/switch/switch.c +++ b/switch/switch.c @@ -44,7 +44,7 @@ #include "daemon.h" #include "datapath.h" #include "fault.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "poll-loop.h" #include "queue.h" #include "util.h" diff --git a/switch/table-linear.c b/switch/table-linear.c index d3d3c522..32a0bc2f 100644 --- a/switch/table-linear.c +++ b/switch/table-linear.c @@ -36,7 +36,7 @@ #include #include "flow.h" #include "list.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "switch-flow.h" #include "datapath.h" diff --git a/third-party/ofp-tcpdump.patch b/third-party/ofp-tcpdump.patch index c1af3128..3f2cc57b 100644 --- a/third-party/ofp-tcpdump.patch +++ b/third-party/ofp-tcpdump.patch @@ -78,7 +78,7 @@ diff -rNu tcpdump/print-openflow.c tcpdump/print-openflow.c +#include + +#include "interface.h" -+#include "../../include/openflow.h" ++#include "../../include/openflow/openflow.h" +#include "../../include/ofp-print.h" + +void diff --git a/utilities/dpctl.c b/utilities/dpctl.c index 4592a9a6..0065cf71 100644 --- a/utilities/dpctl.c +++ b/utilities/dpctl.c @@ -47,16 +47,16 @@ #ifdef HAVE_NETLINK #include "netdev.h" #include "netlink.h" -#include "openflow-netlink.h" +#include "openflow/openflow-netlink.h" #endif #include "command-line.h" #include "compiler.h" #include "dpif.h" -#include "nicira-ext.h" +#include "openflow/nicira-ext.h" #include "ofp-print.h" #include "ofpbuf.h" -#include "openflow.h" +#include "openflow/openflow.h" #include "packets.h" #include "random.h" #include "socket-util.h" -- 2.30.2