Skip to content
Snippets Groups Projects
Commit b24506b1 authored by Alex Reimers's avatar Alex Reimers
Browse files

Fix an issue causing infinite broadcast loops in OpenFlow topologies that have loops.

parent 20396a8a
Branches v0.82
Tags v0.82
No related merge requests found
...@@ -1341,7 +1341,7 @@ public class Controller ...@@ -1341,7 +1341,7 @@ public class Controller
@Override @Override
public void handleOutgoingMessage(IOFSwitch sw, OFMessage m, public void handleOutgoingMessage(IOFSwitch sw, OFMessage m,
FloodlightContext bc) { FloodlightContext bc) {
if (log.isDebugEnabled()) { if (log.isTraceEnabled()) {
String str = OFMessage.getDataAsString(sw, m, bc); String str = OFMessage.getDataAsString(sw, m, bc);
log.trace("{}", str); log.trace("{}", str);
} }
......
...@@ -201,6 +201,7 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule { ...@@ -201,6 +201,7 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule {
log.trace("doFlood, drop broadcast packet, pi={}, from a blocked port, " + log.trace("doFlood, drop broadcast packet, pi={}, from a blocked port, " +
"srcSwitchTuple={}, linkInfo={}", new Object[] {pi, srcSwTuple}); "srcSwitchTuple={}, linkInfo={}", new Object[] {pi, srcSwTuple});
} }
return;
} }
// Set Action to flood // Set Action to flood
......
...@@ -267,7 +267,7 @@ public class StaticFlowEntryPusher ...@@ -267,7 +267,7 @@ public class StaticFlowEntryPusher
if (row.get(key) == null) if (row.get(key) == null)
continue; continue;
if ( key.equals(COLUMN_SWITCH) || key.equals(COLUMN_NAME) if ( key.equals(COLUMN_SWITCH) || key.equals(COLUMN_NAME)
|| key.equals("id")) // "id" seems implicit in cassandra || key.equals("id"))
continue; // already handled continue; // already handled
// explicitly ignore timeouts and wildcards // explicitly ignore timeouts and wildcards
if ( key.equals(COLUMN_HARD_TIMEOUT) || key.equals(COLUMN_IDLE_TIMEOUT) || if ( key.equals(COLUMN_HARD_TIMEOUT) || key.equals(COLUMN_IDLE_TIMEOUT) ||
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment