[Javanetsim-cvs] javaNetSim/core ApplicationLayerDevice.java, 1.9, 1.10 CommandProcessor.java, 1.24, 1.25 NetworkLayerDevice.java, 1.24, 1.25

[QweR <qw...@us...>]

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

Modified Files:
	ApplicationLayerDevice.java CommandProcessor.java 
	NetworkLayerDevice.java 
Log Message:
telnet-server

Index: NetworkLayerDevice.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/NetworkLayerDevice.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** NetworkLayerDevice.java	13 Oct 2008 21:20:21 -0000	1.24
--- NetworkLayerDevice.java	13 Oct 2008 22:52:07 -0000	1.25
***************
*** 76,79 ****
--- 76,80 ----
          public void turnOn(){
              super.turnOn();
+             initApplications();
              config.load();
          }
***************
*** 84,87 ****
--- 85,92 ----
              super.turnOff();
          }
+         
+         public void initApplications(){
+             
+         }
  	
  	/**

Index: CommandProcessor.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/CommandProcessor.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CommandProcessor.java	13 Oct 2008 19:36:35 -0000	1.24
--- CommandProcessor.java	13 Oct 2008 22:52:07 -0000	1.25
***************
*** 997,1009 ****
  					try {
  						NetworkInterface ni = device.getNetworkInterface(params.get(0));
! 						String natt = params.get(1);
! 						if(natt.equalsIgnoreCase("inside")){
! 							ni.setNAT(NetworkInterface.INSIDE_NAT);
! 						}
! 						else if(natt.equalsIgnoreCase("outside")){
! 							ni.setNAT(NetworkInterface.OUTSIDE_NAT);
  						}
  						else{
! 							out += "error: invalid parameter '"+natt+"'\n";
  						}
  					} catch (InvalidNetworkInterfaceNameException ex) {
--- 997,1014 ----
  					try {
  						NetworkInterface ni = device.getNetworkInterface(params.get(0));
! 						if(device.isActiveInterface(params.get(0))){
! 							String natt = params.get(1);
! 							if(natt.equalsIgnoreCase("inside")){
! 								ni.setNAT(NetworkInterface.INSIDE_NAT);
! 							}
! 							else if(natt.equalsIgnoreCase("outside")){
! 								ni.setNAT(NetworkInterface.OUTSIDE_NAT);
! 							}
! 							else{
! 								out += "error: invalid parameter '"+natt+"'\n";
! 							}
  						}
  						else{
! 							out += "error: interface "+params.get(0)+" is not active\n";
  						}
  					} catch (InvalidNetworkInterfaceNameException ex) {
***************
*** 1026,1044 ****
  					try {
  						NetworkInterface ni = device.getNetworkInterface(params.get(0));
! 						if(params.size()==1){
! 							ni.setNAT(NetworkInterface.NO_NAT);
! 						}
! 						else{
! 							String natt = params.get(1);
! 							if(natt.equalsIgnoreCase("inside") && ni.getNAT()==NetworkInterface.INSIDE_NAT){
! 								ni.setNAT(NetworkInterface.NO_NAT);
! 							}
! 							else if(natt.equalsIgnoreCase("outside") && ni.getNAT()==NetworkInterface.OUTSIDE_NAT){
  								ni.setNAT(NetworkInterface.NO_NAT);
  							}
  							else{
! 								out += "error: invalid parameter '"+natt+"'\n";
  							}
  						}
  					} catch (InvalidNetworkInterfaceNameException ex) {
  						out += "error: invalid inferface\n";
--- 1031,1054 ----
  					try {
  						NetworkInterface ni = device.getNetworkInterface(params.get(0));
! 						if(device.isActiveInterface(params.get(0))){
! 							if(params.size()==1){
  								ni.setNAT(NetworkInterface.NO_NAT);
  							}
  							else{
! 								String natt = params.get(1);
! 								if(natt.equalsIgnoreCase("inside") && ni.getNAT()==NetworkInterface.INSIDE_NAT){
! 									ni.setNAT(NetworkInterface.NO_NAT);
! 								}
! 								else if(natt.equalsIgnoreCase("outside") && ni.getNAT()==NetworkInterface.OUTSIDE_NAT){
! 									ni.setNAT(NetworkInterface.NO_NAT);
! 								}
! 								else{
! 									out += "error: invalid parameter '"+natt+"'\n";
! 								}
  							}
  						}
+ 						else{
+ 							out += "error: interface "+params.get(0)+" is not active\n";
+ 						}
  					} catch (InvalidNetworkInterfaceNameException ex) {
  						out += "error: invalid inferface\n";

Index: ApplicationLayerDevice.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/ApplicationLayerDevice.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ApplicationLayerDevice.java	22 Sep 2008 16:13:15 -0000	1.9
--- ApplicationLayerDevice.java	13 Oct 2008 22:52:07 -0000	1.10
***************
*** 52,56 ****
      public void turnOn(){
          super.turnOn();
!         initApplications();
      }
      
--- 52,56 ----
      public void turnOn(){
          super.turnOn();
!         //initApplications();
      }