diff --git a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java index ece881e70b7c9e8a13fe9846924e9abdc9be9746..b06cfebaad75a075f8be894f7b27b490acfeb7b4 100644 --- a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java +++ b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java @@ -472,8 +472,8 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule { } tmp = configParameters.get("set-send-flow-rem-flag"); if (tmp != null) { - FLOWMOD_SET_SEND_FLOW_REM_FLAG = Boolean.parseBoolean(tmp); - log.info("Default flags will include SEND_FLOW_REM."); + FLOWMOD_DEFAULT_SET_SEND_FLOW_REM_FLAG = Boolean.parseBoolean(tmp); + log.info("Default flags will be set to SEND_FLOW_REM."); } else { log.info("Default flags will be empty."); } diff --git a/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java b/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java index f30aca52985ebe6de70f98877f7993892880fc35..d0e6e0eda91ae7d418706395c9a8d17c1255b4e7 100644 --- a/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java +++ b/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java @@ -86,7 +86,7 @@ public abstract class ForwardingBase implements IOFMessageListener { public static int FLOWMOD_DEFAULT_HARD_TIMEOUT = 0; // infinite public static int FLOWMOD_DEFAULT_PRIORITY = 1; // 0 is the default table-miss flow in OF1.3+, so we need to use 1 - public static boolean FLOWMOD_SET_SEND_FLOW_REM_FLAG = false; + public static boolean FLOWMOD_DEFAULT_SET_SEND_FLOW_REM_FLAG = false; public static boolean FLOWMOD_DEFAULT_MATCH_VLAN = true; public static boolean FLOWMOD_DEFAULT_MATCH_MAC = true; @@ -269,7 +269,7 @@ public abstract class ForwardingBase implements IOFMessageListener { aob.setMaxLen(Integer.MAX_VALUE); actions.add(aob.build()); - if(FLOWMOD_SET_SEND_FLOW_REM_FLAG) { + if(FLOWMOD_DEFAULT_SET_SEND_FLOW_REM_FLAG) { Set<OFFlowModFlags> flags = new HashSet<>(); flags.add(OFFlowModFlags.SEND_FLOW_REM); fmb.setFlags(flags);