# Conflicts:
#	src/main/java/net/floodlightcontroller/core/internal/Controller.java

OF1.4 bug fixes

Modified Forwarding and ForwardingBase to use setInstructions instead…

Modified Forwarding and ForwardingBase to use setInstructions instead of setActions in OF 1.1 or later. New openflowj-2.0.0-SNAPSHOT.jar that duplicates the shortcut used for FlowMod setActions in version 1.3 to versions 1.1, 1.2 and 1.4

Fix OF1.4 table features properties byte-align to 8 bytes. This required a Loxi update. Also updated handshake handler to not use action but instead instructions w/apply-actions.

Add ability to filter outbound messages while in SLAVE role

Added unit test for writing messages while in MASTER/SLAVE. Changed to a blacklist mechanism instead of a whitelist (to match how the spec describes invalid (write) SLAVE messages). Completed invalid SLAVE messages for each OF version.

Updated to properly handle IOFSwitch write()'s while in SLAVE role. TODO: make unit test for trapping invalid messages while in SLAVE. TODO: complete logic for handling valid SLAVE message types per OF version.

Netty4, bug fixes, and new OpenFlowJ-2.0.0

We can shutdown gracefully and not wait (as Netty3 did). If not waiting turns out to be a problem, we can wait again.

OMG, it was a timeout that was too short. Good news is that the bootstrap unit test passes. Bad news is that there is a timeout somewhere in the sync module that is way too long and causes the unit tests for sync to take literally a few minutes. Will look into that next.

Fixed a blunder in OFSwitchManager and Controller to allow switches to connect if a server IP isn't explicitly given in floodlihgtdefault.properties. Still can't get sync's bootstrap test to pass. Feels like a race condition b/t update threads.

Fix bug in ActionUtils. OF1.0 transport ports were being parsed as sh…

Fix bug in ActionUtils. OF1.0 transport ports were being parsed as shorts. For ports above 32767, this is bad.

Core ported to Netty 4 along with unit tests. Still need to do sync and some loxi-related compile errors in web.serializers.

Initial statistics module commit

Add OF-DPA helper functions

OF-DPA init and learning switch functions created. Possible use is commented out in ForwardingBase.java for the time being.

Fix data races in LoadBalancer and DHCPSwitchFlowSetter

Fix SFP bug pushing flow w/o switch ID specified

Fix fromString of MatchUtils OFVlanVidMatch issue