2004-07-23 Paul Jakma <paul@dishone.st>
* ospf_network.c: Replace PKTINFO/RECVIF with call to
setsockopt_pktinfo
* ospf_packet.c: Use getsockopt_pktinfo_ifindex and
SOPT_SIZE_CMSG_PKTINFO_IPV4.
diff --git a/ospfd/ospf_network.c b/ospfd/ospf_network.c
index 2766abd..6385187 100644
--- a/ospfd/ospf_network.c
+++ b/ospfd/ospf_network.c
@@ -201,27 +201,9 @@
zlog_warn ("IP_HDRINCL option not available");
#endif /* IP_HDRINCL */
-#if defined (IP_PKTINFO)
- ret = setsockopt (ospf_sock, IPPROTO_IP, IP_PKTINFO, &hincl, sizeof (hincl));
- if (ret < 0)
- {
- if ( ospfd_privs.change (ZPRIVS_LOWER) )
- zlog_err ("ospf_sock_init: could not lower privs, %s",
- strerror (errno) );
- zlog_warn ("Can't set IP_PKTINFO option");
- }
-#elif defined (IP_RECVIF)
- ret = setsockopt (ospf_sock, IPPROTO_IP, IP_RECVIF, &hincl, sizeof (hincl));
- if (ret < 0)
- {
- if ( ospfd_privs.change (ZPRIVS_LOWER) )
- zlog_err ("ospf_sock_init: could not lower privs, %s",
- strerror (errno) );
- zlog_warn ("Can't set IP_RECVIF option");
- }
-#else
-#warning "cannot be able to receive link information on this OS"
-#endif
+ ret = setsockopt_pktinfo (AF_INET, ospf_sock, 1);
+ if (ret < 0)
+ zlog_warn ("Can't set pktinfo option");
if (ospfd_privs.change (ZPRIVS_LOWER))
{