Commit 9b7de4c4 authored by Ondřej Filip's avatar Ondřej Filip

'struct proto' removed

Finally, I found the bug reported by Andreas Steinmetz. FIXED.
parent 54467ed4
...@@ -162,9 +162,9 @@ ospf_lsack_receive(struct ospf_lsack_packet *ps, ...@@ -162,9 +162,9 @@ ospf_lsack_receive(struct ospf_lsack_packet *ps,
{ {
ntohlsah(plsa + i, &lsa); ntohlsah(plsa + i, &lsa);
if ((en = ospf_hash_find_header(n->lsrth, &lsa)) == NULL) 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)) if ((lsa.sn == LSA_MAXSEQNO) && (lsa.age == LSA_MAXAGE))
continue; continue;
......
...@@ -261,22 +261,21 @@ ospf_lsupd_tx_list(struct ospf_neighbor *n, list *l) ...@@ -261,22 +261,21 @@ ospf_lsupd_tx_list(struct ospf_neighbor *n, list *l)
} }
void 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) struct ospf_iface *ifa, u16 size)
{ {
u32 area,nrid,myrid; u32 area,nrid;
struct ospf_neighbor *n,*ntmp; struct ospf_neighbor *n,*ntmp;
struct ospf_lsa_header *lsa; struct ospf_lsa_header *lsa;
struct ospf_area *oa; 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; u16 length;
u8 i; u8 i;
int sendreq = 1;
nrid=ntohl(ps->ospf_packet.routerid); nrid=ntohl(ps->ospf_packet.routerid);
myrid=p->cf->global->router_id;
if((n=find_neigh(ifa, nrid))==NULL) if((n=find_neigh(ifa, nrid))==NULL)
{ {
OSPF_TRACE(D_PACKETS, "Received lsupd from unknown neighbor! (%I)", 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, ...@@ -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? */ if(lsadb && ((now-lsadb->inst_t)<=MINLSARRIVAL)) /* FIXME: test for flooding? */
{ {
DBG("I got it in less that MINLSARRIVAL\n"); DBG("I got it in less that MINLSARRIVAL\n");
sendreq = 0;
continue; continue;
} }
...@@ -496,6 +496,7 @@ ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p, ...@@ -496,6 +496,7 @@ ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p,
/* pg145 (7b) */ /* pg145 (7b) */
ospf_lsack_enqueue(n, lsa, ACKL_DIRECT); ospf_lsack_enqueue(n, lsa, ACKL_DIRECT);
} }
sendreq = 0;
continue; continue;
} }
...@@ -520,9 +521,9 @@ ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p, ...@@ -520,9 +521,9 @@ ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p,
/* Send direct LSAs */ /* Send direct LSAs */
ospf_lsack_send(n, ACKL_DIRECT); 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 */
} }
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#define _BIRD_OSPF_LSUPD_H_ #define _BIRD_OSPF_LSUPD_H_
void ospf_lsupd_tx_list(struct ospf_neighbor *n, list *l); 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); struct ospf_iface *ifa, u16 size);
int flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn, 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, struct ospf_lsa_header *hh, struct proto_ospf *po, struct ospf_iface *iff,
......
...@@ -188,7 +188,7 @@ ospf_rx_hook (sock *sk, int size) ...@@ -188,7 +188,7 @@ ospf_rx_hook (sock *sk, int size)
break; break;
case LSUPD_P: case LSUPD_P:
DBG ("%s: Link state update received.\n", p->name); 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; break;
case LSACK_P: case LSACK_P:
DBG ("%s: Link state ack received.\n", p->name); DBG ("%s: Link state ack received.\n", p->name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment