'struct proto' removed

Finally, I found the bug reported by Andreas Steinmetz. FIXED.

4 files changed, 13 insertions, 12 deletions

diff --git a/proto/ospf/lsack.c b/proto/ospf/lsack.c
index fb0844d..cb27ec8 100644
--- a/proto/ospf/lsack.c
+++ b/proto/ospf/lsack.c
@@ -162,9 +162,9 @@ ospf_lsack_receive(struct ospf_lsack_packet *ps,
   {
     ntohlsah(plsa + i, &lsa);
     if ((en = ospf_hash_find_header(n->lsrth, &lsa)) == NULL)
-      continue;
+      continue;		/* pg 155 */
 
-    if (lsa_comp(&lsa, &en->lsa) != CMP_SAME)
+    if (lsa_comp(&lsa, &en->lsa) != CMP_SAME)	/* pg 156 */
     {
       if ((lsa.sn == LSA_MAXSEQNO) && (lsa.age == LSA_MAXAGE))
 	continue;
diff --git a/proto/ospf/lsupd.c b/proto/ospf/lsupd.c
index 752ba36..c04f16b 100644
--- a/proto/ospf/lsupd.c
+++ b/proto/ospf/lsupd.c
@@ -261,22 +261,21 @@ ospf_lsupd_tx_list(struct ospf_neighbor *n, list *l)
 }
 
 void
-ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p,
+ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
   struct ospf_iface *ifa, u16 size)
 {
-  u32 area,nrid,myrid;
+  u32 area,nrid;
   struct ospf_neighbor *n,*ntmp;
   struct ospf_lsa_header *lsa;
   struct ospf_area *oa;
-  struct proto_ospf *po=(struct proto_ospf *)p;
+  struct proto_ospf *po=ifa->proto;
+  struct proto *p = (struct proto *)po;
   u16 length;
   u8 i;
+  int sendreq = 1;
 
   nrid=ntohl(ps->ospf_packet.routerid);
 
-  myrid=p->cf->global->router_id;
-
-
   if((n=find_neigh(ifa, nrid))==NULL)
   {
     OSPF_TRACE(D_PACKETS, "Received lsupd from unknown neighbor! (%I)",
@@ -424,6 +423,7 @@ ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p,
       if(lsadb && ((now-lsadb->inst_t)<=MINLSARRIVAL))	/* FIXME: test for flooding? */
       {
         DBG("I got it in less that MINLSARRIVAL\n");
+        sendreq = 0;
 	continue;
       }
         
@@ -496,6 +496,7 @@ ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p,
         /* pg145 (7b) */
         ospf_lsack_enqueue(n, lsa, ACKL_DIRECT);
       }
+      sendreq = 0;
       continue;
     }
 
@@ -520,9 +521,9 @@ ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p,
   /* Send direct LSAs */
   ospf_lsack_send(n, ACKL_DIRECT);
 
-  if(n->state==NEIGHBOR_LOADING)
+  if(sendreq && (n->state==NEIGHBOR_LOADING))
   {
-    ospf_lsreq_send(n);	/* Send me another part of database */
+    ospf_lsreq_send(n);	/* Ask for another part of neighbor's database */
   }
 }
 
diff --git a/proto/ospf/lsupd.h b/proto/ospf/lsupd.h
index 61dd5d0..5bbc97a 100644
--- a/proto/ospf/lsupd.h
+++ b/proto/ospf/lsupd.h
@@ -11,7 +11,7 @@
 #define _BIRD_OSPF_LSUPD_H_
 
 void ospf_lsupd_tx_list(struct ospf_neighbor *n, list *l);
-void ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p,
+void ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
   struct ospf_iface *ifa, u16 size);
 int flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
   struct ospf_lsa_header *hh, struct proto_ospf *po, struct ospf_iface *iff,
diff --git a/proto/ospf/packet.c b/proto/ospf/packet.c
index ce7a629..63a9543 100644
--- a/proto/ospf/packet.c
+++ b/proto/ospf/packet.c
@@ -188,7 +188,7 @@ ospf_rx_hook (sock *sk, int size)
       break;
     case LSUPD_P:
       DBG ("%s: Link state update received.\n", p->name);
-      ospf_lsupd_rx ((struct ospf_lsupd_packet *) ps, p, ifa, size);
+      ospf_lsupd_receive((struct ospf_lsupd_packet *) ps, ifa, size);
       break;
     case LSACK_P:
       DBG ("%s: Link state ack received.\n", p->name);