[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip/ospf OSPF.java,1.6,1.7 OSPF_Acknowledgement.java,1.1,1.2

[Alouette <alo...@us...>]

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

Modified Files:
	OSPF.java OSPF_Acknowledgement.java 
Log Message:


Index: OSPF_Acknowledgement.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/ospf/OSPF_Acknowledgement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OSPF_Acknowledgement.java	23 Feb 2006 20:12:41 -0000	1.1
--- OSPF_Acknowledgement.java	24 Feb 2006 10:37:38 -0000	1.2
***************
*** 36,39 ****
      }
      
!     
  }
--- 36,42 ----
      }
      
!     public int GetDDSNnumber()
!     {
!         return (int)lsaheader.GetLSsequencenumber();
!     }
  }

Index: OSPF.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/ospf/OSPF.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OSPF.java	23 Feb 2006 20:12:41 -0000	1.6
--- OSPF.java	24 Feb 2006 10:37:38 -0000	1.7
***************
*** 42,45 ****
--- 42,46 ----
      // graf net
      private Vector Graf = new Vector ();
+     private Vector SendQueue = new Vector();
      //************************************************************************
      // the following class describes each element of the graf - router id and vector of neighbor routers
***************
*** 436,439 ****
--- 437,442 ----
              tosend.AddLsaHeader(a);
              tosend.AddLsaAdv(b);
+             // push packet to array
+             SendQueue.addElement(tosend);
              try
              {
***************
*** 443,450 ****
      }
      
!     public void SendLinkAcknowledgement(OSPF_lsaheader inheader)
      {
          OSPF_Acknowledgement tosend = new OSPF_Acknowledgement();
!         tosend.Setlsaheader(inheader);
          try
              {
--- 446,454 ----
      }
      
!     public void SendLinkAcknowledgement(OSPFlinkstateupdate_packet inPacket)
      {
          OSPF_Acknowledgement tosend = new OSPF_Acknowledgement();
!         tosend.setDestIPAddress(inPacket.GetRouterID());
!         tosend.Setlsaheader((OSPF_lsaheader)inPacket.GetLsaHeaderlist().elementAt(1));
          try
              {
***************
*** 452,455 ****
--- 456,475 ----
              }catch (Exception e) {}
      }
+     
+     public void ReceiveLinkAcknowledgement(OSPF_Acknowledgement inPacket)
+     {
+         // check if in array exist incoming packet
+         int i=0;
+         int flag = 0;
+         while ((i<SendQueue.size()) && (flag==0))
+         {
+             if (((OSPF_lsaheader)SendQueue.elementAt(i)).GetLSsequencenumber() == inPacket.GetDDSNnumber())
+             {
+                 SendQueue.removeElementAt(i);
+                 flag=1;
+             }
+             i++;
+         }
+     }
      /* 
       *this method to receive link statereqiest