2004-07-23 Paul Jakma <paul@dishone.st>

        * ospf6_main.c: Delete LOG_PERROR, not portable.
        * ospf6_network.c: (ospf6_set_pktinfo) use setsockopt_ipv6_pktinfo

diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index a29b2747976d1cafe743532dbd05d2d8d2d4e745..9e8ff461c8a3730d60f1bfc68223a72bc0a718f3 100644 (file)
--- a/ospf6d/ChangeLog
+++ b/ospf6d/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-23 Paul Jakma <paul@dishone.st>
+
+       * ospf6_main.c: Delete LOG_PERROR, not portable.
+       * ospf6_network.c: (ospf6_set_pktinfo) use setsockopt_ipv6_pktinfo
+
 2004-07-06  Yasuhiro Ohara  <yasu@sfc.wide.ad.jp>
 
        * ospf6_message.c, ospf6_interface.c: add a command to configure

diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index ffdad10b75e0ef885dda7790e43553f411d923d7..2a0b2dc94a6f3ac2703c431351d84704d95291d1 100644 (file)
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -271,7 +271,7 @@ main (int argc, char *argv[], char *envp[])
     flag = 0;
 
   zlog_default = openzlog (progname, flag, ZLOG_OSPF6,
-                           LOG_CONS|LOG_NDELAY|LOG_PERROR|LOG_PID,
+                           LOG_CONS|LOG_NDELAY|LOG_PID,
                            LOG_DAEMON);
   zprivs_init (&ospf6d_privs);
   /* initialize zebra libraries */

diff --git a/ospf6d/ospf6_network.c b/ospf6d/ospf6_network.c
index b4f37f6a9c9fa39518983d2257946cdebb915dd5..d5bfdd508b10a00a294e15e0f99d10471b3cc5fd 100644 (file)
--- a/ospf6d/ospf6_network.c
+++ b/ospf6d/ospf6_network.c
@@ -59,16 +59,7 @@ ospf6_reset_mcastloop ()
 void
 ospf6_set_pktinfo ()
 {
-  u_int on = 1;
-#ifdef IPV6_RECVPKTINFO        /*2292bis-01*/
-  if (setsockopt (ospf6_sock, IPPROTO_IPV6, IPV6_RECVPKTINFO,
-                  &on, sizeof (u_int)) < 0)
-    zlog_warn ("Network: set IPV6_RECVPKTINFO failed: %s", strerror (errno));
-#else /*RFC2292*/
-  if (setsockopt (ospf6_sock, IPPROTO_IPV6, IPV6_PKTINFO,
-                  &on, sizeof (u_int)) < 0)
-    zlog_warn ("Network: set IPV6_PKTINFO failed: %s", strerror (errno));
-#endif
+  setsockopt_ipv6_pktinfo (ospf6_sock, 1);
 }
 
 void