Commit b29bb4ca authored by juvancic's avatar juvancic
Browse files

updated TA

parent 79c27bd1

javasrc/com/iskratel/ttcn/tri/ReadCaptureThread.java

+51 −3
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public class ReadCaptureThread extends Thread implements Runnable{ 
	  

	  public void packetArrived(Packet packet) {

	    this.counter++;

	    //String type = packet.getClass().getName();

	    String type = packet.getClass().getName();

	    //System.out.println(name + ": Packet(" + counter + ") is of type " + type + ".");

	    //log.debug(name + ": Packet(" + counter + ") is of type " + type +".");
@@ -120,6 +120,24 @@ public class ReadCaptureThread extends Thread implements Runnable{ 
//	    	//System.err.println(((EthernetPacket)(packet)).getProtocol());

//	    }

	    

	    if(packet instanceof IPPacket) {

 	    	IPPacket ipPacket = (IPPacket)packet;

 	    	byte[] message = ipPacket.getData();//.getTCPData();//TODO: assume data is in one packet

 	    	    

 	    	String srcHost = ipPacket.getSourceAddress();

 	    	String dstHost = ipPacket.getDestinationAddress();

 	    	//String isoData = new String(data);//, "ISO-8859-1");

 	    	log.debug(srcHost+" -> " + dstHost );//+ ": " + isoData);

 	    	log.debug(ipPacket.toColoredString(false));    

// 		    TriMessage triMessage =TriMessageImpl.valueOf(message);

// 			TriAddress triAddress = new TriAddressImpl(new byte[] {});

// 			

// 			synchronized(this.filterpackets.cte) { 

//				log.debug("ENQUE"+this.filterpackets.tsiPortId.toString()+" "+ this.filterpackets.componentId.getComponentName().toString());

//				this.filterpackets.cte.triEnqueueMsg(this.filterpackets.tsiPortId, triAddress, this.filterpackets.componentId, triMessage);

// 			}

 	    }

	    

    	if(packet instanceof TCPPacket) {

 	    	TCPPacket tcpPacket = (TCPPacket)packet;

 	    	byte[] message = tcpPacket.getData();//.getTCPData();//TODO: assume data is in one packet
@@ -128,6 +146,7 @@ public class ReadCaptureThread extends Thread implements Runnable{ 
 	    	String dstHost = tcpPacket.getDestinationAddress();

 	    	//String isoData = new String(data);//, "ISO-8859-1");

 	    	log.debug(srcHost+" -> " + dstHost );//+ ": " + isoData);

 	    	//log.debug(tcpPacket.toColoredString(false));

 	    	

 		    TriMessage triMessage =TriMessageImpl.valueOf(message);

 			TriAddress triAddress = new TriAddressImpl(new byte[] {});
@@ -146,6 +165,31 @@ public class ReadCaptureThread extends Thread implements Runnable{ 
 	    	String dstHost = udpPacket.getDestinationAddress();

 	    	//String isoData = new String(data);//, "ISO-8859-1");

 	    	log.debug(srcHost+" -> " + dstHost );//+ ": " + isoData);

 	    	//log.debug(udpPacket.toColoredString(false));

    

 		    TriMessage triMessage =TriMessageImpl.valueOf(message);

 			TriAddress triAddress = new TriAddressImpl(new byte[] {});

            

 			synchronized(this.filterpackets.cte) { 

				log.debug("ENQUE"+this.filterpackets.tsiPortId.toString()+" "+ this.filterpackets.componentId.getComponentName().toString());

				this.filterpackets.cte.triEnqueueMsg(this.filterpackets.tsiPortId, triAddress, this.filterpackets.componentId, triMessage);

 			}

 	    } 

 	    

 	    if (packet instanceof SCTPPacket){

	    	SCTPPacket sctpPacket = (SCTPPacket)packet;

	    	byte[] message = sctpPacket.getData();//.getUDPData();//TODO: assume data is in one packet

	    		    	

	    	String srcHost = sctpPacket.getSourceAddress();

	    	String dstHost = sctpPacket.getDestinationAddress();

	    	//String isoData = new String(data);//, "ISO-8859-1");

	    	log.debug(srcHost+" -> " + dstHost );//+ ": " + isoData);

	    	//log.debug(sctpPacket.toColoredString(false));

	    	

	    	int i=0;

	        while(i < sctpPacket.getChunks().size()) {

	

	        	message = (sctpPacket.getChunks().get(i).getUserData());

   

			    TriMessage triMessage =TriMessageImpl.valueOf(message);

				TriAddress triAddress = new TriAddressImpl(new byte[] {});
@@ -154,6 +198,10 @@ public class ReadCaptureThread extends Thread implements Runnable{ 
					log.debug("ENQUE"+this.filterpackets.tsiPortId.toString()+" "+ this.filterpackets.componentId.getComponentName().toString());

					this.filterpackets.cte.triEnqueueMsg(this.filterpackets.tsiPortId, triAddress, this.filterpackets.componentId, triMessage);

				}

	        	

	            i++;

	        }

	    	

	     }  

	  }