[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip Tcp.java, 1.109, 1.110

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

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

Modified Files:
	Tcp.java 
Log Message:


Index: Tcp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Tcp.java,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** Tcp.java	25 Oct 2009 17:44:54 -0000	1.109
--- Tcp.java	25 Oct 2009 18:20:33 -0000	1.110
***************
*** 991,995 ****
              if(Tcp.USE_2MSL){
                  Elm.last_timer = createTimer(Elm.getSocket(), null, Tcp.resendtimes_2MSL);
!                 printLayerInfo("Closing port in "+(Tcp.resendtimes_2MSL[0]/1000.0)+"s.");
              }
              boolean flags[] = genFlags(Tcp.ACK);
--- 991,995 ----
              if(Tcp.USE_2MSL){
                  Elm.last_timer = createTimer(Elm.getSocket(), null, Tcp.resendtimes_2MSL);
!                 printLayerInfo("Closing port "+mSL.get_socket(Elm.getSocket()).src_port+" in "+(Tcp.resendtimes_2MSL[0]/1000.0)+"s.");
              }
              boolean flags[] = genFlags(Tcp.ACK);
***************
*** 1004,1013 ****
              Elm.setState(TCP_session.FIN_WAIT_2);
              Elm.last_timer = createTimer(Elm.getSocket(), null, Tcp.resendtimes_EXIT);
!             printLayerInfo("Closing if FIN will not have received in "+(Tcp.resendtimes_EXIT[0]/1000.0)+"s.");
          }
          else if(inPacket.get_FIN_flag()){
              Elm.setState(TCP_session.CLOSING);
              Elm.last_timer = createTimer(Elm.getSocket(), null, Tcp.resendtimes_SYNC_CLOSE);
!             printLayerInfo("Closing if ACK will not have received in "+(Tcp.resendtimes_SYNC_CLOSE[0]/1000.0)+"s.");
              boolean flags[] = genFlags(Tcp.ACK);
              sendTCPSegment(Elm.getSocket(), "", flags, inPacket.get_sequence_number()+1, Tcp.resendtimes_NULL);
--- 1004,1013 ----
              Elm.setState(TCP_session.FIN_WAIT_2);
              Elm.last_timer = createTimer(Elm.getSocket(), null, Tcp.resendtimes_EXIT);
!             printLayerInfo("Closing port "+mSL.get_socket(Elm.getSocket()).src_port+" if FIN will not have received in "+(Tcp.resendtimes_EXIT[0]/1000.0)+"s.");
          }
          else if(inPacket.get_FIN_flag()){
              Elm.setState(TCP_session.CLOSING);
              Elm.last_timer = createTimer(Elm.getSocket(), null, Tcp.resendtimes_SYNC_CLOSE);
!             printLayerInfo("Closing port "+mSL.get_socket(Elm.getSocket()).src_port+" if ACK will not have received in "+(Tcp.resendtimes_SYNC_CLOSE[0]/1000.0)+"s.");
              boolean flags[] = genFlags(Tcp.ACK);
              sendTCPSegment(Elm.getSocket(), "", flags, inPacket.get_sequence_number()+1, Tcp.resendtimes_NULL);
***************
*** 1027,1031 ****
              if(Tcp.USE_2MSL){
                  Elm.last_timer = createTimer(Elm.getSocket(), null, Tcp.resendtimes_2MSL);
!                 printLayerInfo("Closing port in "+(Tcp.resendtimes_2MSL[0]/1000.0)+"s.");
              }
              boolean flags[] = genFlags(Tcp.ACK);
--- 1027,1031 ----
              if(Tcp.USE_2MSL){
                  Elm.last_timer = createTimer(Elm.getSocket(), null, Tcp.resendtimes_2MSL);
!                 printLayerInfo("Closing port "+mSL.get_socket(Elm.getSocket()).src_port+" in "+(Tcp.resendtimes_2MSL[0]/1000.0)+"s.");
              }
              boolean flags[] = genFlags(Tcp.ACK);
***************
*** 1052,1056 ****
              if(Tcp.USE_2MSL){
                  Elm.last_timer = createTimer(Elm.getSocket(), null, Tcp.resendtimes_2MSL);
!                 printLayerInfo("Closing port in "+(Tcp.resendtimes_2MSL[0]/1000.0)+"s.");
              }
              else{
--- 1052,1056 ----
              if(Tcp.USE_2MSL){
                  Elm.last_timer = createTimer(Elm.getSocket(), null, Tcp.resendtimes_2MSL);
!                 printLayerInfo("Closing port "+mSL.get_socket(Elm.getSocket()).src_port+" in "+(Tcp.resendtimes_2MSL[0]/1000.0)+"s.");
              }
              else{