diff options
| -rw-r--r-- | ospfd/ChangeLog | 1 | ||||
| -rw-r--r-- | ospfd/ospf_packet.c | 6 | ||||
| -rw-r--r-- | zebra/ChangeLog | 4 | ||||
| -rw-r--r-- | zebra/irdp_main.c | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog index 2b77ed46..144ef32e 100644 --- a/ospfd/ChangeLog +++ b/ospfd/ChangeLog @@ -4,6 +4,7 @@ function. * ospf_packet.c: (ospf_read) manually look up ifindex if system could not have returned one, eg openbsd. + Change setsockopt_pktinfo to setsockopt_ifindex. 2004-10-19 Andrew J. Schorr <aschorr@telemetry-investments.com> diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index 84f790ac..a931fdbf 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -2303,6 +2303,9 @@ ospf_read (struct thread *thread) if (ibuf == NULL) return -1; + iph = (struct ip *) STREAM_DATA (ibuf); + sockopt_iphdrincl_swab_systoh (iph); + /* openbsd lacks IP_RECVIF */ #if !(defined(IP_PKTINFO) || defined(IP_RECVIF)) if (ifp == NULL) @@ -2314,9 +2317,6 @@ ospf_read (struct thread *thread) stream_free (ibuf); return 0; } - - iph = (struct ip *) STREAM_DATA (ibuf); - sockopt_iphdrincl_swab_systoh (iph); /* prepare for next packet. */ ospf->t_read = thread_add_read (master, ospf_read, ospf, ospf->fd); diff --git a/zebra/ChangeLog b/zebra/ChangeLog index e3774706..25e5c073 100644 --- a/zebra/ChangeLog +++ b/zebra/ChangeLog @@ -1,3 +1,7 @@ +2004-10-22 Paul Jakma <paul@dishone.st> + + * irdp_main.c: change setsockopt_pktinfo to setsockopt_ifindex + 2004-10-19 Andrew J. Schorr <aschorr@telemetry-investments.com> * rt_netlink.c: (netlink_interface_addr) For PtP interfaces, ignore diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c index 5ee50e79..7b916969 100644 --- a/zebra/irdp_main.c +++ b/zebra/irdp_main.c @@ -125,7 +125,7 @@ irdp_sock_init (void) return ret; }; - ret = setsockopt_pktinfo (AF_INET, irdp_sock, 1); + ret = setsockopt_ifindex (AF_INET, irdp_sock, 1); if (ret < 0) { zlog_warn ("IRDP: can't do irdp sockopt %s", strerror(errno)); return ret; |