Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bugfix in lsreq receiving.

Browse source
This commit is contained in:
Ondrej Filip 2000-06-02 09:42:24 +00:00
parent cd4fecb66a
commit 92e8be8c89
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
proto/ospf/lsreq.c
View file

@ -91,7 +91,8 @@ lsrr_timer_hook(timer *timer)
llsh->lsh.id=en->lsa.id; llsh->lsh.id=en->lsa.id;
llsh->lsh.rt=en->lsa.rt; llsh->lsh.rt=en->lsa.rt;
llsh->lsh.type=en->lsa.type; llsh->lsh.type=en->lsa.type;
DBG("Working on ID: %I, RT: %I, Type: %u\n",en->lsa.id,en->lsa.rt,en->lsa.type); DBG("Working on ID: %I, RT: %I, Type: %u\n",
en->lsa.id, en->lsa.rt, en->lsa.type);
add_tail(&uplist, NODE llsh); add_tail(&uplist, NODE llsh);
} }
ospf_lsupd_tx_list(n, &uplist); ospf_lsupd_tx_list(n, &uplist);
@ -111,7 +112,7 @@ ospf_lsreq_rx(struct ospf_lsreq_packet *ps, struct proto *p,
list uplist; list uplist;
slab *upslab; slab *upslab;
int length; int length;
u8 i; int i,lsano;
nrid=ntohl(ps->ospf_packet.routerid); nrid=ntohl(ps->ospf_packet.routerid);
@ -127,13 +128,14 @@ ospf_lsreq_rx(struct ospf_lsreq_packet *ps, struct proto *p,
debug("%s: Received LS req from neighbor: %I\n",p->name, n->ip); debug("%s: Received LS req from neighbor: %I\n",p->name, n->ip);
length=htons(ps->ospf_packet.length); length=ntohs(ps->ospf_packet.length);
lsh=(void *)(ps+1); lsh=(void *)(ps+1);
init_list(&uplist); init_list(&uplist);
upslab=sl_new(p->pool,sizeof(struct l_lsr_head)); upslab=sl_new(p->pool,sizeof(struct l_lsr_head));
for(i=0;i<(length-sizeof(struct ospf_lsreq_packet))/ lsano=(length-sizeof(struct ospf_lsreq_packet))/
sizeof(struct ospf_lsreq_header);i++); sizeof(struct ospf_lsreq_header);
for(i=0;i<lsano;lsh++,i++)
{ {
DBG("Processing LSA: ID=%I, Type=%u, Router=%I\n", ntohl(lsh->id), DBG("Processing LSA: ID=%I, Type=%u, Router=%I\n", ntohl(lsh->id),
lsh->type, ntohl(lsh->rt)); lsh->type, ntohl(lsh->rt));
@ -145,7 +147,7 @@ ospf_lsreq_rx(struct ospf_lsreq_packet *ps, struct proto *p,
if(ospf_hash_find(n->ifa->oa->gr, llsh->lsh.id, llsh->lsh.rt, if(ospf_hash_find(n->ifa->oa->gr, llsh->lsh.id, llsh->lsh.rt,
llsh->lsh.type)==NULL) llsh->lsh.type)==NULL)
{ {
debug("Received bad LS req from: %I looking: RT: %I, ID: %I, Type: %u", log("Received bad LS req from: %I looking: RT: %I, ID: %I, Type: %u",
n->ip, lsh->rt, lsh->id, lsh->type); n->ip, lsh->rt, lsh->id, lsh->type);
ospf_neigh_sm(n,INM_BADLSREQ); ospf_neigh_sm(n,INM_BADLSREQ);
rfree(upslab); rfree(upslab);