Adding additional debug messages using OFMessageFilterManager functions.

floodlight · Dec 31, 2011 · 8bfbb08 · 8bfbb08
1 parent b7f2ee8
commit 8bfbb08
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 15 deletions.
diff --git a/src/main/java/net/floodlightcontroller/core/OFMessageFilterManager.java b/src/main/java/net/floodlightcontroller/core/OFMessageFilterManager.java
@@ -213,15 +213,17 @@ public HashSet<String> getMatchedFilters(OFMessage m, FloodlightContext cntx) {
         if (m.getType() == OFType.PACKET_IN) {
             eth = IFloodlightProvider.bcStore.get(cntx, 
                     IFloodlightProvider.CONTEXT_PI_PAYLOAD);
-
-
         } else if (m.getType() == OFType.PACKET_OUT) {
             eth = new Ethernet();
             OFPacketOut p = (OFPacketOut) m;
-            eth.deserialize(p.getPacketData(), 0, p.getPacketData().length);
 
+            // No MAC match if packetOut doesn't have the packet.
+            if (p.getPacketData() == null) return null;
+
+            eth.deserialize(p.getPacketData(), 0, p.getPacketData().length);
         } else if (m.getType() == OFType.FLOW_MOD) {
-            // no action performed.
+            // flow-mod can't be matched by mac.
+            return null;
         }
 
         if (eth == null) return null;
@@ -238,10 +240,11 @@ public HashSet<String> getMatchedFilters(OFMessage m, FloodlightContext cntx) {
             while (fieldIt.hasNext()) {   
                 String filterFieldType = fieldIt.next();
                 String filterFieldValue = filter.get(filterFieldType);
-                if (filterFieldType == "mac") {
+                if (filterFieldType.equals("mac")) {
 
                     String srcMac = HexString.toHexString(eth.getSourceMACAddress());
                     String dstMac = HexString.toHexString(eth.getDestinationMACAddress());
+                    log.debug("srcMac: {}, dstMac: {}", srcMac, dstMac);
 
                     if (filterFieldValue.equals(srcMac) || 
                             filterFieldValue.equals(dstMac)){
@@ -343,7 +346,7 @@ public boolean isCallbackOrderingPrereq(OFType type, String name) {
 
     @Override
     public boolean isCallbackOrderingPostreq(OFType type, String name) {
-        return false;
+        return (type == OFType.PACKET_IN && name.equals("learningswitch"));
     }
 
     @Override
@@ -368,7 +371,7 @@ public Command receive(IOFSwitch sw, OFMessage msg, FloodlightContext cntx) {
                 log.error("sendPacket exception: {}", e);
             }
         }
-
+        
         return Command.CONTINUE;
     }
 
@@ -421,7 +424,6 @@ protected void sendPacket(HashSet<String> matchedFilters, IOFSwitch sw,
                 OFPacketIn pktIn = (OFPacketIn)msg;
                 packet.setSwPortTuple(new SwitchPortTuple(sw.getId(), pktIn.getInPort()));
                 bb = ChannelBuffers.buffer(pktIn.getLength());
-                log.debug("Packet-In length is: {}", pktIn.getLength());
                 pktIn.writeTo(bb);
                 packet.setData(getData(sw, msg, cntx));
                 break;
@@ -473,7 +475,7 @@ protected void sendPacket(HashSet<String> matchedFilters, IOFSwitch sw,
         }
     }
 
-    private byte[] getData(IOFSwitch sw, OFMessage msg, FloodlightContext cntx) {
+    public String getDataAsString(IOFSwitch sw, OFMessage msg, FloodlightContext cntx) {
 
         Ethernet eth;
         StringBuffer sb =  new StringBuffer("");
@@ -488,7 +490,7 @@ private byte[] getData(IOFSwitch sw, OFMessage msg, FloodlightContext cntx) {
             case PACKET_IN:
                 OFPacketIn pktIn = (OFPacketIn) msg;
                 sb.append("packet_in          [ ");
-                sb.append(HexString.toHexString(sw.getId()));
+                sb.append(sw.getStringId());
                 sb.append(" -> Controller");
                 sb.append(" ]");
 
@@ -558,10 +560,15 @@ private byte[] getData(IOFSwitch sw, OFMessage msg, FloodlightContext cntx) {
         }
 
         sb.append("\n\n");
-        return sb.toString().getBytes();
+        return sb.toString();
+
+    }
+
+    public byte[] getData(IOFSwitch sw, OFMessage msg, FloodlightContext cntx) {
+        return this.getDataAsString(sw, msg, cntx).getBytes();
     }
 
-    private String getStringFromEthernetPacket(Ethernet eth) {
+    public String getStringFromEthernetPacket(Ethernet eth) {
 
         StringBuffer sb = new StringBuffer("\n");
 

diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -756,6 +756,16 @@ protected void handleMessage(IOFSwitch sw, OFMessage m,
                                 eth);
                     }
 
+                    // Print the packet-in for debugging purposes at this point
+                    // The context would have the necessary information for
+                    // the OFMessageFilterManager's getDataToString to work
+                    // for packet-ins.
+                    if (log.isDebugEnabled()) {
+                        String str = messageFilterManager.getDataAsString(sw, m, bc);
+                        log.debug("{}", str);
+                    }
+
+
                     // Get the starting time (overall and per-component) of 
                     // the processing chain for this packet if performance
                     // monitoring is turned on
@@ -785,7 +795,6 @@ protected void handleMessage(IOFSwitch sw, OFMessage m,
                 } else {
                     log.error("Unhandled OF Message: {} from {}", m, sw);
                 }
-                break;
         }
     }
 
@@ -1001,6 +1010,11 @@ public boolean injectOfMessage(IOFSwitch sw, OFMessage msg) {
     @Override
     public void handleOutgoingMessage(IOFSwitch sw, OFMessage m,
                                       FloodlightContext bc) {
+        if (log.isDebugEnabled()) {
+            String str = messageFilterManager.getDataAsString(sw, m, bc);
+            log.debug("{}", str);
+        }
+
         List<IOFMessageListener> listeners = null;
         if (messageListeners.containsKey(m.getType())) {
             listeners = 
@@ -1312,7 +1326,7 @@ protected void run() {
             final ServerBootstrap bootstrap = new ServerBootstrap(
                     new NioServerSocketChannelFactory(
                             Executors.newCachedThreadPool(),
-                            Executors.newCachedThreadPool(), 1));
+                            Executors.newCachedThreadPool()));
 
             bootstrap.setOption("reuseAddr", true);
             bootstrap.setOption("child.keepAlive", true);

diff --git a/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java b/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
@@ -153,7 +153,7 @@ public void testHandleMessages() throws Exception {
         reset(test1, test2, sw);
         expect(test1.receive(eq(sw), eq(pi), isA(FloodlightContext.class))).andReturn(Command.STOP);       
         expect(test1.getId()).andReturn(0).anyTimes();
-        expect(sw.getStringId()).andReturn("00:00:00:00:00:00:00");
+        expect(sw.getStringId()).andReturn("00:00:00:00:00:00:00").anyTimes();
         expect(sw.getFeaturesReply()).andReturn(new OFFeaturesReply()).anyTimes();
         replay(test1, test2, sw);
         controller.handleMessage(sw, pi, null);