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
This commit is contained in:
paul 2004-07-23 15:17:45 +00:00
parent 2dd8bb4e9b
commit 79dc373a5b
3 changed files with 7 additions and 11 deletions

View File

@ -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

View File

@ -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 */

View File

@ -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