[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip Tcp.java, 1.77, 1.78

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

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

Modified Files:
	Tcp.java 
Log Message:


Index: Tcp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Tcp.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** Tcp.java	7 Sep 2006 16:13:15 -0000	1.77
--- Tcp.java	7 Sep 2006 16:34:16 -0000	1.78
***************
*** 175,179 ****
--- 175,182 ----
       */
      public void TCPsetTimer(TCP_HashTableElement Elm, int inREP) {
+        if(Elm.busy) return;
+        System.out.println("TCPSETTIMER: " + Elm.timer);
         try{ 
+         Elm.busy = true;
          if(Elm.timer==null) {      
              
***************
*** 191,206 ****
              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){
             Error.Report(e);
         } 
--- 194,210 ----
              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.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);
              System.out.println(Elm.timer);
          }
+         Elm.busy = false;
         }catch(Exception e){
+            Elm.busy = false;
             Error.Report(e);
         } 
***************
*** 763,769 ****
      public TCP_packet getTCPPacket_tosend(String inDestIPAddress,String inSourceIPAddress, int indestPort, int insrcPort, String inMessage, boolean flags[], int acknow_num) throws TransportLayerException, LowLinkException {
          //check if window is available
          TCP_HashTableElement Elm;
          Elm = (TCP_HashTableElement) PortTable.get(insrcPort);
-         while(Elm.busy){}
          System.out.println(inSourceIPAddress + ": ************************ " + Elm + " ************************** " + Elm.timer);
          Integer gg = new Integer(0);
--- 767,773 ----
      public TCP_packet getTCPPacket_tosend(String inDestIPAddress,String inSourceIPAddress, int indestPort, int insrcPort, String inMessage, boolean flags[], int acknow_num) throws TransportLayerException, LowLinkException {
          //check if window is available
+             
          TCP_HashTableElement Elm;
          Elm = (TCP_HashTableElement) PortTable.get(insrcPort);
          System.out.println(inSourceIPAddress + ": ************************ " + Elm + " ************************** " + Elm.timer);
          Integer gg = new Integer(0);