[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip Tcp.java,1.17,1.18

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

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

Modified Files:
	Tcp.java 
Log Message:
TCP Elm.reset correction

Index: Tcp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Tcp.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Tcp.java	30 Nov 2005 13:02:32 -0000	1.17
--- Tcp.java	1 Dec 2005 16:54:54 -0000	1.18
***************
*** 181,189 ****
                      if (!this.SentACKs.isEmpty()) 
                      {
!                         Set set = this.SentACKs.keySet();
                          Iterator itr = set.iterator();
                          while (itr.hasNext())
                          {
                              this.SentACKs.remove(itr.next());
                          }
                      }
--- 181,197 ----
                      if (!this.SentACKs.isEmpty()) 
                      {
!                        /* Set set = this.SentACKs.keySet();
                          Iterator itr = set.iterator();
                          while (itr.hasNext())
                          {
                              this.SentACKs.remove(itr.next());
+                         }*/
+                         Enumeration HTkeys;
+                         Integer curkey;
+                         HTkeys = SentACKs.keys();
+                         while (HTkeys.hasMoreElements())
+                         {
+                             curkey= (Integer) HTkeys.nextElement();
+                             this.SentACKs.remove(curkey);
                          }
                      }
***************
*** 197,205 ****
                  if (!this.SegmentsToResend.isEmpty()) 
                  {
!                     Set set = this.SegmentsToResend.keySet();
                      Iterator itr = set.iterator();
                      while (itr.hasNext())
                      {
                          this.SegmentsToResend.remove(itr.next());
                      }
                  }
--- 205,221 ----
                  if (!this.SegmentsToResend.isEmpty()) 
                  {
!                     /*Set set = this.SegmentsToResend.keySet();
                      Iterator itr = set.iterator();
                      while (itr.hasNext())
                      {
                          this.SegmentsToResend.remove(itr.next());
+                     }*/
+                     Enumeration HTkeys;
+                     Integer curkey;
+                     HTkeys = SegmentsToResend.keys();
+                     while (HTkeys.hasMoreElements())
+                     {
+                         curkey= (Integer) HTkeys.nextElement();
+                         this.SegmentsToResend.remove(curkey);
                      }
                  }