[Javanetsim-cvs] javaNetSim/core DataLinkLayerDevice.java, 1.6, 1.7 EthernetLink.java, 1.15, 1.16 EthernetNetworkInterface.java, 1.16, 1.17 NetworkInterface.java, 1.16, 1.17 NetworkInterfacePort.java, 1.8, 1.9 Node.java, 1.26, 1.27 SerialLink.java, 1.4, 1.5

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

Update of /cvsroot/javanetsim/javaNetSim/core
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27263/core

Modified Files:
	DataLinkLayerDevice.java EthernetLink.java 
	EthernetNetworkInterface.java NetworkInterface.java 
	NetworkInterfacePort.java Node.java SerialLink.java 
Log Message:



Index: EthernetLink.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/EthernetLink.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** EthernetLink.java	23 Sep 2008 15:22:09 -0000	1.15
--- EthernetLink.java	5 Oct 2008 19:12:30 -0000	1.16
***************
*** 53,57 ****
  	 * @throws InvalidLinkConnectionException
  	 */    
!         public EthernetLink(String inName, NetworkInterface inFirstNodeInterface, NetworkInterface inSecondNodeInterface)throws InvalidLinkConnectionException {
  		super(inName);		
  		NetworkInterfaces.add(inFirstNodeInterface);
--- 53,57 ----
  	 * @throws InvalidLinkConnectionException
  	 */    
!    public EthernetLink(String inName, NetworkInterface inFirstNodeInterface, NetworkInterface inSecondNodeInterface)throws InvalidLinkConnectionException {
  		super(inName);		
  		NetworkInterfaces.add(inFirstNodeInterface);
***************
*** 62,66 ****
  	}
          
!         public EthernetLink(String inName, NetworkInterface inFirstNodeInterface, NetworkInterface inSecondNodeInterface, double sieveCoeff)throws InvalidLinkConnectionException {
  		super(inName);		
  		NetworkInterfaces.add(inFirstNodeInterface);
--- 62,66 ----
  	}
          
!     public EthernetLink(String inName, NetworkInterface inFirstNodeInterface, NetworkInterface inSecondNodeInterface, double sieveCoeff)throws InvalidLinkConnectionException {
  		super(inName);		
  		NetworkInterfaces.add(inFirstNodeInterface);
***************
*** 83,98 ****
  	public void transportPacket(Ethernet_packet inPacket,String inSourceName) throws LowLinkException
  	{
! 	Iterator it = NetworkInterfaces.iterator();
!             while (it.hasNext())
!             {
! 		NetworkInterface temp = (NetworkInterface) it.next();
  		
! 		if(!temp.isOn()) return;
  		
! 		if (!temp.getSourceName().equals(inSourceName))
! 		{
                      //if( ((sievingCoefficient)/100)>Math.random())
                      if((sievingCoefficient)>rng.nextInt(100))
! 			temp.receivePacket(inPacket);
                      else{
                          LayerInfo frameErrInfo = new LayerInfo(getClass().getName());
--- 83,98 ----
  	public void transportPacket(Ethernet_packet inPacket,String inSourceName) throws LowLinkException
  	{
! 		Iterator it = NetworkInterfaces.iterator();
  		
!         while (it.hasNext()){
!         	NetworkInterface temp = (NetworkInterface) it.next();
  		
!         	if(!temp.isOn() || (!temp.isUP())) return;
! 		
!         	if (!temp.getSourceName().equals(inSourceName))
!         	{
                      //if( ((sievingCoefficient)/100)>Math.random())
                      if((sievingCoefficient)>rng.nextInt(100))
!                     	temp.receivePacket(inPacket);
                      else{
                          LayerInfo frameErrInfo = new LayerInfo(getClass().getName());
***************
*** 109,116 ****
                     
                     if(cat==1)
! 			temp.receivePacket(inPacket);
                     else throw new LowLinkException("(***) Packet lost due to physical link problems!");*/
! 		}
!             }
!         }
  }
--- 109,116 ----
                     
                     if(cat==1)
! 						temp.receivePacket(inPacket);
                     else throw new LowLinkException("(***) Packet lost due to physical link problems!");*/
!         	}
!        }
!    }
  }

Index: Node.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/Node.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Node.java	5 Oct 2008 18:41:06 -0000	1.26
--- Node.java	5 Oct 2008 19:12:31 -0000	1.27
***************
*** 461,464 ****
--- 461,480 ----
      }
      
+     public void ifacesLinkUP(){
+     	
+ 		Enumeration keys = NetworkInterfacetable.keys();
+ 
+ 		while(keys.hasMoreElements()){
+ 
+ 			String str = (String)keys.nextElement();
+ 
+ 			NetworkInterface temp = (NetworkInterface)NetworkInterfacetable.get(str);
+ 
+ 			if(!temp.isActive())
+ 				temp.setUP();
+ 			
+ 		}
+     }
+     
      protected void ifacesDOWN(){
      	Enumeration keys = NetworkInterfacetable.keys();

Index: NetworkInterfacePort.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/NetworkInterfacePort.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** NetworkInterfacePort.java	5 Oct 2008 18:41:06 -0000	1.8
--- NetworkInterfacePort.java	5 Oct 2008 19:12:31 -0000	1.9
***************
*** 118,121 ****
--- 118,130 ----
  
    	}
+   	
+   	protected NetworkInterfacePort(long UID, String inName, Node inParent, boolean inUP) {
+ 
+     	super(UID, inName,inParent);
+     	
+     	if(inUP)
+     		setUP();
+ 
+   	}
  
  

Index: SerialLink.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/SerialLink.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SerialLink.java	23 Sep 2008 15:22:11 -0000	1.4
--- SerialLink.java	5 Oct 2008 19:12:31 -0000	1.5
***************
*** 61,75 ****
  	public void transportPacket(Serial_packet inPacket,String inSourceName) throws LowLinkException
  	{
! 	Iterator it = NetworkInterfaces.iterator();
!             while (it.hasNext())
!             {
                      	
! 		NetworkInterface temp = (NetworkInterface) it.next();
! 		if(!temp.isOn()) return;
! 		if (!temp.getSourceName().equals(inSourceName))
! 		{
                      temp.receivePacket(inPacket);
! 		}
!             }
          }
  }
