implementing flowremoved handling

 package org.onlab.onos.of.controller.impl;
 package org.onlab.onos.of.controller.impl;
 
 
+import static org.onlab.util.Tools.namedThreads;
+
 import java.util.HashSet;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantLock;
 
 
@@ -13,6 +19,7 @@ import org.apache.felix.scr.annotations.Service;
 import org.onlab.onos.of.controller.DefaultOpenFlowPacketContext;
 import org.onlab.onos.of.controller.DefaultOpenFlowPacketContext;
 import org.onlab.onos.of.controller.Dpid;
 import org.onlab.onos.of.controller.Dpid;
 import org.onlab.onos.of.controller.OpenFlowController;
 import org.onlab.onos.of.controller.OpenFlowController;
+import org.onlab.onos.of.controller.OpenFlowEventListener;
 import org.onlab.onos.of.controller.OpenFlowPacketContext;
 import org.onlab.onos.of.controller.OpenFlowPacketContext;
 import org.onlab.onos.of.controller.OpenFlowSwitch;
 import org.onlab.onos.of.controller.OpenFlowSwitch;
 import org.onlab.onos.of.controller.OpenFlowSwitchListener;
 import org.onlab.onos.of.controller.OpenFlowSwitchListener;
@@ -22,10 +29,12 @@ import org.onlab.onos.of.controller.driver.OpenFlowAgent;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 import org.projectfloodlight.openflow.protocol.OFPacketIn;
 import org.projectfloodlight.openflow.protocol.OFPacketIn;
 import org.projectfloodlight.openflow.protocol.OFPortStatus;
 import org.projectfloodlight.openflow.protocol.OFPortStatus;
+import org.projectfloodlight.openflow.protocol.OFType;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimap;
 
 
 @Component(immediate = true)
 @Component(immediate = true)
