[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip DHCPD.java, 1.7, 1.8 DNS.java, 1.3, 1.4 IPV4Address.java, 1.6, 1.7

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

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

Modified Files:
	DHCPD.java DNS.java IPV4Address.java 
Log Message:
vlan command was added

Index: DNS.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/DNS.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DNS.java	18 Oct 2008 19:55:31 -0000	1.3
--- DNS.java	19 Oct 2008 21:40:19 -0000	1.4
***************
*** 155,159 ****
          if (Connect (host, port))
          {
!             SendData(mess+":"+Integer.toString(qType));
              return last_sent_id;
          }
--- 155,159 ----
          if (Connect (host, port))
          {
!             SendData(mess.toLowerCase()+":"+Integer.toString(qType));
              return last_sent_id;
          }
***************
*** 355,358 ****
--- 355,359 ----
      
      public void addRecord(String dname, String value, int type){
+     	dname = dname.toLowerCase();
      	switch(type){
  	    	case DNS_Message.A_QUERY_TYPE: {
***************
*** 364,373 ****
              		}
              		if(!found){
!             			ans.add(value);
              		}
              	}
  	    		else{
  	    			Vector<String> ans = new Vector<String>(1);
! 	    			ans.add(value);
  	    			records_a.put(dname, ans);
  	    		}
--- 365,374 ----
              		}
              		if(!found){
!             			ans.add(value.toLowerCase());
              		}
              	}
  	    		else{
  	    			Vector<String> ans = new Vector<String>(1);
! 	    			ans.add(value.toLowerCase());
  	    			records_a.put(dname, ans);
  	    		}
***************
*** 382,391 ****
              		}
              		if(!found){
!             			ans.add(value);
              		}
              	}
  	    		else{
  	    			Vector<String> ans = new Vector<String>(1);
! 	    			ans.add(value);
  	    			records_cname.put(dname, ans);
  	    		}
--- 383,392 ----
              		}
              		if(!found){
!             			ans.add(value.toLowerCase());
              		}
              	}
  	    		else{
  	    			Vector<String> ans = new Vector<String>(1);
! 	    			ans.add(value.toLowerCase());
  	    			records_cname.put(dname, ans);
  	    		}
***************
*** 400,409 ****
              		}
              		if(!found){
!             			ans.add(value);
              		}
              	}
  	    		else{
  	    			Vector<String> ans = new Vector<String>(1);
! 	    			ans.add(value);
  	    			records_ptr.put(dname, ans);
  	    		}
--- 401,410 ----
              		}
              		if(!found){
!             			ans.add(value.toLowerCase());
              		}
              	}
  	    		else{
  	    			Vector<String> ans = new Vector<String>(1);
! 	    			ans.add(value.toLowerCase());
  	    			records_ptr.put(dname, ans);
  	    		}
***************
*** 424,436 ****
              		}
              		if(found){
!             			ans.set(i, new Pair(mxvalue[0],Integer.valueOf(mxvalue[1])));
              		}
              		else{
!             			ans.add(new Pair(mxvalue[0],Integer.valueOf(mxvalue[1])));
              		}
              	}
  	    		else{
  	    			Vector<Pair> ans = new Vector<Pair>(1);
! 	    			ans.add(new Pair(mxvalue[0],Integer.valueOf(mxvalue[1])));
  	    			records_mx.put(dname, ans);
  	    		}
--- 425,437 ----
              		}
              		if(found){
!             			ans.set(i, new Pair(mxvalue[0].toLowerCase(),Integer.valueOf(mxvalue[1])));
              		}
              		else{
!             			ans.add(new Pair(mxvalue[0].toLowerCase(),Integer.valueOf(mxvalue[1])));
              		}
              	}
  	    		else{
  	    			Vector<Pair> ans = new Vector<Pair>(1);
! 	    			ans.add(new Pair(mxvalue[0].toLowerCase(),Integer.valueOf(mxvalue[1])));
  	    			records_mx.put(dname, ans);
  	    		}
***************
*** 441,444 ****
--- 442,446 ----
      
      public boolean removeRecord(String dname, String value, int type){
+     	dname = dname.toLowerCase();
      	boolean result = false;
      	switch(type){
***************
*** 535,541 ****
      public static boolean isValidName(String name){
      	if(name.length()==0) return false;
      	for(int i=0; i<name.length(); i++){
      		char c = name.charAt(i);
!     		if(!((c>='0' && c<='9') || (c>='a' && c<='z') || (c>='A' && c<='Z') || c=='-'  || c=='.')) return false;
      	}
      	return (toInAddrArpa(name)==null); // name is not valid IP-address
--- 537,544 ----
      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 (toInAddrArpa(name)==null); // name is not valid IP-address
***************
*** 544,550 ****
      public static boolean isValidMail(String name){
      	if(name.length()==0) return false;
      	for(int i=0; i<name.length(); i++){
      		char c = name.charAt(i);
!     		if(!((c>='0' && c<='9') || (c>='a' && c<='z') || (c>='A' && c<='Z') || c=='-'  || c=='.' || c=='@')) return false;
      	}
      	return true;
--- 547,554 ----
      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;
      	}
      	return true;

Index: DHCPD.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/DHCPD.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DHCPD.java	26 Sep 2008 17:53:49 -0000	1.7
--- DHCPD.java	19 Oct 2008 21:40:19 -0000	1.8
***************
*** 57,60 ****
--- 57,61 ----
      }
      
+     public boolean running = false;
      public Hashtable pools = new Hashtable();
      public Hashtable leases = new Hashtable();
***************
*** 79,82 ****
--- 80,84 ----
              mParentStack.SL().bind(appSock, mParentStack.getSrcIP(), 67);
              mParentStack.SL().listen(appSock);
+             running = true;
              printLayerInfo("DHCP server", "DHCP server starts listening in port " + 67 + ".");
          } catch (Exception e)
***************
*** 102,105 ****
--- 104,108 ----
          printLayerInfo("DHCP server", "DHCPD application closed socket.");
          mParentStack.SL().close(appSock);
+         running = false;
      }
      
***************
*** 108,111 ****
--- 111,115 ----
          printLayerInfo("DHCP server", "DHCPD application freed socket.");
          mParentStack.SL().free(appSock);
+         running = false;
      }
      

Index: IPV4Address.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/IPV4Address.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** IPV4Address.java	13 Oct 2008 12:36:15 -0000	1.6
--- IPV4Address.java	19 Oct 2008 21:40:19 -0000	1.7
***************
*** 519,528 ****
  	 * @author luke_hamilton 
  	 * @param inDecimalSubnetIp - Subnet IP address in decimal
- 	 * @param inDecIPAddress - IP address in decimal
  	 * @return boolean 
  	 * @version v0.20
  	 */
! 	public static boolean validateDecSubnetMask(String inDecimalSubnetIp,String inDecIPAddress) {
!                 return true;
  		/*
                  try {
--- 519,538 ----
  	 * @author luke_hamilton 
  	 * @param inDecimalSubnetIp - Subnet IP address in decimal
  	 * @return boolean 
  	 * @version v0.20
  	 */
! 	public static boolean validateDecSubnetMask(String inDecimalSubnetIp) {
! 		String[] ipn = inDecimalSubnetIp.split("\\.");
! 		try{
! 			if(ipn.length==4){
! 				for(int i=0; i<4; i++){
! 					int num = Integer.parseInt(ipn[i]);
! 					if(num<0 || num>255) throw new NumberFormatException();
! 				}
! 				return true;
! 			}
! 		}
! 		catch(NumberFormatException e){};
! 		return false;
  		/*
                  try {