[Javanetsim-cvs] javaNetSim/core CSUDSU.java, 1.2, 1.3 Hub.java, 1.7, 1.8 Node.java, 1.16, 1.17 PC.
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] javaNetSim/core CSUDSU.java, 1.2, 1.3 Hub.java, 1.7, 1.8 Node.java, 1.16, 1.17 PC.java, 1.16, 1.17 Router.java, 1.7, 1.8 Simulation.java, 1.22, 1.23 Switch.java, 1.8, 1.9
|
From: Alexander B. <da...@us...> - 2007-10-19 17:40:41
|
Update of /cvsroot/javanetsim/javaNetSim/core In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv532/core Modified Files: CSUDSU.java Hub.java Node.java PC.java Router.java Simulation.java Switch.java Log Message: Minor savefile changes and fixes; new device variations added. Index: PC.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/PC.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** PC.java 19 Oct 2007 08:52:26 -0000 1.16 --- PC.java 19 Oct 2007 17:40:33 -0000 1.17 *************** *** 105,114 **** */ protected PC(String inName, boolean inOn) { ! super(inName,7, inOn); ! //initApplications() have been called in ApplicaitonLayerDevice ! addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.Ethernet10T) + "0", NetworkInterface.Ethernet10T, true); ! addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.Console) + "0", NetworkInterface.Console, false); ! //addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.Wireless) + "0", NetworkInterface.Wireless, true); ! //addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.WAN) + "0" + "_" + (int)(Math.random()*1000), NetworkInterface.WAN, true); } --- 105,109 ---- */ protected PC(String inName, boolean inOn) { ! super(inName,7, inOn); } Index: Node.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/Node.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Node.java 19 Oct 2007 15:57:00 -0000 1.16 --- Node.java 19 Oct 2007 17:40:33 -0000 1.17 *************** *** 270,274 **** * */ ! protected void addNetworkInterface(String interfaceName, int type, boolean active) { switch(type){ --- 270,274 ---- * */ ! public void addNetworkInterface(String interfaceName, int type, boolean active) { switch(type){ Index: Simulation.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/Simulation.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Simulation.java 19 Oct 2007 15:57:00 -0000 1.22 --- Simulation.java 19 Oct 2007 17:40:33 -0000 1.23 *************** *** 1058,1064 **** * @version v0.20 **/ ! public void addSwitch(String inNodeName, boolean inOn, int c, int p) throws InvalidNodeNameException { if(!nodeTable.containsKey(inNodeName)){ ! nodeTable.put(inNodeName, new Switch(inNodeName, inOn, c, p)); }else{ throw new InvalidNodeNameException("Node already exists with same name"); --- 1058,1064 ---- * @version v0.20 **/ ! public void addSwitch(String inNodeName, boolean inOn) throws InvalidNodeNameException { if(!nodeTable.containsKey(inNodeName)){ ! nodeTable.put(inNodeName, new Switch(inNodeName, inOn)); }else{ throw new InvalidNodeNameException("Node already exists with same name"); Index: Hub.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/Hub.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Hub.java 19 Oct 2007 08:52:26 -0000 1.7 --- Hub.java 19 Oct 2007 17:40:33 -0000 1.8 *************** *** 56,65 **** public Hub(String inName, boolean inOn) { ! super(inName, 1, inOn); //pass name and protocolstack layer ! addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.Ethernet10T) + "0", NetworkInterface.Ethernet10T, false); ! addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.Ethernet10T) + "1", NetworkInterface.Ethernet10T, false); ! addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.Ethernet10T) + "2", NetworkInterface.Ethernet10T, false); ! addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.Ethernet10T) + "3", NetworkInterface.Ethernet10T, false); ! addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.Ethernet10T) + "4", NetworkInterface.Ethernet10T, false); } --- 56,60 ---- public Hub(String inName, boolean inOn) { ! super(inName, 1, inOn); //pass name and protocolstack layer } Index: Router.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/Router.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Router.java 19 Oct 2007 15:57:00 -0000 1.7 --- Router.java 19 Oct 2007 17:40:33 -0000 1.8 *************** *** 46,55 **** **/ protected Router(String inName, boolean inOn) { ! super(inName,3, inOn); ! addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.Ethernet10T) + "0", NetworkInterface.Ethernet10T, true); ! addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.Ethernet10T) + "1", NetworkInterface.Ethernet10T, true); ! addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.Console) + "0", NetworkInterface.Console, false); ! addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.Serial) + "0", NetworkInterface.Serial, true); ! addNetworkInterface(NetworkInterface.getIntName(NetworkInterface.Ethernet100FX) + "0", NetworkInterface.Ethernet100FX, true); } --- 46,50 ---- **/ protected Router(String inName, boolean inOn) { ! super(inName,3, inOn); } Index: Switch.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/Switch.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Switch.java 19 Oct 2007 15:57:01 -0000 1.8 --- Switch.java 19 Oct 2007 17:40:33 -0000 1.9 *************** *** 56,86 **** Hashtable IntCaches; ! public int Copper_ports; ! public int Fiber_ports; ! ! ! public Switch(String inName, boolean inOn, int cports, int fports) { super(inName, 1, inOn); //pass name and protocolstack layer ! IntCaches = new Hashtable(); ! String name = NetworkInterface.getIntName(NetworkInterface.Ethernet10T); ! ! Copper_ports = cports; ! Fiber_ports = fports; ! ! for(int j = 0; j < cports; j++){ ! addNetworkInterface(name + j, NetworkInterface.Ethernet10T, false); ! IntCaches.put(name + j, new Hashtable()); ! } ! ! name = NetworkInterface.getIntName(NetworkInterface.Ethernet100FX); ! ! for(int j = 0; j < fports; j++){ ! addNetworkInterface(name + j, NetworkInterface.Ethernet100FX, false); ! IntCaches.put(name + j, new Hashtable()); ! } } public void Reset(){ sz = 0; --- 56,73 ---- Hashtable IntCaches; ! public Switch(String inName, boolean inOn) { super(inName, 1, inOn); //pass name and protocolstack layer ! IntCaches = new Hashtable(); } + public void addNetworkInterface(String name, int type, boolean active){ + if(!active){ + super.addNetworkInterface(name, type, false); + IntCaches.put(name, new Hashtable()); + } + } + public void Reset(){ sz = 0; Index: CSUDSU.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/CSUDSU.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CSUDSU.java 19 Oct 2007 08:52:26 -0000 1.2 --- CSUDSU.java 19 Oct 2007 17:40:33 -0000 1.3 *************** *** 38,50 **** public CSUDSU(String inName, boolean inOn) { super(inName, 1, inOn); //pass name and protocolstack layer - - lanPort = "ser0"; - wanPort = "wan0" + "_" + (int)(Math.random()*1000); - - addNetworkInterface(lanPort, NetworkInterface.Serial, false); - addNetworkInterface(wanPort, NetworkInterface.WAN, false); - } public void Reset(){ --- 38,60 ---- public CSUDSU(String inName, boolean inOn) { super(inName, 1, inOn); //pass name and protocolstack layer } + public void addSerialInterface(){ + lanPort = "ser0"; + addNetworkInterface(lanPort, NetworkInterface.Serial, false); + } + + public void addWANInterface(){ + wanPort = "wan0" + "_" + (int)(Math.random()*1000); + addNetworkInterface(wanPort, NetworkInterface.WAN, false); + } + + public void setLAN(String lan){ + lanPort = lan; + } + + public void setWAN(String wan){ + wanPort = wan; + } public void Reset(){ |
