summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <paul>2004-07-23 15:17:45 +0000
committerpaul <paul>2004-07-23 15:17:45 +0000
commit79dc373a5ba4540e093711671eb87b1125f51bcd (patch)
treebd98f33e79e464f9fa381286a49ac2c7aaedba8c
parent2dd8bb4e9b296782f361008b5aa959ac51e16a4c (diff)
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
-rw-r--r--ospf6d/ChangeLog5
-rw-r--r--ospf6d/ospf6_main.c2
-rw-r--r--ospf6d/ospf6_network.c11
3 files changed, 7 insertions, 11 deletions
diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index a29b2747..9e8ff461 100644
--- 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 ffdad10b..2a0b2dc9 100644
--- 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 b4f37f6a..d5bfdd50 100644
--- 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