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.

diff --git a/Makefile.am b/Makefile.am
index 889445a..479d9b5 100644 (file)
--- 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 d675650..ce05aa7 100644 (file)
--- 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 27152c8..3acf243 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -32,7 +32,7 @@
 #include <linux/rculist.h>
 #include <linux/workqueue.h>
 
-#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 1747c24..89c9059 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -9,7 +9,7 @@
 #include <linux/netdevice.h>
 #include <linux/workqueue.h>
 #include <linux/skbuff.h>
-#include "openflow.h"
+#include "openflow/openflow.h"
 #include "flow.h"
 
 

diff --git a/datapath/dp_act.c b/datapath/dp_act.c
index 02e1346..daa319a 100644 (file)
--- a/datapath/dp_act.c
+++ b/datapath/dp_act.c
@@ -16,7 +16,7 @@
 #include <net/checksum.h>
 #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 9dcec90..af9cdba 100644 (file)
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -20,7 +20,7 @@
 #include <linux/rcupdate.h>
 #include <net/ip.h>
 
-#include "openflow.h"
+#include "openflow/openflow.h"
 #include "compat.h"
 #include "snap.h"
 

diff --git a/datapath/flow.h b/datapath/flow.h
index b425f35..4db6204 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -10,7 +10,7 @@
 #include <linux/skbuff.h>
 #include <linux/if_ether.h>
 
-#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 dc7df71..b3c2f7a 100644 (file)
--- a/datapath/forward.c
+++ b/datapath/forward.c
@@ -12,7 +12,7 @@
 #include <linux/types.h>
 #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 07e03f3..d96c48f 100644 (file)
--- 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 cb68d60..76797d4 100644 (file)
--- a/datapath/nx_act_snat.h
+++ b/datapath/nx_act_snat.h
@@ -6,7 +6,7 @@
 #include <linux/skbuff.h>
 #include <linux/rcupdate.h>
 
-#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 b8d7f13..d8d23bb 100644 (file)
--- 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 83f3b59..581c108 100644 (file)
--- 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 (file)
index 0000000..5bf7585
--- /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 893b90d..821ad6f 100644 (file)
--- 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 eb0f858..895fad5 100644 (file)
--- 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 3215b19..15c73ad 100644 (file)
--- 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 <linux/types.h>
@@ -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 38f58e5..6b2af61 100644 (file)
--- 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 da06f16..5739e18 100644 (file)
--- 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 ebe9050..8a02d7f 100644 (file)
--- a/lib/flow.c
+++ b/lib/flow.c
@@ -38,7 +38,7 @@
 #include <string.h>
 #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 0227913..44d655d 100644 (file)
--- 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 8b79dc6..b924e49 100644 (file)
--- 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 746a3e2..08afc39 100644 (file)
--- 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 25988b2..96dd4c6 100644 (file)
--- 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 8fa8f4c..478a073 100644 (file)
--- a/include/port-array.h
+++ b/lib/port-array.h
@@ -35,7 +35,7 @@
 #define PORT_ARRAY_H 1
 
 #include <assert.h>
-#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 df0807c..e610e61 100644 (file)
--- a/lib/rconn.c
+++ b/lib/rconn.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <string.h>
 #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 0149a37..a0fcc8d 100644 (file)
--- 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 4bc123b..65e420f 100644 (file)
--- a/lib/vconn-ssl.c
+++ b/lib/vconn-ssl.c
@@ -49,7 +49,7 @@
 #include <unistd.h>
 #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 f5fe947..d8c8b47 100644 (file)
--- a/lib/vconn-stream.c
+++ b/lib/vconn-stream.c
@@ -41,7 +41,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #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 2c8522d..79d8332 100644 (file)
--- 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 f296ad7..b1a7d8a 100644 (file)
--- a/lib/vconn-unix.c
+++ b/lib/vconn-unix.c
@@ -44,7 +44,7 @@
 #include <string.h>
 #include <unistd.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/lib/vconn.c b/lib/vconn.c
index 96b85e8..b969628 100644 (file)
--- 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 1ffaf64..9ed5102 100644 (file)
--- 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 b52d7f8..7af1af3 100644 (file)
--- a/secchan/executer.c
+++ b/secchan/executer.c
@@ -45,9 +45,9 @@
 #include <unistd.h>
 #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 e925fa5..f9773a7 100644 (file)
--- 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 8ab8ded..2109bda 100644 (file)
--- a/secchan/port-watcher.c
+++ b/secchan/port-watcher.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #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 5f0da2d..3736703 100644 (file)
--- a/secchan/ratelimit.c
+++ b/secchan/ratelimit.c
@@ -36,7 +36,7 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 #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 0f55cde..f1ac6d2 100644 (file)
--- 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 9d7306c..17aa243 100644 (file)
--- a/secchan/snat.c
+++ b/secchan/snat.c
@@ -36,9 +36,9 @@
 #include <arpa/inet.h>
 #include <inttypes.h>
 #include <stdlib.h>
-#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 be4f86b..c1e5494 100644 (file)
--- a/secchan/status.c
+++ b/secchan/status.c
@@ -38,9 +38,9 @@
 #include <errno.h>
 #include <unistd.h>
 #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 306f05f..379bca2 100644 (file)
--- 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 8fdc9d3..e05365c 100644 (file)
--- 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 f1774f3..3322d9f 100644 (file)
--- 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 f556973..e0181fa 100644 (file)
--- 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 37d5464..e2a6d4f 100644 (file)
--- 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 50a0dee..8e3b7f7 100644 (file)
--- a/switch/switch-flow.c
+++ b/switch/switch-flow.c
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <string.h>
 #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 11ef27a..38cfa6e 100644 (file)
--- a/switch/switch-flow.h
+++ b/switch/switch-flow.h
@@ -35,7 +35,7 @@
 #define SWITCH_FLOW_H 1
 
 #include <time.h>
-#include "openflow.h"
+#include "openflow/openflow.h"
 #include "flow.h"
 #include "list.h"
 

diff --git a/switch/switch.c b/switch/switch.c
index 84ed8de..03f7dc0 100644 (file)
--- 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 d3d3c52..32a0bc2 100644 (file)
--- a/switch/table-linear.c
+++ b/switch/table-linear.c
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #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 c1af312..3f2cc57 100644 (file)
--- 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 <stdlib.h>
 +
 +#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 4592a9a..0065cf7 100644 (file)
--- 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"