[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip TCP_HashTableElement.java, 1.3, 1.4 Tcp.java, 1.76, 1.77

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

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

Modified Files:
	TCP_HashTableElement.java Tcp.java 
Log Message:


Index: Tcp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Tcp.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** Tcp.java	7 Sep 2006 15:38:16 -0000	1.76
--- Tcp.java	7 Sep 2006 16:13:15 -0000	1.77
***************
*** 191,200 ****
              System.out.println("#####################################   ############  Sender timer init! Elm id = " + Elm.returnID() + "  ID = " + timerid + " Elm connected to port:" + Elm.connectedtoPort);
          } else {
!             System.out.println("#####################################   ############   Sender Timer REinit due to new packet arrival! Elm id = " + Elm.returnID() + "  && OLDID = " + timerid + "");
              Elm.timer.cancel();
              Elm.timer=null;
              Elm.timer=new Timer();
              Elm.timer.schedule(new TCPTask(Elm,TCP_SENDER_TIME,this, inREP, ++timerid), TCP_SENDER_TIME, TCP_SENDER_TIME);
              System.out.println("#####################################   ############ Sender Timer REinit DONE! ID = " + timerid + " Elm connected to port:" + Elm.connectedtoPort);
          }
         }catch(Exception e){
--- 191,204 ----
              System.out.println("#####################################   ############  Sender timer init! Elm id = " + Elm.returnID() + "  ID = " + timerid + " Elm connected to port:" + Elm.connectedtoPort);
          } else {
!             System.out.println("#####################################   ############   Sender Timer REinit due to new packet arrival! Elm id = " + Elm.returnID() + "  && OLDID = " + timerid + " Elm connected to port:" + Elm.connectedtoPort);
!             System.out.println(Elm.timer);
!             Elm.busy = true;
              Elm.timer.cancel();
              Elm.timer=null;
              Elm.timer=new Timer();
              Elm.timer.schedule(new TCPTask(Elm,TCP_SENDER_TIME,this, inREP, ++timerid), TCP_SENDER_TIME, TCP_SENDER_TIME);
+             Elm.busy = false;
              System.out.println("#####################################   ############ Sender Timer REinit DONE! ID = " + timerid + " Elm connected to port:" + Elm.connectedtoPort);
+             System.out.println(Elm.timer);
          }
         }catch(Exception e){
***************
*** 761,764 ****
--- 765,770 ----
          TCP_HashTableElement Elm;
          Elm = (TCP_HashTableElement) PortTable.get(insrcPort);
+         while(Elm.busy){}
+         System.out.println(inSourceIPAddress + ": ************************ " + Elm + " ************************** " + Elm.timer);
          Integer gg = new Integer(0);
          

Index: TCP_HashTableElement.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/TCP_HashTableElement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TCP_HashTableElement.java	7 Sep 2006 14:54:34 -0000	1.3
--- TCP_HashTableElement.java	7 Sep 2006 16:13:15 -0000	1.4
***************
*** 48,51 ****
--- 48,53 ----
          /*database*/
          
+         public boolean busy = false;
+         
          /**
           * Contains received segments ONLY sequence_number for each segment is stored