Skip to content
Snippets Groups Projects
Commit 834cf450 authored by Banse, Christian's avatar Banse, Christian
Browse files

minor cleanup for handle-outgoing-messages feature

parent 31b4aaeb
No related branches found
No related tags found
No related merge requests found
...@@ -14,4 +14,3 @@ findbugs-results ...@@ -14,4 +14,3 @@ findbugs-results
/thrift /thrift
*.idea/* *.idea/*
*.iml *.iml
/target/
...@@ -715,7 +715,7 @@ public class OFSwitch implements IOFSwitchBackend { ...@@ -715,7 +715,7 @@ public class OFSwitch implements IOFSwitchBackend {
log.trace("Channel: {}, Connected: {}", connections.get(OFAuxId.MAIN).getRemoteInetAddress(), connections.get(OFAuxId.MAIN).isConnected()); log.trace("Channel: {}, Connected: {}", connections.get(OFAuxId.MAIN).getRemoteInetAddress(), connections.get(OFAuxId.MAIN).isConnected());
if (isActive()) { if (isActive()) {
connections.get(OFAuxId.MAIN).write(m); connections.get(OFAuxId.MAIN).write(m);
switchManager.handleOutgoingMessage(this, m); switchManager.handleOutgoingMessage(this, m);
} else { } else {
log.warn("Attempted to write to switch {} that is SLAVE.", this.getId().toString()); log.warn("Attempted to write to switch {} that is SLAVE.", this.getId().toString());
} }
...@@ -747,7 +747,7 @@ public class OFSwitch implements IOFSwitchBackend { ...@@ -747,7 +747,7 @@ public class OFSwitch implements IOFSwitchBackend {
public void write(OFMessage m, LogicalOFMessageCategory category) { public void write(OFMessage m, LogicalOFMessageCategory category) {
if (isActive()) { if (isActive()) {
this.getConnection(category).write(m); this.getConnection(category).write(m);
switchManager.handleOutgoingMessage(this, m); switchManager.handleOutgoingMessage(this, m);
} else { } else {
log.warn("Attempted to write to switch {} that is SLAVE.", this.getId().toString()); log.warn("Attempted to write to switch {} that is SLAVE.", this.getId().toString());
} }
......
...@@ -61,9 +61,8 @@ public interface IOFSwitchManager { ...@@ -61,9 +61,8 @@ public interface IOFSwitchManager {
* Process written messages through the message listeners for the controller * Process written messages through the message listeners for the controller
* @param sw The switch being written to * @param sw The switch being written to
* @param m the message * @param m the message
* @throws NullPointerException if switch or msg is null
*/ */
public void handleOutgoingMessage(IOFSwitch sw, OFMessage m); public void handleOutgoingMessage(IOFSwitch sw, OFMessage m);
/** /**
* Gets an unmodifiable collection of OFSwitchHandshakeHandlers * Gets an unmodifiable collection of OFSwitchHandshakeHandlers
......
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