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

Endianity problem fixed. Thanx to Srs Jzsef

Browse source
This commit is contained in:
Ondrej Filip 2003-09-14 13:41:24 +00:00
parent 35a86ceb40
commit 00bd27a1cc
1 changed files with 146 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
proto/ospf/packet.c
View file

@ -1,7 +1,7 @@
/* /*
* BIRD -- OSPF * BIRD -- OSPF
* *
* (c) 1999 - 2000 Ondrej Filip <feela@network.cz> * (c) 1999 - 2003 Ondrej Filip <feela@network.cz>
* *
* Can be freely distributed and used under the terms of the GNU GPL. * Can be freely distributed and used under the terms of the GNU GPL.
*/ */
@ -32,7 +32,7 @@ void
ospf_tx_authenticate (struct ospf_iface *ifa, struct ospf_packet *pkt) ospf_tx_authenticate (struct ospf_iface *ifa, struct ospf_packet *pkt)
{ {
int i; int i;
pkt->autype=ifa->autype; pkt->autype = htons (ifa->autype);
memcpy (pkt->authetication, ifa->aukey, 8); memcpy (pkt->authetication, ifa->aukey, 8);
return; return;
} }
@ -41,13 +41,16 @@ int
ospf_rx_authenticate (struct ospf_iface *ifa, struct ospf_packet *pkt) ospf_rx_authenticate (struct ospf_iface *ifa, struct ospf_packet *pkt)
{ {
int i; int i;
if(pkt->autype!=ifa->autype) return 0; if (pkt->autype != htons (ifa->autype))
if(ifa->autype==AU_NONE) return 1; return 0;
if (ifa->autype == AU_NONE)
return 1;
if (ifa->autype == AU_SIMPLE) if (ifa->autype == AU_SIMPLE)
{ {
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
{ {
if(pkt->authetication[i]!=ifa->aukey[i]) return 0; if (pkt->authetication[i] != ifa->aukey[i])
return 0;
} }
return 1; return 1;
} }
@ -62,7 +65,9 @@ ospf_pkt_finalize(struct ospf_iface *ifa, struct ospf_packet *pkt)
/* Count checksum */ /* Count checksum */
pkt->checksum = ipsum_calculate (pkt, sizeof (struct ospf_packet) - 8, pkt->checksum = ipsum_calculate (pkt, sizeof (struct ospf_packet) - 8,
(pkt+1),ntohs(pkt->length)-sizeof(struct ospf_packet),NULL); (pkt + 1),
ntohs (pkt->length) -
sizeof (struct ospf_packet), NULL);
} }
/** /**
@ -84,7 +89,8 @@ ospf_rx_hook(sock *sk, int size)
int i; int i;
u8 *pu8; u8 *pu8;
if(ifa->stub) return(1); if (ifa->stub)
return (1);
DBG ("%s: RX_Hook called on interface %s.\n", p->name, sk->iface->name); DBG ("%s: RX_Hook called on interface %s.\n", p->name, sk->iface->name);
@ -98,14 +104,16 @@ ospf_rx_hook(sock *sk, int size)
if ((unsigned) size < sizeof (struct ospf_packet)) if ((unsigned) size < sizeof (struct ospf_packet))
{ {
log("%s: Bad OSPF packet received: too short (%u bytes)", p->name, size); log ("%s: Bad OSPF packet received: too short (%u bytes)", p->name,
size);
log ("%s: Discarding", p->name); log ("%s: Discarding", p->name);
return (1); return (1);
} }
if ((ntohs (ps->length) != size) || (size != (4 * (size / 4)))) if ((ntohs (ps->length) != size) || (size != (4 * (size / 4))))
{ {
log("%s: Bad OSPF packet received: size field does not match", p->name); log ("%s: Bad OSPF packet received: size field does not match",
p->name);
log ("%s: Discarding", p->name); log ("%s: Discarding", p->name);
return (1); return (1);
} }
@ -133,21 +141,24 @@ ospf_rx_hook(sock *sk, int size)
if (ntohl (ps->areaid) != ifa->an) if (ntohl (ps->areaid) != ifa->an)
{ {
log("%s: Bad OSPF packet received: other area %ld", p->name, ps->areaid); log ("%s: Bad OSPF packet received: other area %ld", p->name,
ps->areaid);
log ("%s: Discarding", p->name); log ("%s: Discarding", p->name);
return (1); return (1);
} }
if (ntohl (ps->routerid) == p->cf->global->router_id) if (ntohl (ps->routerid) == p->cf->global->router_id)
{ {
log("%s: Bad OSPF packet received: received my own router ID!", p->name); log ("%s: Bad OSPF packet received: received my own router ID!",
p->name);
log ("%s: Discarding", p->name); log ("%s: Discarding", p->name);
return (1); return (1);
} }
if (ntohl (ps->routerid) == 0) if (ntohl (ps->routerid) == 0)
{ {
log("%s: Bad OSPF packet received: Id 0.0.0.0 is not allowed.", p->name); log ("%s: Bad OSPF packet received: Id 0.0.0.0 is not allowed.",
p->name);
log ("%s: Discarding", p->name); log ("%s: Discarding", p->name);
return (1); return (1);
} }
@ -164,7 +175,8 @@ ospf_rx_hook(sock *sk, int size)
{ {
case HELLO_P: case HELLO_P:
DBG ("%s: Hello received.\n", p->name); DBG ("%s: Hello received.\n", p->name);
ospf_hello_rx((struct ospf_hello_packet *)ps, p, ifa, size, sk->faddr); ospf_hello_rx ((struct ospf_hello_packet *) ps, p, ifa, size,
sk->faddr);
break; break;
case DBDES_P: case DBDES_P:
DBG ("%s: Database description received.\n", p->name); DBG ("%s: Database description received.\n", p->name);
@ -222,8 +234,7 @@ sk_send_to_agt(sock *sk, u16 len, struct ospf_iface *ifa, u8 state)
{ {
struct ospf_neighbor *n; struct ospf_neighbor *n;
WALK_LIST(NODE n,ifa->neigh_list) WALK_LIST (NODE n, ifa->neigh_list) if (n->state >= state)
if(n->state>=state)
sk_send_to (sk, len, n->ip, OSPF_PROTO); sk_send_to (sk, len, n->ip, OSPF_PROTO);
} }
@ -237,4 +248,3 @@ sk_send_to_bdr(sock *sk, u16 len, struct ospf_iface *ifa)
if (ipa_compare (ifa->bdrip, ipa_from_u32 (0)) != 0) if (ipa_compare (ifa->bdrip, ipa_from_u32 (0)) != 0)
sk_send_to (sk, len, ifa->bdrip, OSPF_PROTO); sk_send_to (sk, len, ifa->bdrip, OSPF_PROTO);
} }