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
#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"
#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"
#include <linux/netdevice.h>
#include <linux/workqueue.h>
#include <linux/skbuff.h>
-#include "openflow.h"
+#include "openflow/openflow.h"
#include "flow.h"
#include <net/checksum.h>
#include "forward.h"
#include "dp_act.h"
-#include "nicira-ext.h"
+#include "openflow/nicira-ext.h"
#include "nx_act.h"
#include <linux/rcupdate.h>
#include <net/ip.h>
-#include "openflow.h"
+#include "openflow/openflow.h"
#include "compat.h"
#include "snap.h"
#include <linux/skbuff.h>
#include <linux/if_ether.h>
-#include "openflow.h"
+#include "openflow/openflow.h"
struct sk_buff;
struct ofp_flow_mod;
#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"
*/
/* 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"
#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 */
#include "chain.h"
#include "datapath.h"
-#include "nicira-ext.h"
+#include "openflow/nicira-ext.h"
#include "nx_act_snat.h"
#include "nx_msg.h"
-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
--- /dev/null
+noinst_HEADERS += \
+ include/openflow/nicira-ext.h \
+ include/openflow/openflow.h \
+ include/openflow/openflow-netlink.h
* 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
};
OFP_ASSERT(sizeof(struct nx_command_reply) == 20);
-#endif /* nicira-ext.h */
+#endif /* openflow/nicira-ext.h */
* 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"
DP_GENL_C_MAX = __DP_GENL_C_MAX - 1
};
-#endif /* openflow-netlink.h */
+#endif /* openflow/openflow-netlink.h */
/* 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>
};
OFP_ASSERT(sizeof(struct ofp_vendor_header) == 12);
-#endif /* openflow.h */
+#endif /* openflow/openflow.h */
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
#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"
#include <string.h>
#include "hash.h"
#include "ofpbuf.h"
-#include "openflow.h"
+#include "openflow/openflow.h"
#include "packets.h"
#include "vlog.h"
#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"
#include "hash.h"
#include "list.h"
-#include "openflow.h"
+#include "openflow/openflow.h"
#include "timeval.h"
#include "util.h"
#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"
#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"
#define PORT_ARRAY_H 1
#include <assert.h>
-#include "openflow.h"
+#include "openflow/openflow.h"
#include "util.h"
static inline uint16_t
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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
#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"
#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"
#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"
#include "csum.h"
#include "packets.h"
#include "dp_act.h"
-#include "nicira-ext.h"
+#include "openflow/nicira-ext.h"
#include "nx_act.h"
#ifndef DP_ACT_H
#define DP_ACT_H 1
-#include "openflow.h"
+#include "openflow/openflow.h"
#include "switch-flow.h"
#include "datapath.h"
*/
/* Functions for Nicira-extended actions. */
-#include "nicira-ext.h"
+#include "openflow/nicira-ext.h"
#include "nx_act.h"
uint16_t
#include <stdlib.h>
#include <string.h>
#include "ofpbuf.h"
-#include "openflow.h"
+#include "openflow/openflow.h"
#include "packets.h"
#include "timeval.h"
#define SWITCH_FLOW_H 1
#include <time.h>
-#include "openflow.h"
+#include "openflow/openflow.h"
#include "flow.h"
#include "list.h"
#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"
#include <stdlib.h>
#include "flow.h"
#include "list.h"
-#include "openflow.h"
+#include "openflow/openflow.h"
#include "switch-flow.h"
#include "datapath.h"
+#include <stdlib.h>
+
+#include "interface.h"
-+#include "../../include/openflow.h"
++#include "../../include/openflow/openflow.h"
+#include "../../include/ofp-print.h"
+
+void
#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"