--- 61,76 ----
  	public void transportPacket(Serial_packet inPacket,String inSourceName) throws LowLinkException
  	{
! 		Iterator it = NetworkInterfaces.iterator();
!         while (it.hasNext()){
                      	
!         	NetworkInterface temp = (NetworkInterface) it.next();
!         	
!         	if(!temp.isOn()  || !temp.isUP()) return;
! 		
!         	if (!temp.getSourceName().equals(inSourceName))
!         	{
                      temp.receivePacket(inPacket);
!         	}
          }
+     }
  }

Index: NetworkInterface.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/NetworkInterface.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** NetworkInterface.java	26 Sep 2008 17:53:48 -0000	1.16
--- NetworkInterface.java	5 Oct 2008 19:12:30 -0000	1.17
***************
*** 134,137 ****
--- 134,141 ----
          protected String description = "";
          
+         public void setUP(){
+         	up = true;
+         }
+         
          public void UP(){
              up = true;

Index: DataLinkLayerDevice.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/DataLinkLayerDevice.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DataLinkLayerDevice.java	26 Sep 2008 17:53:48 -0000	1.6
--- DataLinkLayerDevice.java	5 Oct 2008 19:12:30 -0000	1.7
***************
*** 44,48 ****
  	 */
      public DataLinkLayerDevice(String inName, int inProtocolStackLayers, boolean inOn) {
! 		super(inName, inProtocolStackLayers, inOn);		
  	}
  	
--- 44,48 ----
  	 */
      public DataLinkLayerDevice(String inName, int inProtocolStackLayers, boolean inOn) {
! 		super(inName, inProtocolStackLayers, inOn);
  	}
  	
***************
*** 55,60 ****
  	
  	protected void addNetworkInterface(String interfaceName) {
!             NetworkInterfacetable.put(interfaceName,new NetworkInterfacePort(core.Simulation.UIDGen++,interfaceName,this));
      }
          
      public Object[] getAllInterfaces(){
--- 55,66 ----
  	
  	protected void addNetworkInterface(String interfaceName) {
!             NetworkInterfacetable.put(interfaceName,new NetworkInterfacePort(core.Simulation.UIDGen++,interfaceName,this,true));            
      }
+ 	
+ 	 public void turnOn() {
+ 	     super.turnOn();
+ 	        
+ 	     ifacesLinkUP();	        
+ 	 }
          
      public Object[] getAllInterfaces(){

Index: EthernetNetworkInterface.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/EthernetNetworkInterface.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** EthernetNetworkInterface.java	5 Oct 2008 18:41:06 -0000	1.16
--- EthernetNetworkInterface.java	5 Oct 2008 19:12:30 -0000	1.17
***************
*** 155,158 ****
--- 155,160 ----
  	protected void sendPacket(Packet inPacket, String inMacAddress) throws LowLinkException {
  
+ 		if(!parentNode.On || !up) return;
+ 		
  		Ethernet_packet Packet = new Ethernet_packet(inPacket,inMacAddress, MACAddress);
  		//if(Packet.getHopCount()>255) throw new CommunicationException("Hub buffer overflow (packet loop flood?).");