[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip Tcp.java, 1.58, 1.59

[gift <gi...@us...>]

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

Modified Files:
	Tcp.java 
Log Message:
Enough for today :)

Index: Tcp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Tcp.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** Tcp.java	2 Sep 2006 16:57:19 -0000	1.58
--- Tcp.java	2 Sep 2006 18:01:04 -0000	1.59
***************
*** 174,177 ****
--- 174,178 ----
          public boolean isFIN_confirmed=false;
          public boolean isPassive=false;
+        // public boolean isConnected=false;
          /**
           * 0 - no status; 1 - is being connected; 2 - is connected; 3 - connection error
***************
*** 315,318 ****
--- 316,320 ----
              this.isFIN_confirmed=false;
              this.isPassive=false;
+            //this.isConnected=false;
              this.ApplicationStatus=0; //no status
              this.isServer=false;
***************
*** 347,351 ****
      private static final long TCP_CONNECT_SERVER_TIME = 250; //msec   //server closing idle connection time
      private static final long TCP_SENDER_TIME = 200; //msec time to resend all segments in SegmentsToresend queue
!     private static final long TCP_CONNECT_TIME = 200; //msec time to resend all segments in SegmentsToresend queue whn connecting
      
      /**
--- 349,353 ----
      private static final long TCP_CONNECT_SERVER_TIME = 250; //msec   //server closing idle connection time
      private static final long TCP_SENDER_TIME = 200; //msec time to resend all segments in SegmentsToresend queue
!     private static final long TCP_CONNECT_TIME = 200; //msec time to resend all segments in SegmentsToresend queue when connecting
      
      /**
***************
*** 992,997 ****
              //this.total_sent++; //overall stats
              
!             //IF NOT ACK then pushing a copy into Hashtable
!             if (!flags[1] || a_num<=1) Elm.SegmentsToResend.put(new Integer(s_num), tosend_clone);
              
              if (flags[4]) reps=5;
--- 994,1000 ----
              //this.total_sent++; //overall stats
              
!             //IF NOT ACK then push a copy into Hashtable
!             //if (!flags[1] || a_num<=1) Elm.SegmentsToResend.put(new Integer(s_num), tosend_clone);
!             if (!flags[1]) Elm.SegmentsToResend.put(new Integer(s_num), tosend_clone);
              
              if (flags[4]) reps=5;
***************
*** 1500,1504 ****
                                                          TCP_Info.setLayer("Transport");
                                                          
!                                                         TCP_Info.setDescription("TCP packet with data received from "+ inPacket.getSourceIPAddress() + ":" + inPacket.get_srcPort() + ". Passing data to application program.  (received SEQ = " + inPacket.get_sequence_number() + "sent ACK =" + ack_num + ").");
                                                          
                                                          Simulation.addLayerInfo(TCP_Info);
--- 1503,1507 ----
                                                          TCP_Info.setLayer("Transport");
                                                          
!                                                         TCP_Info.setDescription("TCP packet with data received from "+ inPacket.getSourceIPAddress() + ":" + inPacket.get_srcPort() + ". Passing data to application program.  (received SEQ = " + inPacket.get_sequence_number() + " sent ACK = " + ack_num + ").");
                                                          
                                                          Simulation.addLayerInfo(TCP_Info);