summaryrefslogtreecommitdiff
path: root/ospfd
diff options
context:
space:
mode:
authorpaul <paul>2004-10-22 17:00:38 +0000
committerpaul <paul>2004-10-22 17:00:38 +0000
commit06f953f7abd1ac10e059fc756878ac135bb76c58 (patch)
treec18b23bb5b309ca9940c00f173028b4be85abd88 /ospfd
parent4927cf0bf0828f2c4a9bda30f3c890d1835c7370 (diff)
2004-10-22 Paul Jakma <paul@dishone.st>
* ospfd/ospf_packet.c: setsockopt_pktinfo -> setsockopt_ifindex * zebra/irdp_main.c: ditto
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/ChangeLog1
-rw-r--r--ospfd/ospf_packet.c6
2 files changed, 4 insertions, 3 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);