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

Still some endianity bugs.

Browse source
This commit is contained in:
Ondrej Filip 2000-06-08 02:28:04 +00:00
parent 59ba334296
commit 099c017fca
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
proto/ospf/hello.c
View file

@ -54,16 +54,19 @@ ospf_hello_rx(struct ospf_hello_packet *ps, struct proto *p,
struct ospf_neighbor *neigh,*n; struct ospf_neighbor *neigh,*n;
u8 i,twoway,oldpriority; u8 i,twoway,oldpriority;
ip_addr olddr,oldbdr; ip_addr olddr,oldbdr;
ip_addr mask;
char *beg=": Bad OSPF hello packet from ", *rec=" received: "; char *beg=": Bad OSPF hello packet from ", *rec=" received: ";
nrid=ntohl(((struct ospf_packet *)ps)->routerid); nrid=ntohl(((struct ospf_packet *)ps)->routerid);
OSPF_TRACE(D_PACKETS, "Received hello from %I via %s",faddr,ifa->iface->name); OSPF_TRACE(D_PACKETS, "Received hello from %I via %s",faddr,ifa->iface->name);
mask=ps->netmask;
ipa_ntoh(mask);
if((unsigned)ipa_mklen(ipa_ntoh(ps->netmask))!=ifa->iface->addr->pxlen) if((unsigned)ipa_mklen(mask)!=ifa->iface->addr->pxlen)
{ {
log("%s%s%I%s%Ibad netmask %I.", p->name, beg, nrid, rec, log("%s%s%I%s%Ibad netmask %I.", p->name, beg, nrid, rec,
ipa_ntoh(ps->netmask)); mask);
return; return;
} }
@ -93,8 +96,10 @@ ospf_hello_rx(struct ospf_hello_packet *ps, struct proto *p,
add_tail(&ifa->neigh_list, NODE n); add_tail(&ifa->neigh_list, NODE n);
n->rid=nrid; n->rid=nrid;
n->ip=faddr; n->ip=faddr;
n->dr=ipa_ntoh(ps->dr); n->dr=ps->dr;
n->bdr=ipa_ntoh(ps->bdr); ipa_ntoh(n->dr);
n->bdr=ps->bdr;
ipa_ntoh(n->bdr);
n->priority=ps->priority; n->priority=ps->priority;
n->options=ps->options; n->options=ps->options;
n->ifa=ifa; n->ifa=ifa;
@ -213,8 +218,10 @@ hello_timer_hook(timer *timer)
pkt->options=ifa->options; pkt->options=ifa->options;
pkt->priority=ifa->priority; pkt->priority=ifa->priority;
pkt->deadint=htonl(ifa->deadc*ifa->helloint); pkt->deadint=htonl(ifa->deadc*ifa->helloint);
pkt->dr=ipa_hton(ifa->drip); pkt->dr=ifa->drip;
pkt->bdr=ipa_hton(ifa->bdrip); ipa_hton(pkt->dr);
pkt->bdr=ifa->bdrip;
ipa_hton(pkt->bdr);
/* Fill all neighbors */ /* Fill all neighbors */
i=0; i=0;