[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip DHCPD.java, 1.11, 1.12 DNS.java, 1.5, 1.6 DNS_Message.java, 1.4, 1.5 Telnet_server.java, 1.25, 1.26

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

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

Modified Files:
	DHCPD.java DNS.java DNS_Message.java Telnet_server.java 
Log Message:
Warnings was corrected

Index: DNS_Message.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/DNS_Message.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DNS_Message.java	24 Oct 2008 16:18:48 -0000	1.4
--- DNS_Message.java	24 Oct 2008 17:46:42 -0000	1.5
***************
*** 35,39 ****
      public DNS_Message(int new_id, int QR, int opcode, int AA, int TC, int RD, int RA, int rcode, Vector<Query> query, Vector<Answer> answer, Vector<Object> access, Vector<Object> addit)
      {
!         //create DNS-message whith known simple parametres
          if(new_id==0){
          	if (DNS_Message.Counter == 16777216)
--- 35,39 ----
      public DNS_Message(int new_id, int QR, int opcode, int AA, int TC, int RD, int RA, int rcode, Vector<Query> query, Vector<Answer> answer, Vector<Object> access, Vector<Object> addit)
      {
!         //create DNS-message with known simple parameters
          if(new_id==0){
          	if (DNS_Message.Counter == 16777216)
***************
*** 60,66 ****
          }
          //May be parse access and form like answers
!         this.accesses = new Vector<Object>(0);
          //May be parse additional and form like answers
!         this.additionals = new Vector<Object>(0);
      }
      
--- 60,68 ----
          }
          //May be parse access and form like answers
!         if(access==null)
!         	this.accesses = new Vector<Object>(0);
          //May be parse additional and form like answers
!         if(addit==null)
!         	this.additionals = new Vector<Object>(0);
      }
      
***************
*** 210,224 ****
      
      public DName parseDomainName(String str, int begin){
!         int saveBegin = begin;
          String qName = new String();
!         int k = str.codePointAt(begin);
          while(k!=0)
          {
!         	int oldBegin = begin+1;
!             begin += k+1;
!             k = str.codePointAt(begin);
!             qName += str.substring(oldBegin, begin) + (k==0?"":".");
          }
!         return new DName(qName,begin+1-saveBegin);
      }
      
--- 212,226 ----
      
      public DName parseDomainName(String str, int begin){
!     	int cur = begin;
          String qName = new String();
!         int k = str.codePointAt(cur);
          while(k!=0)
          {
!         	int oldBegin = cur+1;
!         	cur += k+1;
!             k = str.codePointAt(cur);
!             qName += str.substring(oldBegin, cur) + (k==0?"":".");
          }
!         return new DName(qName,cur+1-begin);
      }
      
***************
*** 228,236 ****
      private Query parseQuery(String str, int begin)
      {
!     	int saveBegin = begin;
!     	DName dname = parseDomainName(str, begin);
!     	begin += dname.length;
!         Integer qType = new Integer(Str2ToInt(str.substring(begin,begin+2)));
!         return new Query(dname.name,qType,begin+4-saveBegin);
      }
      
--- 230,238 ----
      private Query parseQuery(String str, int begin)
      {
!     	int cur = begin;
!     	DName dname = parseDomainName(str, cur);
!     	cur += dname.length;
!         Integer qType = new Integer(Str2ToInt(str.substring(cur,cur+2)));
!         return new Query(dname.name,qType,cur+4-begin);
      }
      
***************
*** 240,250 ****
      private Answer parseAnswer(String str, int begin)
      {
!     	int saveBegin = begin;
!         Query qu = parseQuery(str, begin);
!         begin += qu.length;
!         int ttl = Str4ToInt(str.substring(begin,begin+4));
!         begin += 4;
!         int len = Str2ToInt(str.substring(begin,begin+2));
!         begin += 2;
          String aRes = "";
          int priority = 0;
--- 242,252 ----
      private Answer parseAnswer(String str, int begin)
      {
!     	int cur = begin;
!         Query qu = parseQuery(str, cur);
!         cur += qu.length;
!         int ttl = Str4ToInt(str.substring(cur,cur+4));
!         cur += 4;
!         int len = Str2ToInt(str.substring(cur,cur+2));
!         cur += 2;
          String aRes = "";
          int priority = 0;
***************
*** 252,256 ****
  	        case A_QUERY_TYPE:{
  	        	if(len==4){
! 	        		aRes = Integer.toString(str.codePointAt(begin))+"."+Integer.toString(str.codePointAt(begin+1))+"."+Integer.toString(str.codePointAt(begin+2))+"."+Integer.toString(str.codePointAt(begin+3));
  	        	}
  	        	break;
--- 254,258 ----
  	        case A_QUERY_TYPE:{
  	        	if(len==4){
! 	        		aRes = Integer.toString(str.codePointAt(cur))+"."+Integer.toString(str.codePointAt(cur+1))+"."+Integer.toString(str.codePointAt(cur+2))+"."+Integer.toString(str.codePointAt(cur+3));
  	        	}
  	        	break;
***************
*** 258,279 ****
  	        case PTR_QUERY_TYPE:
  	        case CNAME_QUERY_TYPE:{
! 	        	DName dname = parseDomainName(str, begin);
  	        	aRes = dname.name;
  	        	break;
  	        }
  	        case HINFO_QUERY_TYPE:{
! 	        	int hilen = str.codePointAt(begin);
! 	        	aRes = str.substring(begin+1,begin+hilen+1);
  	        	break;
  	        }
  	        case MX_QUERY_TYPE:{
! 	        	priority = Str2ToInt(str.substring(begin,begin+2));
! 	        	DName dname = parseDomainName(str, begin+2);
  	        	aRes = dname.name;
  	        	break;
  	        }
          }
!         begin += len;        
!         return new Answer(qu.name,qu.type,ttl,aRes,priority,begin-saveBegin);
      }
      
--- 260,281 ----
  	        case PTR_QUERY_TYPE:
  	        case CNAME_QUERY_TYPE:{
! 	        	DName dname = parseDomainName(str, cur);
  	        	aRes = dname.name;
  	        	break;
  	        }
  	        case HINFO_QUERY_TYPE:{
! 	        	int hilen = str.codePointAt(cur);
! 	        	aRes = str.substring(cur+1,cur+hilen+1);
  	        	break;
  	        }
  	        case MX_QUERY_TYPE:{
! 	        	priority = Str2ToInt(str.substring(cur,cur+2));
! 	        	DName dname = parseDomainName(str, cur+2);
  	        	aRes = dname.name;
  	        	break;
  	        }
          }
!         cur += len;        
!         return new Answer(qu.name,qu.type,ttl,aRes,priority,cur-begin);
      }
      

Index: DHCPD.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/DHCPD.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DHCPD.java	24 Oct 2008 16:18:48 -0000	1.11
--- DHCPD.java	24 Oct 2008 17:46:42 -0000	1.12
***************
*** 185,190 ****
          String IP;
                  
!         for(Enumeration e = leases.keys(); e.hasMoreElements();){
!             IP = (String)e.nextElement();
              if((leases.get(IP)).MAC.equals(MAC)){
                  return IP;
--- 185,190 ----
          String IP;
                  
!         for(Enumeration<String> e = leases.keys(); e.hasMoreElements();){
!             IP = e.nextElement();
              if((leases.get(IP)).MAC.equals(MAC)){
                  return IP;
***************
*** 204,209 ****
          String PoolName;
          
!         for(Enumeration e = pools.keys(); e.hasMoreElements();){
!             PoolName =  (String)e.nextElement();
              pool p = pools.get(PoolName);
              
--- 204,209 ----
          String PoolName;
          
!         for(Enumeration<String> e = pools.keys(); e.hasMoreElements();){
!             PoolName =  e.nextElement();
              pool p = pools.get(PoolName);
              

Index: Telnet_server.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Telnet_server.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Telnet_server.java	24 Oct 2008 16:18:48 -0000	1.25
--- Telnet_server.java	24 Oct 2008 17:46:42 -0000	1.26
***************
*** 46,50 ****
      private boolean isnewpass=false;
      private String temp = "";
!     public Hashtable connections = new Hashtable();
      
      /** Creates a new instance of Telnet Server */
--- 46,50 ----
      private boolean isnewpass=false;
      private String temp = "";
!     public Hashtable<Integer,TSession> connections = new Hashtable<Integer,TSession>();
      
      /** Creates a new instance of Telnet Server */
***************
*** 93,99 ****
          running = false;
          mParentStack.SL().close(appSock);
!         Enumeration keys = connections.keys();
          while(keys.hasMoreElements()){
!             Integer key = (Integer)keys.nextElement();
              mParentStack.SL().close(key.intValue());
              connections.remove(key);
--- 93,99 ----
          running = false;
          mParentStack.SL().close(appSock);
!         Enumeration<Integer> keys = connections.keys();
          while(keys.hasMoreElements()){
!             Integer key = keys.nextElement();
              mParentStack.SL().close(key.intValue());
              connections.remove(key);
***************
*** 106,112 ****
      {              
          mParentStack.SL().free(appSock);
!         Enumeration keys = connections.keys();
          while(keys.hasMoreElements()){
!             Integer key = (Integer)keys.nextElement();
              mParentStack.SL().free(key.intValue());
              connections.remove(key);
--- 106,112 ----
      {              
          mParentStack.SL().free(appSock);
!         Enumeration<Integer> keys = connections.keys();
          while(keys.hasMoreElements()){
!             Integer key = keys.nextElement();
              mParentStack.SL().free(key.intValue());
              connections.remove(key);
***************
*** 191,200 ****
      */
      public void RecvData(int sock, String Data) throws LowLinkException, TransportLayerException {
!   
!         printLayerInfo("Server: recieving message '" + Data + "' from client.");
          String outData="";
  
!         while(Data.length()>0) {
!             int ch = (char)Data.charAt(0);
              switch(ch) {
                  case 0x08:  {
--- 191,200 ----
      */
      public void RecvData(int sock, String Data) throws LowLinkException, TransportLayerException {
!     	String new_data = Data;
!         printLayerInfo("Server: recieving message '" + new_data + "' from client.");
          String outData="";
  
!         while(new_data.length()>0) {
!             int ch = new_data.charAt(0);
              switch(ch) {
                  case 0x08:  {
***************
*** 216,220 ****
                          ispass = false;
                          if(isAuth(temp, cmdline)) {
!                             ((TSession)connections.get(new Integer(sock))).user = temp;
                              outData += "\r\nWelcome to " + mParentStack.getParentNodeName() + "\r\n" + runcmd("");
                          }
--- 216,220 ----
                          ispass = false;
                          if(isAuth(temp, cmdline)) {
!                             connections.get(new Integer(sock)).user = temp;
                              outData += "\r\nWelcome to " + mParentStack.getParentNodeName() + "\r\n" + runcmd("");
                          }
***************
*** 250,255 ****
                      }
                      cmdline = "";
!                     if(ch==0xD && (char)Data.charAt(1)==0xA) 
!                         Data = Data.substring(1);
                      break;
                  }              
--- 250,255 ----
                      }
                      cmdline = "";
!                     if(ch==0xD && new_data.charAt(1)==0xA) 
!                         new_data = new_data.substring(1);
                      break;
                  }              
***************
*** 262,268 ****
                                  }
                                  else {
!                                     outData += String.valueOf(Data.charAt(0));
                                  }
!                                 cmdline+=String.valueOf(Data.charAt(0));
                              }
                              else {
--- 262,268 ----
                                  }
                                  else {
!                                     outData += String.valueOf(new_data.charAt(0));
                                  }
!                                 cmdline+=String.valueOf(new_data.charAt(0));
                              }
                              else {
***************
*** 270,274 ****
                              }
              }
!             Data = Data.substring(1);
          }
          try{
--- 270,274 ----
                              }
              }
!             new_data = new_data.substring(1);
          }
          try{
***************
*** 441,447 ****
      
      private String removeSpaces(String s) {
!         while(s.startsWith(" ")) s = s.substring(1);
!         while(s.endsWith(" ")) s = s.substring(0, s.length()-1);
!         return s;
      }
      
--- 441,448 ----
      
      private String removeSpaces(String s) {
!     	String r = s;
!         while(r.startsWith(" ")) r = r.substring(1);
!         while(r.endsWith(" ")) r = r.substring(0, r.length()-1);
!         return r;
      }
      

Index: DNS.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/DNS.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DNS.java	24 Oct 2008 16:18:48 -0000	1.5
--- DNS.java	24 Oct 2008 17:46:42 -0000	1.6
***************
*** 368,373 ****
      }
      
!     public void addRecord(String dname, String value, int type){
!     	dname = dname.toLowerCase();
      	switch(type){
  	    	case DNS_Message.A_QUERY_TYPE: {
--- 368,373 ----
      }
      
!     public void addRecord(String name, String value, int type){
!     	String dname = name.toLowerCase();
      	switch(type){
  	    	case DNS_Message.A_QUERY_TYPE: {
***************
*** 455,460 ****
      }
      
!     public boolean removeRecord(String dname, String value, int type){
!     	dname = dname.toLowerCase();
      	boolean result = false;
      	switch(type){
--- 455,460 ----
      }
      
!     public boolean removeRecord(String name, String value, int type){
!     	String dname = name.toLowerCase();
      	boolean result = false;
      	switch(type){
***************
*** 551,567 ****
      public static boolean isValidName(String name){
      	if(name.length()==0) return false;
!     	name = name.toLowerCase();
!     	for(int i=0; i<name.length(); i++){
!     		char c = name.charAt(i);
      		if(!((c>='0' && c<='9') || (c>='a' && c<='z') || c=='-'  || c=='.')) return false;
      	}
!     	return (DNS.toInAddrArpa(name)==null); // name is not valid IP-address
      }
      
      public static boolean isValidMail(String name){
      	if(name.length()==0) return false;
!     	name = name.toLowerCase();
!     	for(int i=0; i<name.length(); i++){
!     		char c = name.charAt(i);
      		if(!((c>='0' && c<='9') || (c>='a' && c<='z') || c=='-'  || c=='.' || c=='@')) return false;
      	}
--- 551,567 ----
      public static boolean isValidName(String name){
      	if(name.length()==0) return false;
!     	String dname = name.toLowerCase();
!     	for(int i=0; i<dname.length(); i++){
!     		char c = dname.charAt(i);
      		if(!((c>='0' && c<='9') || (c>='a' && c<='z') || c=='-'  || c=='.')) return false;
      	}
!     	return (DNS.toInAddrArpa(dname)==null); // name is not valid IP-address
      }
      
      public static boolean isValidMail(String name){
      	if(name.length()==0) return false;
!     	String dname = name.toLowerCase();
!     	for(int i=0; i<dname.length(); i++){
!     		char c = dname.charAt(i);
      		if(!((c>='0' && c<='9') || (c>='a' && c<='z') || c=='-'  || c=='.' || c=='@')) return false;
      	}