From 0150c9c969cfbacb28fa9e05c8bf7f65448d9914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=89RARD?= <contact@davidberard.fr>
Date: Tue, 11 May 2010 10:17:53 +0200
Subject: Fix ip_len byte order in DragonFly's raw socket
---
ospfd/ospf_packet.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
(limited to 'ospfd')
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 1066e64f..1b68fd5a 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -653,6 +653,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
@@ -2080,6 +2087,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);
--
cgit v1.2.1