[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip SNMP.java,1.12,1.13 Telnet_client.java,1.6,1.7 Telnet_server.java,1.6,1.7

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

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

Modified Files:
	SNMP.java Telnet_client.java Telnet_server.java 
Log Message:


Index: Telnet_client.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Telnet_client.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Telnet_client.java	25 Feb 2006 22:48:34 -0000	1.6
--- Telnet_client.java	27 Feb 2006 00:49:09 -0000	1.7
***************
*** 186,190 ****
              if(Data.compareTo("\nQUIT")==0) {
                  Disconnect();
!                 terminal.recvData("\nClient: closing connection\n");
              }
              terminal.recvData(Data);            
--- 186,190 ----
              if(Data.compareTo("\nQUIT")==0) {
                  Disconnect();
! //                terminal.recvData("Client: closing connection\n");
              }
              terminal.recvData(Data);            

Index: Telnet_server.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Telnet_server.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Telnet_server.java	25 Feb 2006 22:48:34 -0000	1.6
--- Telnet_server.java	27 Feb 2006 00:49:09 -0000	1.7
***************
*** 233,238 ****
                          }
                          else {
!                             cmdline = removeSpaces(cmdline);
!                             outData = "\n" + runcmd(cmdline);
                          }
                          cmdline = "";
--- 233,237 ----
                          }
                          else {
!                             outData = "\n" + runcmd(removeSpaces(cmdline));
                          }
                          cmdline = "";
***************
*** 252,256 ****
                                  }
                                  else {
!                                     outData = "<" + ( ch < 16 ? "0" : "" ) + Integer.toHexString(ch) + ">";
                                  }
                  }
--- 251,255 ----
                                  }
                                  else {
! //                                    outData = "<" + ( ch < 16 ? "0" : "" ) + Integer.toHexString(ch) + ">";
                                  }
                  }
***************
*** 357,368 ****
                      }
                      SNMP snmpa = (SNMP) mDevice.getApp(161);
-                     snmpa.setPassword(l_pass);
-                     snmpa.setPort(l_port);
                      try{
!                         snmpa.Listen();
!                         out+="Now SNMP agent listen on port " + String.valueOf(l_port) + "\n";
                      }
                      catch(TransportLayerException e) {
!                         out+="Unable to open connection on SNMP agent\n";
                      }
                  }    
--- 356,374 ----
                      }
                      SNMP snmpa = (SNMP) mDevice.getApp(161);
                      try{
!                         snmpa.Close();
!                         out+="SNMP agent stoped\n";
!                         snmpa.setPassword(l_pass);
!                         snmpa.setPort(l_port);
!                         try{
!                             snmpa.Listen();
!                             out+="Now SNMP agent listen on port " + String.valueOf(l_port) + "\n";
!                         }
!                         catch(TransportLayerException e) {
!                             out+="Unable to open connection on SNMP agent\n";
!                         }
                      }
                      catch(TransportLayerException e) {
!                         out+="Unable to close connection on SNMP agent\n";
                      }
                  }    
***************
*** 451,454 ****
--- 457,468 ----
          Simulation.addLayerInfo(protInfo3);
      }
+     
+     public void setPassword(String s) {
+         password = s;
+     }
+     
+     public String getPassword() {
+         return password;
+     }
  
  }

Index: SNMP.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/SNMP.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SNMP.java	25 Feb 2006 22:48:33 -0000	1.12
--- SNMP.java	27 Feb 2006 00:49:09 -0000	1.13
***************
*** 978,982 ****
              }
              else {
!                 m_errorstatus=SNMP_ERROR_wrongEncoding;
                  return false;
              }
--- 978,982 ----
              }
              else {
!                 m_errorstatus=SNMP_ERROR_genErr;
                  return false;
              }
***************
*** 1028,1032 ****
                  }
                  else {
!                     m_errorstatus = SNMP_ERROR_wrongEncoding;
                      return false;
                  }
--- 1028,1032 ----
                  }
                  else {
!                     m_errorstatus = SNMP_ERROR_genErr;
                      return false;
                  }