[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip IpV4.java, 1.7, 1.8 ProtocolStack.java, 1.49, 1.50

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

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

Modified Files:
	IpV4.java ProtocolStack.java 
Log Message:


Index: ProtocolStack.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/ProtocolStack.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** ProtocolStack.java	12 Oct 2006 15:21:23 -0000	1.49
--- ProtocolStack.java	26 Oct 2006 13:36:54 -0000	1.50
***************
*** 392,398 ****
  		//
  
! 		String outInterface[] = mIPprotocol.router(inPacket.getDestIPAddress());
! 
! 		String GatewayAddress = null;
  
  		//test if on local of remote network
--- 392,398 ----
  		//
  
!                 String outInterface[] = mIPprotocol.router(inPacket.getDestIPAddress());
!  
!                 String GatewayAddress = null;
  
  		//test if on local of remote network
***************
*** 999,1003 ****
  					String myName = mParentNode.getName();
  
! 				//	System.out.println(myName + " unable to forward packet due to the following error: " + ex.toString());
  
  				}catch(LowLinkException ex){
--- 999,1003 ----
  					String myName = mParentNode.getName();
  
! 					System.out.println(myName + " unable to forward packet due to the following error: " + ex.toString());
  
  				}catch(LowLinkException ex){

Index: IpV4.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/IpV4.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** IpV4.java	24 Feb 2006 10:20:11 -0000	1.7
--- IpV4.java	26 Oct 2006 13:36:54 -0000	1.8
***************
*** 170,174 ****
                  }
                          
!                         
  		//else return GW
  		if (FLAG[0] == null){
--- 170,182 ----
                  }
                          
!                 if(FLAG[0] == null){
!                     try{
!                         FLAG[0]=  getInterface(inDestIPAddress);
!                         FLAG[1] = "GW";
!                     }catch(InvalidIPAddressException e){
!                         System.out.println("Unrecoverable exception in IPV4.getIntergace: " + e.toString());
!                         e.printStackTrace();
!                     }
!                 }
  		//else return GW
  		if (FLAG[0] == null){
***************
*** 193,197 ****
                   }catch(NullPointerException e){
                              System.out.println("IPV4.java: route 1 " + e.toString()); 
-                             
                   }
                  
--- 201,204 ----