summaryrefslogtreecommitdiff
path: root/ospfd
diff options
context:
space:
mode:
authorhasso <hasso>2004-04-04 12:52:33 +0000
committerhasso <hasso>2004-04-04 12:52:33 +0000
commit128d31d34220192c27c2d1d8eff91e0471c5237c (patch)
tree7c668f7be9196439d8160a87c5fd9baea2a566df /ospfd
parent1666d353474b7dca951837c3f46c3f16170d11ee (diff)
[quagga-dev 1005] bugzilla #86: ospf_recv_packet will fail on Solaris/x86
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/ChangeLog5
-rw-r--r--ospfd/ospf_packet.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index ca9dd04d..140f87a3 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-19 Sowmini Varadhan <sowmini.varadhan@sun.com>
+
+ * ospf_packet.c: Don't drop packets in Solaris x86.
+ [quagga-dev 1005].
+
2004-03-18 Amir Guindehi <amir@datacore.ch>
* ospf_opaque.c: Attempt to correct the incorrect behavior of
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 528e8d38..1f8ecd46 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -2018,8 +2018,12 @@ ospf_recv_packet (int fd, struct interface **ifp)
pktinfo = (struct in_pktinfo *)CMSG_DATA(cmsg);
ifindex = pktinfo->ipi_ifindex;
#elif defined (IP_RECVIF)
+#ifdef SUNOS_5
+ ifindex = *(uint_t *)CMSG_DATA(cmsg);
+#else
pktinfo = (struct sockaddr_dl *)CMSG_DATA(cmsg);
ifindex = pktinfo->sdl_index;
+#endif /* SUNOS_5 */
#else
ifindex = 0;
#endif