new wildcards

adumas
1 parent 912ee413
Showing 2 changed files with 85 additions and 4 deletions
src/main/java/net/floodlightcontroller/pelstats/PELStats.java
src/main/java/net/floodlightcontroller/pelstats/rest/RESTQueue.java
@@ -438,7 +438,7 @@ public class PELStats implements IFloodlightModule, IOFMessageListener, RestAPIP
  
  
 		 //OpenFlow message for flow tables modifications
-		//Delete all the flows created by the switch for the voip
+		//Delete all the flows created by the switch for the voip (linphone call)
 		OFmessage= new OFFlowMod();
 		OFmatch= new OFMatch();
  
@@ -473,7 +473,7 @@ public class PELStats implements IFloodlightModule, IOFMessageListener, RestAPIP
  
  
 		 //OpenFlow message for flow tables modifications
-		//Delete all the flows created by the switch for the RTCP
+		//Delete all the flows created by the switch for the RTCP (linphone call)
 		OFmessage= new OFFlowMod();
 		OFmatch= new OFMatch();
  
@@ -506,6 +506,75 @@ public class PELStats implements IFloodlightModule, IOFMessageListener, RestAPIP
 			e.printStackTrace();
 		}//*/
  
+		 //OpenFlow message for flow tables modifications
+		//Delete all the flows created by the switch for the voip (call without linphone)
+		OFmessage= new OFFlowMod();
+		OFmatch= new OFMatch();
+		
+		OFmessage.setCommand((short)3);
+		OFmessage.setCookie(0);
+		OFmessage.setIdleTimeout((short) 0);
+		OFmessage.setHardTimeout((short)0);
+		OFmessage.setPriority((short)0xffff);
+		OFmessage.setBufferId(0);
+		OFmessage.setOutPort((short)0xffff);
+		OFmessage.setFlags((short) 0);
+		
+		OFmatch.setTransportSource((short)port);
+		OFmatch.setWildcards(OFMatch.OFPFW_ALL //- OFMatch.OFPFW_IN_PORT
+						- OFMatch.OFPFW_TP_SRC - OFMatch.OFPFW_NW_PROTO
+						- OFMatch.OFPFW_DL_VLAN_PCP -OFMatch.OFPFW_DL_TYPE
+						- OFMatch.OFPFW_NW_TOS);//*/
+		OFmatch.setNetworkTypeOfService((byte)0x0);
+		OFmatch.setNetworkProtocol((byte)0x11);
+		OFmatch.setDataLayerType((short)0x0800);
+		OFmatch.setDataLayerVirtualLanPriorityCodePoint((byte)0x0);
+
+		OFmessage.setMatch(OFmatch);
+		OFmessage.setLength((short)(OFFlowMod.MINIMUM_LENGTH));
+		
+		try {
+			sw.write(OFmessage, null);
+			sw.flush();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		
+		
+		 //OpenFlow message for flow tables modifications
+		//Delete all the flows created by the switch for the RTCP (call without linphone)
+		OFmessage= new OFFlowMod();
+		OFmatch= new OFMatch();
+		
+		OFmessage.setCommand((short)3);
+		OFmessage.setCookie(0);
+		OFmessage.setIdleTimeout((short) 0);
+		OFmessage.setHardTimeout((short)0);
+		OFmessage.setPriority((short)0xffff);
+		OFmessage.setBufferId(0);
+		OFmessage.setOutPort((short)0xffff);
+		OFmessage.setFlags((short) 0);
+		
+		OFmatch.setTransportSource((short)(port+1));
+		OFmatch.setWildcards(OFMatch.OFPFW_ALL //- OFMatch.OFPFW_IN_PORT
+						- OFMatch.OFPFW_TP_SRC - OFMatch.OFPFW_NW_PROTO
+						- OFMatch.OFPFW_DL_VLAN_PCP -OFMatch.OFPFW_DL_TYPE
+						- OFMatch.OFPFW_NW_TOS);
+		OFmatch.setNetworkTypeOfService((byte) 0x0);
+		OFmatch.setNetworkProtocol((byte)0x11);
+		OFmatch.setDataLayerType((short)0x0800);
+		OFmatch.setDataLayerVirtualLanPriorityCodePoint((byte)0x0);
+		
+		OFmessage.setMatch(OFmatch);
+		OFmessage.setLength((short)(OFFlowMod.MINIMUM_LENGTH));
+		
+		try {
+			sw.write(OFmessage, null);
+			sw.flush();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}//*/
+		
  
  
  
@@ -264,7 +264,13 @@ public class RESTQueue extends ServerResource{
 						default:return "{\"resultCode\" : 0, \"error, invalid protocol : \"}";
 					}
 					OFmatch.setWildcards(OFMatch.OFPFW_ALL - OFMatch.OFPFW_IN_PORT
-									- OFMatch.OFPFW_TP_SRC - OFmatch.OFPFW_TP_DST );
+							- OFMatch.OFPFW_TP_SRC - OFMatch.OFPFW_NW_PROTO
+							- OFMatch.OFPFW_DL_VLAN_PCP -OFMatch.OFPFW_DL_TYPE);//*/
+					OFmatch.setNetworkProtocol((byte)0x11);
+					OFmatch.setDataLayerType((short)0x0800);
+					OFmatch.setDataLayerVirtualLanPriorityCodePoint((byte)0x0);
+					/*OFmatch.setWildcards(OFMatch.OFPFW_ALL - OFMatch.OFPFW_IN_PORT
+									- OFMatch.OFPFW_TP_SRC - OFmatch.OFPFW_TP_DST );*/
 					OFmatch.setInputPort((short)1);
 					OFmessage.setMatch(OFmatch);
  
@@ -319,7 +325,13 @@ public class RESTQueue extends ServerResource{
 						default:return "{\"resultCode\" : 0, \"error, invalid protocol : \"}";
 					}
 					OFmatch.setWildcards(OFMatch.OFPFW_ALL - OFMatch.OFPFW_IN_PORT
-									- OFMatch.OFPFW_TP_SRC - OFmatch.OFPFW_TP_DST );
+							- OFMatch.OFPFW_TP_SRC - OFMatch.OFPFW_NW_PROTO
+							- OFMatch.OFPFW_DL_VLAN_PCP -OFMatch.OFPFW_DL_TYPE);//*/
+					OFmatch.setNetworkProtocol((byte)0x11);
+					OFmatch.setDataLayerType((short)0x0800);
+					OFmatch.setDataLayerVirtualLanPriorityCodePoint((byte)0x0);					
+					/*OFmatch.setWildcards(OFMatch.OFPFW_ALL - OFMatch.OFPFW_IN_PORT
+									- OFMatch.OFPFW_TP_SRC - OFmatch.OFPFW_TP_DST );*/
 					OFmatch.setInputPort((short)2);
 					OFmessage.setMatch(OFmatch);