Glen Gibb 47a0ed66bc Merge branch 'devel/yiannisy/slicing' ...

Conflicts:
	include/openflow/openflow.h
	regress/lib/Perl5/OF/OFUtil.pm
	regress/projects/black_box/regress/tests.txt
	udatapath/datapath.c
	utilities/wireshark_dissectors/openflow/packet-openflow.c

2009-12-11 18:11:16 -08:00

..

.gitignore

Support SSL in secchan and controller.

2008-03-13 15:17:45 -07:00

automake.mk

Fix typo in automake.mk

2009-06-29 05:32:46 -07:00

backtrace.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

backtrace.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

bitmap.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

bitmap.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

command-line.c

Move Autoconf's macro definitions into config.h.

2008-07-21 15:05:53 -07:00

command-line.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

common.man

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

compiler.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

csum.c

Move Autoconf's macro definitions into config.h.

2008-07-21 15:05:53 -07:00

csum.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

daemon.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

daemon.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

daemon.man

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

dh1024.pem

Add 1024-bit Diffie-Hellman parameters to vconn-ssl.

2008-03-27 17:50:33 -07:00

dh2048.pem

Support SSL in secchan and controller.

2008-03-13 15:17:45 -07:00

dh4096.pem

Support SSL in secchan and controller.

2008-03-13 15:17:45 -07:00

dhcp-client.c

Updated datapath for slicing feature

2009-12-04 14:44:48 -08:00

dhcp-client.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

dhcp.c

Don't use designated array initializers in code compiled outside of Linux.

2008-09-04 13:53:27 -07:00

dhcp.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

dhparams.h

Add 1024-bit Diffie-Hellman parameters to vconn-ssl.

2008-03-27 17:50:33 -07:00

dirs.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

dpif.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

dpif.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

dynamic-string.c

Change code base to Nicira's for-nox/0.4 branch

2009-06-29 05:02:16 -07:00

dynamic-string.h

Change code base to Nicira's for-nox/0.4 branch

2009-06-29 05:02:16 -07:00

fatal-signal.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

fatal-signal.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

fault.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

fault.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

flow.c

IPv4 DSCP match: Add IPv4 DSCP field match feature

2009-12-11 15:43:36 -08:00

flow.h

IPv4 DSCP match: Add IPv4 DSCP field match feature

2009-12-11 15:43:36 -08:00

hash.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

hash.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

hmap.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

hmap.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

leak-checker.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

leak-checker.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

leak-checker.man

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

learning-switch.c

Namespace change: Rename flow expiration to flow removed

2009-07-01 19:58:06 -07:00

learning-switch.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

list.c

Move Autoconf's macro definitions into config.h.

2008-07-21 15:05:53 -07:00

list.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

mac-learning.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

mac-learning.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

netdev.c

Remove warning messages (mostly due to UNUSED params).

2009-12-08 15:53:01 -08:00

netdev.h

Introduce --no-slicing option.

2009-12-08 15:17:51 -08:00

netlink-protocol.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

netlink.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

netlink.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

ofp-print.c

Merge branch 'devel/yiannisy/slicing'

2009-12-11 18:11:16 -08:00

ofp-print.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

ofpbuf.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

ofpbuf.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

ofpstat.c

Emergency flow cache: Rename error code from OFPFMFC_EMERG to

2009-07-15 09:38:15 -07:00

ofpstat.h

Emergency flow cache: Suppress flow removed notification for flows in

2009-07-11 21:02:04 -07:00

packets.h

Safety checks for ARP packets

2009-12-11 15:43:35 -08:00

pcap.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

pcap.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

poll-loop.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

poll-loop.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

port-array.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

port-array.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

process.c

Change code base to Nicira's for-nox/0.4 branch

2009-06-29 05:02:16 -07:00

process.h

Change code base to Nicira's for-nox/0.4 branch

2009-06-29 05:02:16 -07:00

queue.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

queue.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

random.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

random.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

rconn.c

Protocol stats: Add OpenFlow protocol statistical information

2009-06-29 05:22:54 -07:00

rconn.h

Protocol stats: Add OpenFlow protocol statistical information

2009-06-29 05:22:54 -07:00

sat-math.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

shash.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

shash.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

signals.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

signals.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

socket-util.c

Add queue support to netdev abstraction

2009-12-04 14:44:48 -08:00

socket-util.h

Add queue support to netdev abstraction

2009-12-04 14:44:48 -08:00

stp.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

stp.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

svec.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

svec.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

tag.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

tag.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

timeval.c

Rename utility functions to avoid partner namespace conflicts.

2008-09-04 13:53:27 -07:00

timeval.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

type-props.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

util.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

util.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

vconn-netlink.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

vconn-provider.h

Protocol stats: Add OpenFlow protocol statistical information

2009-06-29 05:22:54 -07:00

vconn-ssl.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

vconn-ssl.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

vconn-stream.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

vconn-stream.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

vconn-tcp.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

vconn-unix.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

vconn.c

Bug fix: Fix VLAN PCP support for simple controller

2009-08-26 14:22:03 -07:00

vconn.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

vlog-modules.def

Openflow Vendor Extension (experimental) placeholder

2009-12-04 14:44:48 -08:00

vlog-socket.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

vlog-socket.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00

vlog.c

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

vlog.h

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

vlog.man

Change code base to Nicira's master branch

2009-06-29 05:03:42 -07:00

xtoxll.h

Move exported headers to include/openflow, private headers to lib/.

2008-10-29 15:15:45 -07:00