@@ -35,6 +44,10 @@ public class OpenFlowControllerImpl implements OpenFlowController {
     private static final Logger log =
     private static final Logger log =
             LoggerFactory.getLogger(OpenFlowControllerImpl.class);
             LoggerFactory.getLogger(OpenFlowControllerImpl.class);
 
 
+    private final ExecutorService executor = Executors.newFixedThreadPool(16,
+            namedThreads("of-event-dispatch-%d"));
+
+
     protected ConcurrentHashMap<Dpid, OpenFlowSwitch> connectedSwitches =
     protected ConcurrentHashMap<Dpid, OpenFlowSwitch> connectedSwitches =
             new ConcurrentHashMap<Dpid, OpenFlowSwitch>();
             new ConcurrentHashMap<Dpid, OpenFlowSwitch>();
     protected ConcurrentHashMap<Dpid, OpenFlowSwitch> activeMasterSwitches =
     protected ConcurrentHashMap<Dpid, OpenFlowSwitch> activeMasterSwitches =
@@ -43,11 +56,12 @@ public class OpenFlowControllerImpl implements OpenFlowController {
             new ConcurrentHashMap<Dpid, OpenFlowSwitch>();
             new ConcurrentHashMap<Dpid, OpenFlowSwitch>();
 
 
     protected OpenFlowSwitchAgent agent = new OpenFlowSwitchAgent();
     protected OpenFlowSwitchAgent agent = new OpenFlowSwitchAgent();
-    protected Set<OpenFlowSwitchListener> ofEventListener = new HashSet<>();
+    protected Set<OpenFlowSwitchListener> ofSwitchListener = new HashSet<>();
 
 
     protected Multimap<Integer, PacketListener> ofPacketListener =
     protected Multimap<Integer, PacketListener> ofPacketListener =
             ArrayListMultimap.create();
             ArrayListMultimap.create();
 
 
+    protected Map<OFType, List<OpenFlowEventListener>> ofEventListener = Maps.newHashMap();
 
 
     private final Controller ctrl = new Controller();
     private final Controller ctrl = new Controller();
 
 
@@ -93,14 +107,14 @@ public class OpenFlowControllerImpl implements OpenFlowController {
 
 
     @Override
     @Override
     public void addListener(OpenFlowSwitchListener listener) {
     public void addListener(OpenFlowSwitchListener listener) {
-        if (!ofEventListener.contains(listener)) {
-            this.ofEventListener.add(listener);
+        if (!ofSwitchListener.contains(listener)) {
+            this.ofSwitchListener.add(listener);
         }
         }
     }
     }
 
 
     @Override
     @Override
     public void removeListener(OpenFlowSwitchListener listener) {
     public void removeListener(OpenFlowSwitchListener listener) {
-        this.ofEventListener.remove(listener);
+        this.ofSwitchListener.remove(listener);
     }
     }
 
 
     @Override
     @Override
@@ -122,7 +136,7 @@ public class OpenFlowControllerImpl implements OpenFlowController {
     public void processPacket(Dpid dpid, OFMessage msg) {
     public void processPacket(Dpid dpid, OFMessage msg) {
         switch (msg.getType()) {
         switch (msg.getType()) {
         case PORT_STATUS:
         case PORT_STATUS:
-            for (OpenFlowSwitchListener l : ofEventListener) {
+            for (OpenFlowSwitchListener l : ofSwitchListener) {
                 l.portChanged(dpid, (OFPortStatus) msg);
                 l.portChanged(dpid, (OFPortStatus) msg);
             }
             }
             break;
             break;
@@ -134,6 +148,12 @@ public class OpenFlowControllerImpl implements OpenFlowController {
                 p.handlePacket(pktCtx);
                 p.handlePacket(pktCtx);
             }
             }
             break;
             break;
+        case FLOW_REMOVED:
+        case ERROR:
+        case STATS_REPLY:
+        case BARRIER_REPLY:
+            executor.submit(new OFMessageHandler(dpid, msg));
+            break;
         default:
         default:
             log.warn("Handling message type {} not yet implemented {}",
             log.warn("Handling message type {} not yet implemented {}",
                     msg.getType(), msg);
                     msg.getType(), msg);
@@ -164,7 +184,7 @@ public class OpenFlowControllerImpl implements OpenFlowController {
             } else {
             } else {
                 log.error("Added switch {}", dpid);
                 log.error("Added switch {}", dpid);
                 connectedSwitches.put(dpid, sw);
                 connectedSwitches.put(dpid, sw);
-                for (OpenFlowSwitchListener l : ofEventListener) {
+                for (OpenFlowSwitchListener l : ofSwitchListener) {
                     l.switchAdded(dpid);
                     l.switchAdded(dpid);
                 }
                 }
                 return true;
                 return true;
@@ -277,7 +297,7 @@ public class OpenFlowControllerImpl implements OpenFlowController {
             if (sw == null) {
             if (sw == null) {
                 sw = activeEqualSwitches.remove(dpid);
                 sw = activeEqualSwitches.remove(dpid);
             }
             }
-            for (OpenFlowSwitchListener l : ofEventListener) {
+            for (OpenFlowSwitchListener l : ofSwitchListener) {
                 l.switchRemoved(dpid);
                 l.switchRemoved(dpid);
             }
             }
         }
         }
@@ -288,5 +308,26 @@ public class OpenFlowControllerImpl implements OpenFlowController {
         }
         }
     }
     }
 
 
+    private final class OFMessageHandler implements Runnable {
+
+        private final OFMessage msg;
+        private final Dpid dpid;
+
+        public OFMessageHandler(Dpid dpid, OFMessage msg) {
+            this.msg = msg;
+            this.dpid = dpid;
+        }
+
+        @Override
+        public void run() {
+            List<OpenFlowEventListener> listeners =
+                    ofEventListener.get(OFType.FLOW_REMOVED);
+            for (OpenFlowEventListener listener : listeners) {
+                listener.handleMessage(dpid, msg);
+            }
+        }
+
+    }
+
 
 
 }
 }

@@ -46,7 +46,7 @@ public class OpenFlowCorePacketContext extends DefaultPacketContext {
     private void sendBufferedPacket() {
     private void sendBufferedPacket() {
         List<Instruction> ins = treatmentBuilder().build().instructions();
         List<Instruction> ins = treatmentBuilder().build().instructions();
         OFPort p = null;
         OFPort p = null;
-        //TODO: support arbitrary list of treatments
+        //TODO: support arbitrary list of treatments must be supported in ofPacketContext
         for (Instruction i : ins) {
         for (Instruction i : ins) {
             if (i.type() == Type.OUTPUT) {
             if (i.type() == Type.OUTPUT) {
                 p = buildPort(((OutputInstruction) i).port());
                 p = buildPort(((OutputInstruction) i).port());

@@ -226,6 +226,10 @@ public final class IpAddress {
         return new IpAddress(version, host, netmask);
         return new IpAddress(version, host, netmask);
     }
     }
 
 
+    public boolean isMasked() {
+        return mask() != 0;
+    }
+
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
         final int prime = 31;
         final int prime = 31;