2004-10-22 Paul Jakma <paul@dishone.st>
* ospfd/ospf_packet.c: setsockopt_pktinfo -> setsockopt_ifindex
* zebra/irdp_main.c: ditto
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 2b77ed4..144ef32 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 84f790a..a931fdb 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -2303,6 +2303,9 @@
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 @@
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 e377470..25e5c07 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 5ee50e7..7b91696 100644
--- a/zebra/irdp_main.c
+++ b/zebra/irdp_main.c
@@ -125,7 +125,7 @@
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;