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

Bugfix in flooding. (bad size)

Browse source 
Better debugging.
More robust in receiving.
This commit is contained in:
Ondrej Filip 2000-05-11 22:00:55 +00:00
parent c8d1f3feb2
commit 5da1f93537
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
proto/ospf/dbdes.c
View file

@ -227,7 +227,6 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p,
case NEIGHBOR_DOWN: case NEIGHBOR_DOWN:
case NEIGHBOR_ATTEMPT: case NEIGHBOR_ATTEMPT:
case NEIGHBOR_2WAY: case NEIGHBOR_2WAY:
debug("%s: Received dbdes from %I in bad state.\n", p->name, n->ip);
return; return;
break; break;
case NEIGHBOR_INIT: case NEIGHBOR_INIT:

23
proto/ospf/lsupd.c
View file

@ -16,6 +16,7 @@ flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
struct ospf_iface *ifa; struct ospf_iface *ifa;
struct ospf_neighbor *nn; struct ospf_neighbor *nn;
struct top_hash_entry *en; struct top_hash_entry *en;
struct proto *p=&po->proto;
int ret,retval=0; int ret,retval=0;
/* pg 148 */ /* pg 148 */
@ -128,10 +129,11 @@ flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
en=ospf_hash_find_header(oa->gr,hh); en=ospf_hash_find_header(oa->gr,hh);
htonlsab(en->lsa_body,help,hh->type,hh->length htonlsab(en->lsa_body,help,hh->type,hh->length
-sizeof(struct ospf_lsa_header)); -sizeof(struct ospf_lsa_header));
len=hh->length; len=hh->length+sizeof(struct ospf_lsupd_packet);
} }
op->length=htons(len); op->length=htons(len);
ospf_pkt_finalize(ifa, op); ospf_pkt_finalize(ifa, op);
debug("%s: LS upd flooded via %s\n", p->name, ifa->iface->name);
if(ifa->type==OSPF_IT_NBMA) if(ifa->type==OSPF_IT_NBMA)
{ {
@ -184,10 +186,10 @@ ospf_lsupd_tx_list(struct ospf_neighbor *n, list *l)
if((len+en->lsa.length)>n->ifa->iface->mtu) if((len+en->lsa.length)>n->ifa->iface->mtu)
{ {
pk->lsano=htonl(lsano); pk->lsano=htonl(lsano);
op->length=htons(len); op->length=htons(len-SIPH);
ospf_pkt_finalize(n->ifa, op); ospf_pkt_finalize(n->ifa, op);
sk_send_to(n->ifa->ip_sk,len, n->ip, OSPF_PROTO); sk_send_to(n->ifa->ip_sk,len-SIPH, n->ip, OSPF_PROTO);
debug("%s: LS upd sent to %I\n", p->name, n->ip); debug("%s: LS upd sent to %I\n", p->name, n->ip);
DBG("LSupd: next packet\n"); DBG("LSupd: next packet\n");
@ -201,15 +203,15 @@ ospf_lsupd_tx_list(struct ospf_neighbor *n, list *l)
htonlsab(en->lsa_body, pktpos, en->lsa.type, en->lsa.length htonlsab(en->lsa_body, pktpos, en->lsa.type, en->lsa.length
-sizeof(struct ospf_lsa_header)); -sizeof(struct ospf_lsa_header));
pktpos=pktpos+en->lsa.length-sizeof(struct ospf_lsa_header); pktpos=pktpos+en->lsa.length-sizeof(struct ospf_lsa_header);
len=len+en->lsa.length; len+=en->lsa.length;
lsano++; lsano++;
} }
pk->lsano=htonl(lsano); pk->lsano=htonl(lsano);
op->length=htons(len-SIPH); op->length=htons(len-SIPH);
ospf_pkt_finalize(n->ifa, op); ospf_pkt_finalize(n->ifa, op);
sk_send_to(n->ifa->ip_sk,len, n->ip, OSPF_PROTO);
debug("%s: LS upd sent to %I\n", p->name, n->ip); debug("%s: LS upd sent to %I\n", p->name, n->ip);
sk_send_to(n->ifa->ip_sk,len-SIPH, n->ip, OSPF_PROTO);
} }
void void
@ -228,6 +230,7 @@ ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p,
myrid=p->cf->global->router_id; myrid=p->cf->global->router_id;
if((n=find_neigh(ifa, nrid))==NULL) if((n=find_neigh(ifa, nrid))==NULL)
{ {
debug("%s: Received lsupd from unknown neigbor! (%I)\n", p->name, debug("%s: Received lsupd from unknown neigbor! (%I)\n", p->name,
@ -240,6 +243,11 @@ ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p,
p->name,n->ip); p->name,n->ip);
return; return;
} }
if(size<=(sizeof(struct ospf_lsupd_packet)+sizeof(struct ospf_lsa_header)))
{
log("%s: Received lsupd from %I is too short\n", p->name,n->ip);
return;
}
debug("%s: Received LS upd from (%I)\n", p->name, n->ip); debug("%s: Received LS upd from (%I)\n", p->name, n->ip);
@ -252,6 +260,11 @@ ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p,
struct ospf_lsa_header lsatmp; struct ospf_lsa_header lsatmp;
struct top_hash_entry *lsadb; struct top_hash_entry *lsadb;
u16 lenn; u16 lenn;
int diff=((u8 *)lsa)-((u8 *)ps);
if(((diff+sizeof(struct ospf_lsa_header))>=size) ||
((ntohs(lsa->length)+diff)>size))
log("%s: Received lsupd from %I is too short\n", p->name,n->ip);
lenn=ntohs(lsa->length); lenn=ntohs(lsa->length);