Add OF 1.3 status for reasserting master controller

Change-Id: Ibd25eb8189f67bc8a5107ea0245cfbdee24549ed

Add OF 1.3 status for reasserting master controller
Change-Id: Ibd25eb8189f67bc8a5107ea0245cfbdee24549ed
Ray Milkey
Commit 30d1965a3232fb05b762b14ee64b36604874d1c9 30d1965a 1 parent 16144ba3
Showing 1 changed file with 3 additions and 1 deletions
protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
--- a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
View file @30d1965
+++ b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
View file @30d1965
@@ -576,8 +576,10 @@ class OFChannelHandler extends IdleStateAwareChannelHandler {
                     throws IOException, SwitchStateException {
                 // if we get here, then the error message is for something else
                 if (m.getErrType() == OFErrorType.BAD_REQUEST &&
+                         (((OFBadRequestErrorMsg) m).getCode() ==
+                            OFBadRequestCode.EPERM) ||
                         ((OFBadRequestErrorMsg) m).getCode() ==
-                         OFBadRequestCode.EPERM) {
+                            OFBadRequestCode.IS_SLAVE) {
                     // We are the master controller and the switch returned
                     // a permission error. This is a likely indicator that
                     // the switch thinks we are slave. Reassert our