[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip IP_packet.java, 1.6, 1.7 ProtocolStack.java, 1.71, 1.72

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

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

Modified Files:
	IP_packet.java ProtocolStack.java 
Log Message:
NAT now works. (may be :P)



Index: ProtocolStack.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/ProtocolStack.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** ProtocolStack.java	13 Oct 2008 12:36:15 -0000	1.71
--- ProtocolStack.java	13 Oct 2008 21:20:21 -0000	1.72
***************
*** 796,800 ****
  			IPV4Address ip = new IPV4Address(destIPAddress);
  
! 			if (mIPprotocol.isInternalIP(destIPAddress) || ip.isBroadcast()) {
  				// Create layer info
  				LayerInfo protInfo = new LayerInfo(getClass().getName());
--- 796,800 ----
  			IPV4Address ip = new IPV4Address(destIPAddress);
  
! 			if ((mIPprotocol.isInternalIP(destIPAddress) && !ipPacket.NatOutsideMark) || ip.isBroadcast()) {
  				// Create layer info
  				LayerInfo protInfo = new LayerInfo(getClass().getName());

Index: IP_packet.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/IP_packet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** IP_packet.java	13 Oct 2008 12:36:15 -0000	1.6
--- IP_packet.java	13 Oct 2008 21:20:21 -0000	1.7
***************
*** 89,93 ****
  	String mDestIPAddress;
  	
! 	public boolean NatMark = false;
  
  	
--- 89,94 ----
  	String mDestIPAddress;
  	
! 	public boolean NatInsideMark = false;
! 	public boolean NatOutsideMark = false;
  
  	
***************
*** 112,116 ****
  
  		mDestIPAddress = inDestIPAddress;
! 		NatMark = false;
  
  	}
--- 113,118 ----
  
  		mDestIPAddress = inDestIPAddress;
! 		NatInsideMark = false;
! 		NatOutsideMark = false;
  
  	}