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

@@ -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

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"

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"

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"
 
 

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"
 
 

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"
 

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;

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"

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"

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 */

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"
 

include/automake.mk

@@ -1,45 +1 @@
-noinst_HEADERS += \
+include include/openflow/automake.mk
-	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/openflow/automake.mk

@@ -0,0 +1,4 @@
+noinst_HEADERS += \
+	include/openflow/nicira-ext.h \
+	include/openflow/openflow.h \
+	include/openflow/openflow-netlink.h

include/openflow/nicira-ext.h

@@ -3,10 +3,10 @@
  * Copyright (c) 2008 Nicira Networks
  */
 
-#ifndef NICIRA_EXT_H
+#ifndef OPENFLOW_NICIRA_EXT_H
-#define NICIRA_EXT_H 1
+#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 */

include/openflow/openflow-netlink.h

@@ -31,8 +31,8 @@
  * derivatives without specific, written prior permission.
  */
 
-#ifndef OPENFLOW_NETLINK_H
+#ifndef OPENFLOW_OPENFLOW_NETLINK_H
-#define OPENFLOW_NETLINK_H 1
+#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 */

include/openflow/openflow.h

@@ -33,8 +33,8 @@
 
 /* OpenFlow: protocol between controller and datapath. */
 
-#ifndef OPENFLOW_H
+#ifndef OPENFLOW_OPENFLOW_H
-#define OPENFLOW_H 1
+#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 */

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-socket.h \
-	lib/vlog.c
+	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
 

lib/dpif.c

@@ -44,8 +44,8 @@
 #include "netlink.h"
 #include "netlink-protocol.h"
 #include "ofpbuf.h"
-#include "openflow-netlink.h"
+#include "openflow/openflow-netlink.h"
-#include "openflow.h"
+#include "openflow/openflow.h"
 #include "packets.h"
 #include "util.h"
 #include "xtoxll.h"

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"

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"

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"
 

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"

lib/ofp-print.c

@@ -47,8 +47,8 @@
 #include "dynamic-string.h"
 #include "flow.h"
 #include "ofpbuf.h"
-#include "openflow.h"
+#include "openflow/openflow.h"
-#include "nicira-ext.h"
+#include "openflow/nicira-ext.h"
 #include "packets.h"
 #include "util.h"
 

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

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"

lib/vconn-netlink.c

@@ -46,8 +46,8 @@
 #include "dpif.h"
 #include "netlink.h"
 #include "ofpbuf.h"
-#include "openflow-netlink.h"
+#include "openflow/openflow-netlink.h"
-#include "openflow.h"
+#include "openflow/openflow.h"
 #include "poll-loop.h"
 #include "socket-util.h"
 #include "util.h"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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

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"

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"

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"

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"
 
 

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"
 

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

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"
 

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"
 

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"

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"
 

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

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"