[Javanetsim-cvs] javaNetSim/core EthernetNetworkInterface.java, 1.6, 1.7 Simulation.java, 1.9, 1.10 Version.java, 1.4, 1.5

[Alexander B. <da...@us...>]

Update of /cvsroot/javanetsim/javaNetSim/core
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15455/core

Modified Files:
	EthernetNetworkInterface.java Simulation.java Version.java 
Log Message:


Index: EthernetNetworkInterface.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/EthernetNetworkInterface.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EthernetNetworkInterface.java	23 Feb 2006 11:56:00 -0000	1.6
--- EthernetNetworkInterface.java	12 Oct 2006 16:14:14 -0000	1.7
***************
*** 102,106 ****
  			pingInfo.setDataType("Ethernet Packet");
  			pingInfo.setLayer("Link");
! 			pingInfo.setDescription("Recieved packet at interface "+MACAddress);
  			Simulation.addLayerInfo(pingInfo);
  	    	Packet temp = tempPacket.getData();
--- 102,106 ----
  			pingInfo.setDataType("Ethernet Packet");
  			pingInfo.setLayer("Link");
! 			pingInfo.setDescription("Recieved and accepted packet at interface " + MACAddress);
  			Simulation.addLayerInfo(pingInfo);
  	    	Packet temp = tempPacket.getData();
***************
*** 109,113 ****
  	    }else{
  	        //Packet is not for the Interface Drop Packet and record something in 
! 	        //the Layerinfo object	        
  	    }	    
  	}
--- 109,119 ----
  	    }else{
  	        //Packet is not for the Interface Drop Packet and record something in 
! 	        //the Layerinfo object	 
!                         LayerInfo pingInfo = new LayerInfo(getClass().getName());
! 			pingInfo.setObjectName(parentNode.getName());
! 			pingInfo.setDataType("Ethernet Packet");
! 			pingInfo.setLayer("Link");
! 			pingInfo.setDescription("Recieved and dropped packet at interface " + MACAddress);
! 			Simulation.addLayerInfo(pingInfo);                      
  	    }	    
  	}

Index: Simulation.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/Simulation.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Simulation.java	22 Feb 2006 16:29:30 -0000	1.9
--- Simulation.java	12 Oct 2006 16:14:14 -0000	1.10
***************
*** 121,124 ****
--- 121,125 ----
  	private static LayerInfoHandler Info = new LayerInfoHandler();
  	private static int PROTOCOL_TYPE;
+                 
  
  	// A script is just a Vector containing Strings right now
***************
*** 147,151 ****
  		linkTable = new Hashtable();
  		nodeTable = new Hashtable();
! 	}
  	
  	/**
--- 148,152 ----
  		linkTable = new Hashtable();
  		nodeTable = new Hashtable();
!         }
  	
  	/**

Index: Version.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/Version.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Version.java	12 Oct 2006 15:21:23 -0000	1.4
--- Version.java	12 Oct 2006 16:14:14 -0000	1.5
***************
*** 39,43 ****
   */
  public class Version {
! 	public final static String CORE_VERSION = "v0.31";		//version of the simulation core
  	
  	public static final String TEAM_MEMBERS[] = { 
--- 39,43 ----
   */
  public class Version {
! 	public final static String CORE_VERSION = "v0.32";		//version of the simulation core
  	
  	public static final String TEAM_MEMBERS[] = {