summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Troxel <gdt@ir.bbn.com>2011-07-13 13:20:06 -0400
committerGreg Troxel <gdt@ir.bbn.com>2011-07-13 13:20:06 -0400
commit8ced4e82e6f417b13f4bfc09018fc51fd31058e2 (patch)
tree9d744d6f95473a0b8d49338ee502dfb765e00f5f
parent7e924e11a965fc1053a16945ace10c9bd1d868f8 (diff)
parent0150c9c969cfbacb28fa9e05c8bf7f65448d9914 (diff)
Merge remote-tracking branch 'polymorf/master'
-rw-r--r--ospfd/ospf_packet.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 8b7c63a9..be137d91 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -688,6 +688,13 @@ ospf_write (struct thread *thread)
iph.ip_tos = IPTOS_PREC_INTERNETCONTROL;
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
/* XXX-MT: not thread-safe at all..
* 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);
#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);
*ifp = if_lookup_by_index (ifindex);