javanetsim-cvs Mailing List for javaNetSim (Page 22)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	EthernetLink.java NetworkInterface.java 
Log Message:


Index: EthernetLink.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/EthernetLink.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EthernetLink.java	9 Sep 2006 13:43:58 -0000	1.10
--- EthernetLink.java	9 Nov 2006 15:31:55 -0000	1.11
***************
*** 88,92 ****
                      if( ((sievingCoefficient)/100)>Math.random())
  			temp.receivePacket(inPacket);
!                     else throw new LowLinkException("(***) Packet lost due to physical link problems!");
                      
                     /*int cat = FalseRandom.Kotochigov();
--- 88,100 ----
                      if( ((sievingCoefficient)/100)>Math.random())
  			temp.receivePacket(inPacket);
!                     else{
!                         LayerInfo frameErrInfo = new LayerInfo(getClass().getName());
!                         frameErrInfo.setObjectName(inSourceName);
!                         frameErrInfo.setDataType("Ethernet Packet");
!                         frameErrInfo.setLayer("Link");
!                         frameErrInfo.setDescription("(***) Packet lost due to physical link problems!");
!                         Simulation.addLayerInfo(frameErrInfo);
!                     }
! //                    else throw new LowLinkException("(***) Packet lost due to physical link problems!");
                      
                     /*int cat = FalseRandom.Kotochigov();

Index: NetworkInterface.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/NetworkInterface.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NetworkInterface.java	19 Nov 2005 21:53:51 -0000	1.3
--- NetworkInterface.java	9 Nov 2006 15:31:55 -0000	1.4
***************
*** 1,200 ****
! /*
! Java Firewall Simulator (jFirewallSim)
! 
! Copyright (c) 2004, jFirewallSim development team All rights reserved.
! 
! Redistribution and use in source and binary forms, with or without modification, are
! permitted provided that the following conditions are met:
! 
! 	- Redistributions of source code must retain the above copyright notice, this list
! 	  of conditions and the following disclaimer.
! 	- Redistributions in binary form must reproduce the above copyright notice, this list
! 	  of conditions and the following disclaimer in the documentation and/or other
! 	  materials provided with the distribution.
! 	- Neither the name of the Canberra Institute of Technology nor the names of its
! 	  contributors may be used to endorse or promote products derived from this software
! 	  without specific prior written permission.
! 
! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
! THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
! EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
! HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
! TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
! EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
! */
! package core;
! import java.io.Serializable;
! /**
!  * A NetworkInterface represents the physical interface between
!  * a Node and a physical Link (network cable). Think of it as the NIC
!  * (Network Interface Card) of a Node.
!  *
!  * <P>Different Nodes can contain different numbers of NetworkInterfaces.
!  * A client PC usually only has one NetworkInterface, whereas a Router contains
!  * at least two. A Hub or a Switch often has 8 or 16.</P>
!  *
!  * <P>In order for a Node to be able to send or receive network information (packets),
!  * there must be a Link (network cable) between at least 2 NetworkInterfaces.</P>
!  *
!  * <P>NetworkInterfaces receive and send packets to and from DatalinkProtocols and
!  * the Link object they are connected to.</P>
!  *
!  * @author tristan_veness (Original Author)
!  * @author bevan_calliess
!  * @author luke_hamilton
!  * @since 19 September 2004
!  * @version v0.20
! */
! 
! abstract class NetworkInterface implements Serializable{
! 	/** The NetworkInterface's name, eg "eth0" */
! 	protected String name;
!   	/** The Link that this NetworkInterface is connected to */
! 	protected Link connectedLink;
! 	protected Node parentNode;
!   
!   	/**
!   	* Constructs a NetworkInterface object with the name inName and a reference to it's parent Node.
!   	* @author tristan_veness
!   	* @param inName - The name to give the NetworkInterface eg: eth0
!   	* @param parent - The Node that the NetworkInterface is to be added to, it's parent.
!   	* @version v0.10
!   	*/
!   	protected NetworkInterface(String inName, Node inParent) {
!     	name = inName;
! 		parentNode = inParent;			 
!   	}
! 
! 	/**
! 	 * This method reset the connected link to null
! 	 * @author luke_hamilton
! 	 * @version v0.20	 
! 	 */
! 	protected void resetConnectedLink() {
! 		connectedLink = null;
! 	}
! 
! 	/**
! 	 * This method will call the disconnectLink method on the 
! 	 * Connected link, and then set the connected link to null
! 	 * @author luke_hamilton
! 	 * @version v0.20
! 	 */
! 	protected void removeConnectedLink() {
! 		if(connectedLink != null){
! 			connectedLink.disconnectLink();
! 			connectedLink = null;
! 		}
! 	}
! 
! 	/**
! 	 * This method recevie a packet from a connected link and then pass it
! 	 * to the node's protocolstack.  Depending on the network any
! 	 * testing of the packets headers may need to be inserted here.
! 	 * This method is overridded by the subclasses on interface to suite
! 	 * there requirements 
! 	 * @author baven_calliess
! 	 * @param inPacket - A packet
! 	 * @version v0.20
! 	 */
! 	protected void receivePacket(Packet inPacket) throws LowLinkException {}
! 	
! 	/**
! 	 * This method sends a packet to a connected link Depending on
! 	 * @author bevan_calliess
! 	 * @param inPacket
! 	 * @version v0.20
! 	 */
! 	protected void sendPacket(Packet outPacket) throws LowLinkException {}
! 
!     /**
!     * Returns the NetworkInterface's name.
!     * @author bevan_calliess
!     * @return Name - The NetworkInterface's name 
!     * @version v0.20
!     */
!    
!     protected String getName() {
!         return name;
!     }
!     
!     /**
!      * This method is used by interfaces to uniquely identify themselves 
!      * in the simulation it will return a combination of the 
!      * Parent naodes name and the Interfaces name 
!      * eg. Node name PC1 interface eth0 will return "PC1eth0"
!      * @author bevan_calliess
!      * @return Name  - The Source name of this Node Interface 
!      * @version v0.20
!      */    
!      protected String getSourceName() {
!      	return parentNode.getName()+name;
!      }
!  
! 	 /**
! 	 * Sets the connectedLink attribute of the NetworkInterface with Link l.
! 	 *
! 	 * <P>This method should only be called by the Link class when an Interface is added or removed from the Link.</P>
! 	 * @author tristan_veness
! 	 * @param l  - The Link connected with this NetworkInterface. 
! 	 * @version v0.10
! 	 */
! 	 protected void setConnectedLink(Link l)throws InvalidLinkConnectionException {
! 			if(connectedLink == null){
! 				connectedLink = l;	
! 			}else
! 				throw new InvalidLinkConnectionException("Network Interface is already connected. Delete Connected link first");
! 			
! 	 }
! 
! 	 /**
! 	 * Returns the Link that this NetworkInterface is connected to.
! 	 * @author tristan_veness
! 	 * @return The Link object that this NetworkInterface is connected to. null if it is not connected.
! 	 * @version v0.10
! 	 */
! 	 protected Link getConnectedLink() {
! 			return connectedLink;
! 	 }
! 	 
!           protected String getConnectedLinkName() {
!                         if(connectedLink!=null) return connectedLink.getName();
!                         else return null;
! 	 }
!          
! 	 /**
! 	  * This method returns the name of the network interface
! 	  * @author tristan_veness
! 	  * @return Name 
! 	  * @version v0.10
! 	  */	 
! 	 protected String getDetails(){
! 	 	return name;
! 	 }
! 	 
! 	 /**
! 	  * This method returns a string of information about if the network interface is connected of not.
! 	  * <P>This method is useful for a CLI or for debugging.</P>
! 	  * @author tristan_veness
! 	  * @return Name - Connection: link1
! 	  * @version v0.10
! 	  */
! 	 protected String getConnectLinkDetails(){
! 	 	if(connectedLink != null){
! 	 		return "Connection: "+ connectedLink.getName();
! 	 	}
! 	 		return "Connection: Not connected";	
! 	 }
! 	 
! 	 protected String getConnectLinkName()
! 	 {
! 	 	if(connectedLink !=null)
! 	 	{
! 	 		return (String)connectedLink.getName();
! 	 	}
! 	 		return "Not Connected";
! 	 }
! }//EOF
--- 1,400 ----
! /*
! 
! Java Firewall Simulator (jFirewallSim)
! 
! 
! 
! Copyright (c) 2004, jFirewallSim development team All rights reserved.
! 
! 
! 
! Redistribution and use in source and binary forms, with or without modification, are
! 
! permitted provided that the following conditions are met:
! 
! 
! 
! 	- Redistributions of source code must retain the above copyright notice, this list
! 
! 	  of conditions and the following disclaimer.
! 
! 	- Redistributions in binary form must reproduce the above copyright notice, this list
! 
! 	  of conditions and the following disclaimer in the documentation and/or other
! 
! 	  materials provided with the distribution.
! 
! 	- Neither the name of the Canberra Institute of Technology nor the names of its
! 
! 	  contributors may be used to endorse or promote products derived from this software
! 
! 	  without specific prior written permission.
! 
! 
! 
! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
! 
! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! 
! OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
! 
! THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
! 
! EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
! 
! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
! 
! HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
! 
! TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
! 
! EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
! 
! */
! 
! package core;
! 
! import java.io.Serializable;
! 
! /**
! 
!  * A NetworkInterface represents the physical interface between
! 
!  * a Node and a physical Link (network cable). Think of it as the NIC
! 
!  * (Network Interface Card) of a Node.
! 
!  *
! 
!  * <P>Different Nodes can contain different numbers of NetworkInterfaces.
! 
!  * A client PC usually only has one NetworkInterface, whereas a Router contains
! 
!  * at least two. A Hub or a Switch often has 8 or 16.</P>
! 
!  *
! 
!  * <P>In order for a Node to be able to send or receive network information (packets),
! 
!  * there must be a Link (network cable) between at least 2 NetworkInterfaces.</P>
! 
!  *
! 
!  * <P>NetworkInterfaces receive and send packets to and from DatalinkProtocols and
! 
!  * the Link object they are connected to.</P>
! 
!  *
! 
!  * @author tristan_veness (Original Author)
! 
!  * @author bevan_calliess
! 
!  * @author luke_hamilton
! 
!  * @since 19 September 2004
! 
!  * @version v0.20
! 
! */
! 
! 
! 
! abstract class NetworkInterface implements Serializable{
! 
! 	/** The NetworkInterface's name, eg "eth0" */
! 
! 	protected String name;
! 
!   	/** The Link that this NetworkInterface is connected to */
! 
! 	protected Link connectedLink;
! 
! 	protected Node parentNode;
! 
!   
! 
!   	/**
! 
!   	* Constructs a NetworkInterface object with the name inName and a reference to it's parent Node.
! 
!   	* @author tristan_veness
! 
!   	* @param inName - The name to give the NetworkInterface eg: eth0
! 
!   	* @param parent - The Node that the NetworkInterface is to be added to, it's parent.
! 
!   	* @version v0.10
! 
!   	*/
! 
!   	protected NetworkInterface(String inName, Node inParent) {
! 
!     	name = inName;
! 
! 		parentNode = inParent;			 
! 
!   	}
! 
! 
! 
! 	/**
! 
! 	 * This method reset the connected link to null
! 
! 	 * @author luke_hamilton
! 
! 	 * @version v0.20	 
! 
! 	 */
! 
! 	protected void resetConnectedLink() {
! 
! 		connectedLink = null;
! 
! 	}
! 
! 
! 
! 	/**
! 
! 	 * This method will call the disconnectLink method on the 
! 
! 	 * Connected link, and then set the connected link to null
! 
! 	 * @author luke_hamilton
! 
! 	 * @version v0.20
! 
! 	 */
! 
! 	protected void removeConnectedLink() {
! 
! 		if(connectedLink != null){
! 
! 			connectedLink.disconnectLink();
! 
! 			connectedLink = null;
! 
! 		}
! 
! 	}
! 
! 
! 
! 	/**
! 
! 	 * This method recevie a packet from a connected link and then pass it
! 
! 	 * to the node's protocolstack.  Depending on the network any
! 
! 	 * testing of the packets headers may need to be inserted here.
! 
! 	 * This method is overridded by the subclasses on interface to suite
! 
! 	 * there requirements 
! 
! 	 * @author baven_calliess
! 
! 	 * @param inPacket - A packet
! 
! 	 * @version v0.20
! 
! 	 */
! 
! 	protected void receivePacket(Packet inPacket) throws LowLinkException {}
! 
! 	
! 
! 	/**
! 
! 	 * This method sends a packet to a connected link Depending on
! 
! 	 * @author bevan_calliess
! 
! 	 * @param inPacket
! 
! 	 * @version v0.20
! 
! 	 */
! 
! 	protected void sendPacket(Packet outPacket) throws LowLinkException {}
! 
! 
! 
!     /**
! 
!     * Returns the NetworkInterface's name.
! 
!     * @author bevan_calliess
! 
!     * @return Name - The NetworkInterface's name 
! 
!     * @version v0.20
! 
!     */
! 
!    
! 
!     protected String getName() {
! 
!         return name;
! 
!     }
! 
!     
! 
!     /**
! 
!      * This method is used by interfaces to uniquely identify themselves 
! 
!      * in the simulation it will return a combination of the 
! 
!      * Parent naodes name and the Interfaces name 
! 
!      * eg. Node name PC1 interface eth0 will return "PC1eth0"
! 
!      * @author bevan_calliess
! 
!      * @return Name  - The Source name of this Node Interface 
! 
!      * @version v0.20
! 
!      */    
! 
!      protected String getSourceName() {
! 
!      	return parentNode.getName()+":"+name;
! 
!      }
! 
!  
! 
! 	 /**
! 
! 	 * Sets the connectedLink attribute of the NetworkInterface with Link l.
! 
! 	 *
! 
! 	 * <P>This method should only be called by the Link class when an Interface is added or removed from the Link.</P>
! 
! 	 * @author tristan_veness
! 
! 	 * @param l  - The Link connected with this NetworkInterface. 
! 
! 	 * @version v0.10
! 
! 	 */
! 
! 	 protected void setConnectedLink(Link l)throws InvalidLinkConnectionException {
! 
! 			if(connectedLink == null){
! 
! 				connectedLink = l;	
! 
! 			}else
! 
! 				throw new InvalidLinkConnectionException("Network Interface is already connected. Delete Connected link first");
! 
! 			
! 
! 	 }
! 
! 
! 
! 	 /**
! 
! 	 * Returns the Link that this NetworkInterface is connected to.
! 
! 	 * @author tristan_veness
! 
! 	 * @return The Link object that this NetworkInterface is connected to. null if it is not connected.
! 
! 	 * @version v0.10
! 
! 	 */
! 
! 	 protected Link getConnectedLink() {
! 
! 			return connectedLink;
! 
! 	 }
! 
! 	 
! 
!           protected String getConnectedLinkName() {
! 
!                         if(connectedLink!=null) return connectedLink.getName();
! 
!                         else return null;
! 
! 	 }
! 
!          
! 
! 	 /**
! 
! 	  * This method returns the name of the network interface
! 
! 	  * @author tristan_veness
! 
! 	  * @return Name 
! 
! 	  * @version v0.10
! 
! 	  */	 
! 
! 	 protected String getDetails(){
! 
! 	 	return name;
! 
! 	 }
! 
! 	 
! 
! 	 /**
! 
! 	  * This method returns a string of information about if the network interface is connected of not.
! 
! 	  * <P>This method is useful for a CLI or for debugging.</P>
! 
! 	  * @author tristan_veness
! 
! 	  * @return Name - Connection: link1
! 
! 	  * @version v0.10
! 
! 	  */
! 
! 	 protected String getConnectLinkDetails(){
! 
! 	 	if(connectedLink != null){
! 
! 	 		return "Connection: "+ connectedLink.getName();
! 
! 	 	}
! 
! 	 		return "Connection: Not connected";	
! 
! 	 }
! 
! 	 
! 
! 	 protected String getConnectLinkName()
! 
! 	 {
! 
! 	 	if(connectedLink !=null)
! 
! 	 	{
! 
! 	 		return (String)connectedLink.getName();
! 
! 	 	}
! 
! 	 		return "Not Connected";
! 
! 	 }
! 
! }//EOF
!

2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (120)	Dec (62)
2006	Jan (1)	Feb (69)	Mar (3)	Apr	May	Jun	Jul	Aug	Sep (76)	Oct (28)	Nov (77)	Dec (186)
2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (36)	Oct (61)	Nov (23)	Dec
2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (17)	Oct (105)	Nov (5)	Dec (1)
2009	Jan	Feb (4)	Mar	Apr	May	Jun	Jul	Aug	Sep (8)	Oct (9)	Nov	Dec

javanetsim-cvs Mailing List for javaNetSim (Page 22)

javanetsim-cvs — CVS Updates.