Some minor changes and logging added

Author: Sumanth Sathyanarayana

src/org/flowvisor/classifier/FVClassifier.java

@@ -1139,7 +1139,7 @@ public synchronized void classifyFlowStats(FVStatisticsReply fvStatisticsReply)
 			cache.put("packetCount ", reply.getPacketCount());
 			cache.put("byteCount ",reply.getByteCount());
 			cache.put("length ", reply.getLength());
-
+			
 			//cache.put(FlowSpace.DLDST, HexString.toHexString(reply.getMatch().getDataLayerDestination()));
 			//cache.put(FlowSpace.DLSRC, HexString.toHexString(reply.getMatch().getDataLayerSource()));
 			//cache.put(FlowSpace.DLTYPE, reply.getMatch().getDataLayerType());
@@ -1186,8 +1186,9 @@ public synchronized void classifyFlowStats(FVStatisticsReply fvStatisticsReply)
 		if (this.registeredForFlowTable == true && !this.flowTableList.isEmpty()){
 			FVLog.log(LogLevel.DEBUG, this, "Inside registeredForFlowTable ",this.registeredForFlowTable);
 			for (FlowTableCallback fcb : this.flowTableList) {
+				fcb.clearParams();
 				fcb.setParams(params);
-				fcb.run(); // Is this ok to use run, there will be only one thread of fcb per classifier?
+				fcb.spawn(); // Is this ok to use run, there will be only one thread of fcb per classifier?
 
 			}
 		}

src/org/flowvisor/message/lldp/LLDPTrailer.java

@@ -202,22 +202,26 @@ public static LLDPTrailer getTrailer(FVPacketIn pi) {
 		try{
 		FVLog.log(LogLevel.DEBUG, null, " packet capacity: ", packet.capacity());
 		int offset = packet.capacity() - END_LLDPDU_LEN ;
-
-		if (packet.get(offset) != 0)
+		//FVLog.log(LogLevel.DEBUG, null, "offset0: ",offset);
+		if (packet.get(offset) != 0){
 			FVLog.log(LogLevel.WARN, null, "End of LLDPDU is missing");
-
+			return null;//didn't find the End Trailer, so does not contain the rest too!
+		}
 		offset -= FLOWNAMELEN_LEN;
+		//FVLog.log(LogLevel.DEBUG, null, "offset1: ",offset);
 		byte flowLen = packet.get(offset);
+		FVLog.log(LogLevel.DEBUG, null, "flowLen: ",flowLen);
 		offset -= SLICENAMELEN_LEN;
+		//FVLog.log(LogLevel.DEBUG, null, "offset2: ",offset);
 		byte sliceLen = packet.get(offset);
+		FVLog.log(LogLevel.DEBUG, null, "sliceLen: ",sliceLen);
 		offset = offset - (flowLen + sliceLen); // this includes the NULL
+		//FVLog.log(LogLevel.DEBUG, null, "offset3: ",offset);
 		packet.position(offset);
-		
+		FVLog.log(LogLevel.MOBUG, null, "packet: ",packet.toString());
 		sliceName = StringByteSerializer.readFrom(packet, sliceLen);
 		fvName = StringByteSerializer.readFrom(packet, flowLen);
 
-		FVLog.log(LogLevel.DEBUG, null, "sliceName = ", sliceName, "fvName= ", fvName);
-		
 		//Check for the OUI Id and its subtype from backwards -
 		offset -= 1;
 		FVLog.log(LogLevel.DEBUG, null, " OUI Subtype: ",packet.get(offset));
@@ -237,7 +241,12 @@ public static LLDPTrailer getTrailer(FVPacketIn pi) {
 			FVLog.log(LogLevel.ALERT, null, "Wrong OUI2");
 		}
 		catch(IndexOutOfBoundsException ioe){
-			FVLog.log(LogLevel.CRIT, null, "Yikes! The LLDP packet-in is not well formed - IndexOutOfBound while getting the trailer ");
+			FVLog.log(LogLevel.CRIT, null, "Yikes! The LLDP packet-in is not well formed - " +
+					"		IndexOutOfBound while getting the trailer ",ioe);
+		}
+		catch(IllegalArgumentException iae){
+			FVLog.log(LogLevel.CRIT, null, "Yikes! Got an illegal argument-something wrong " +
+					"		with the positioning of the offset in the ByteBuffer! ",iae);
 		}
 
 		/*offset = offset - (OUI_HEADER_LEN + TTL_LEN + TTL_HEADER_LEN + PORT_LEN);

src/org/flowvisor/message/lldp/LLDPUtil.java

@@ -50,6 +50,7 @@ static public boolean handleLLDPFromController(FVPacketOut po,
 		if (!LLDPCheck(po.getPacketData()))
 			return false;
 		String fvName = FlowVisor.getInstance().getInstanceName();
+		FVLog.log(LogLevel.DEBUG,null,"fvName is: ",fvName, "sliceName is: ", fvSlicer.getSliceName() );
 		/**
 		 * This is a hack to ensure that the resulting lldp packet is larger
 		 * than 60: #133
@@ -110,10 +111,13 @@ static private boolean LLDPCheck(byte[] packetArray) {
 			return false; // not lddp if no packet exists or too short
 		ByteBuffer packet = ByteBuffer.wrap(packetArray);
 		short ether_type = packet.getShort(12);
+		FVLog.log(LogLevel.DEBUG,null,"Checking if the pkt is LLDP?", ether_type );
 		if (ether_type == ETHER_VLAN)
 			ether_type = packet.getShort(16);
-		if (ether_type != ETHER_LLDP)
+		if (ether_type != ETHER_LLDP){
+			FVLog.log(LogLevel.DEBUG,null,"The pkt is not LLDP" );
 			return false;
+		}
 		// TODO think about checking for NOX OID
 		return true;
 	}