[Javanetsim-cvs] javaNetSim/core PC.java,1.7,1.8 Simulation.java,1.8,1.9

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

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

Modified Files:
	PC.java Simulation.java 
Log Message:


Index: PC.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/PC.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PC.java	9 Feb 2006 23:12:39 -0000	1.7
--- PC.java	22 Feb 2006 16:29:29 -0000	1.8
***************
*** 58,62 ****
  
  import core.protocolsuite.tcp_ip.Echo;
! 
  import core.protocolsuite.tcp_ip.Echo_tcp;
  import core.protocolsuite.tcp_ip.SNMP;
--- 58,63 ----
  
  import core.protocolsuite.tcp_ip.Echo;
! import core.protocolsuite.tcp_ip.Telnet_server;
! import core.protocolsuite.tcp_ip.Telnet_client;
  import core.protocolsuite.tcp_ip.Echo_tcp;
  import core.protocolsuite.tcp_ip.SNMP;
***************
*** 108,137 ****
               Echo echoClient = new Echo(NodeProtocolStack, 0, 0,  core.ProtocolStack.UIDGen++);
  
-              
- 
               Echo_tcp echotcpServer = new Echo_tcp(NodeProtocolStack, 17, 1,  core.ProtocolStack.UIDGen++);
  
               Echo_tcp echotcpClient = new Echo_tcp(NodeProtocolStack, 0, 0,  core.ProtocolStack.UIDGen++);
               
               SNMP snmpAgent = new SNMP(NodeProtocolStack, 161, 0, core.ProtocolStack.UIDGen++);
               SNMP snmpManager = new SNMP(NodeProtocolStack, 0, 1, core.ProtocolStack.UIDGen++);
  
-          
- 
               addApp(echoServer, 7);
  
               addApp(echoClient, 30007);
  
-              
- 
               addApp(echotcpServer, 17);
- 
               addApp(echotcpClient, 30017);
               
               addApp(snmpAgent, 161);
               addApp(snmpManager, 30161);
  
-              
- 
               addNetworkInterface("eth0");       
  
--- 109,137 ----
               Echo echoClient = new Echo(NodeProtocolStack, 0, 0,  core.ProtocolStack.UIDGen++);
  
               Echo_tcp echotcpServer = new Echo_tcp(NodeProtocolStack, 17, 1,  core.ProtocolStack.UIDGen++);
  
               Echo_tcp echotcpClient = new Echo_tcp(NodeProtocolStack, 0, 0,  core.ProtocolStack.UIDGen++);
               
+              Telnet_server telnetServer = new Telnet_server(NodeProtocolStack, 23, 1,  core.ProtocolStack.UIDGen++);
+ 
+              Telnet_client telnetClient = new Telnet_client(NodeProtocolStack, 0, 0,  core.ProtocolStack.UIDGen++);
+              
               SNMP snmpAgent = new SNMP(NodeProtocolStack, 161, 0, core.ProtocolStack.UIDGen++);
               SNMP snmpManager = new SNMP(NodeProtocolStack, 0, 1, core.ProtocolStack.UIDGen++);
  
               addApp(echoServer, 7);
  
               addApp(echoClient, 30007);
  
               addApp(echotcpServer, 17);
               addApp(echotcpClient, 30017);
+ 
+              addApp(telnetServer, 23);
+              addApp(telnetClient, 30023);
+ 
               
               addApp(snmpAgent, 161);
               addApp(snmpManager, 30161);
  
               addNetworkInterface("eth0");       
  

Index: Simulation.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/Simulation.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Simulation.java	8 Dec 2005 18:07:39 -0000	1.8
--- Simulation.java	22 Feb 2006 16:29:30 -0000	1.9
***************
*** 430,434 ****
  			if (temp instanceof NetworkLayerDevice){	//test if device is a network layer device
  				NetworkLayerDevice t = (NetworkLayerDevice)temp;
! 				macAddress = t.setIPAddress(inNodeInterface,inIPAddress);
  				updateARP(inIPAddress, macAddress, inNodeName);
                                  //t.addToARP(inIPAddress, macAddress);
--- 430,435 ----
  			if (temp instanceof NetworkLayerDevice){	//test if device is a network layer device
  				NetworkLayerDevice t = (NetworkLayerDevice)temp;
!                                 
!                                 macAddress = t.setIPAddress(inNodeInterface,inIPAddress);
  				updateARP(inIPAddress, macAddress, inNodeName);
                                  //t.addToARP(inIPAddress, macAddress);