[quagga-dev 1005] bugzilla #86: ospf_recv_packet will fail on Solaris/x86

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index ca9dd04de5c3c37c673be4c4bc2c98417cb490c8..140f87a35d7546efb189c482a6e3ce7051bae81c 100644 (file)
--- 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 528e8d385f6b2c24fceba129d1265d32fbeba845..1f8ecd462b0e4fd081eb84ac54a6d021b4352112 100644 (file)
--- 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