matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge remote-tracking branch 'polymorf/master'

Browse source
This commit is contained in:
Greg Troxel 2011-07-13 13:20:06 -04:00
parent 7e924e11a9 0150c9c969
commit 8ced4e82e6
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ospfd/ospf_packet.c
View file

@ -688,6 +688,13 @@ ospf_write (struct thread *thread)
iph.ip_tos = IPTOS_PREC_INTERNETCONTROL; iph.ip_tos = IPTOS_PREC_INTERNETCONTROL;
iph.ip_len = (iph.ip_hl << OSPF_WRITE_IPHL_SHIFT) + op->length; iph.ip_len = (iph.ip_hl << OSPF_WRITE_IPHL_SHIFT) + op->length;
#if defined(__DragonFly__)
/*
* DragonFly's raw socket expects ip_len/ip_off in network byte order.
*/
iph.ip_len = htons(iph.ip_len);
#endif
#ifdef WANT_OSPF_WRITE_FRAGMENT #ifdef WANT_OSPF_WRITE_FRAGMENT
/* XXX-MT: not thread-safe at all.. /* XXX-MT: not thread-safe at all..
* XXX: this presumes this is only programme sending OSPF packets * XXX: this presumes this is only programme sending OSPF packets
@ -2127,6 +2134,15 @@ ospf_recv_packet (int fd, struct interface **ifp, struct stream *ibuf)
ip_len = ip_len + (iph->ip_hl << 2); ip_len = ip_len + (iph->ip_hl << 2);
#endif #endif
#if defined(__DragonFly__)
/*
* in DragonFly's raw socket, ip_len/ip_off are read
* in network byte order.
* As OpenBSD < 200311 adjust ip_len to strip IP header size!
*/
ip_len = ntohs(iph->ip_len) + (iph->ip_hl << 2);
#endif
ifindex = getsockopt_ifindex (AF_INET, &msgh); ifindex = getsockopt_ifindex (AF_INET, &msgh);
*ifp = if_lookup_by_index (ifindex); *ifp = if_lookup_by_index (ifindex);