[Javanetsim-cvs] javaNetSim/core AccessListEngine.java, 1.7, 1.8 CommandProcessor.java, 1.42, 1.43 MultilayerSwitch.java, 1.10, 1.11

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

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

Modified Files:
	AccessListEngine.java CommandProcessor.java 
	MultilayerSwitch.java 
Log Message:



Index: CommandProcessor.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/CommandProcessor.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** CommandProcessor.java	3 Nov 2008 23:33:11 -0000	1.42
--- CommandProcessor.java	16 Dec 2008 15:14:23 -0000	1.43
***************
*** 3356,3360 ****
  						}
  						else{
! 							IPV4Address ip = new IPV4Address(params.get(2));
  							ArrayList<?> ifaces = device.getAllInterfacesNames();
  							boolean found = false;
--- 3356,3360 ----
  						}
  						else{
! 							IPV4Address ip = new IPV4Address(params.get(0));
  							ArrayList<?> ifaces = device.getAllInterfacesNames();
  							boolean found = false;

Index: MultilayerSwitch.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/MultilayerSwitch.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MultilayerSwitch.java	27 Oct 2008 18:27:52 -0000	1.10
--- MultilayerSwitch.java	16 Dec 2008 15:14:23 -0000	1.11
***************
*** 113,118 ****
  				it = NetworkInterfacetable.elements();
  				while (it.hasMoreElements()) {
! 					NetworkInterfacePort tempInterface = (NetworkInterfacePort) it
! 							.nextElement();
  					nic = tempInterface.getName();
  					Hashtable<String, Long> outInt = IntCaches.get(nic);
--- 113,122 ----
  				it = NetworkInterfacetable.elements();
  				while (it.hasMoreElements()) {
! 					NetworkInterface tempInt = (NetworkInterface) it.nextElement();
! 					
! 					if(!(tempInt instanceof NetworkInterfacePort)) continue;
! 					
! 					NetworkInterfacePort tempInterface = (NetworkInterfacePort) tempInt;
! 					
  					nic = tempInterface.getName();
  					Hashtable<String, Long> outInt = IntCaches.get(nic);
***************
*** 144,149 ****
  					// that sent in the packet
  					// if it is skip that interface
! 					NetworkInterfacePort tempInterface = (NetworkInterfacePort) it
! 							.nextElement();
  					
  					if (!tempInterface.getName().equals(inInterfaceName)) {
--- 148,156 ----
  					// that sent in the packet
  					// if it is skip that interface
! 					NetworkInterface tempInt = (NetworkInterface) it.nextElement();
! 					
! 					if(!(tempInt instanceof NetworkInterfacePort)) continue;
! 					
! 					NetworkInterfacePort tempInterface = (NetworkInterfacePort) tempInt;
  					
  					if (!tempInterface.getName().equals(inInterfaceName)) {

Index: AccessListEngine.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/AccessListEngine.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AccessListEngine.java	24 Oct 2008 17:46:42 -0000	1.7
--- AccessListEngine.java	16 Dec 2008 15:14:23 -0000	1.8
***************
*** 219,222 ****
--- 219,224 ----
  						binNetwork1 = IPV4Address.toBinaryString(temp_acl.IP1);
  						binMask1 = IPV4Address.toBinaryString(temp_acl.SubnetMask1);
+ 						binNetwork2 = null;
+ 						binMask2 = null;
  						if(temp_acl.IP2!=null && temp_acl.SubnetMask2!=null){
  							binNetwork2 = IPV4Address.toBinaryString(temp_acl.IP2);
***************
*** 224,230 ****
  						}
  
! 						if((temp_acl.protocol==-1 || temp_acl.protocol==access_list.IP || temp_acl.protocol==protocol) &&
  								IPV4Address.IPandMask(binNetwork1, binMask1).equals(IPV4Address.IPandMask(binIP1,binMask1)) &&
! 								(binNetwork2==null || (binIP2!=null || IPV4Address.IPandMask(binNetwork2, binMask2).equals(IPV4Address.IPandMask(binIP2,binMask2)))) &&
  								(temp_acl.Port2 == 0 || temp_acl.Port2 == port2)
  						){
--- 226,234 ----
  						}
  
! 						if((temp_acl.protocol==-1 || temp_acl.protocol==access_list.IP 
! 								|| temp_acl.protocol==protocol) &&
  								IPV4Address.IPandMask(binNetwork1, binMask1).equals(IPV4Address.IPandMask(binIP1,binMask1)) &&
! 								(binNetwork2==null 
! 										|| (binIP2!=null && IPV4Address.IPandMask(binNetwork2, binMask2).equals(IPV4Address.IPandMask(binIP2,binMask2)))) &&
  								(temp_acl.Port2 == 0 || temp_acl.Port2 == port2)
  						){