summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgdt <gdt>2004-08-27 12:03:42 +0000
committergdt <gdt>2004-08-27 12:03:42 +0000
commitd7d93997315472f2f1f40012795e31604db95491 (patch)
tree3161675e2d3f96491d3bbb57b1f6e28153d9ae00
parent7225687afa5a7c7efafbea9b737673762daaa395 (diff)
2004-08-27 David Wiggins <dwiggins@bbn.com>
* ospf_spf.c (ospf_nexthop_calculation): Initialize address family in on-stack struct prefix_ipv4. Fixes point-to-multipoint SPF calculation.
-rw-r--r--ospfd/ChangeLog14
-rw-r--r--ospfd/ospf_spf.c1
2 files changed, 11 insertions, 4 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 3da4571f..64bddca0 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,10 +1,16 @@
+2004-08-27 David Wiggins <dwiggins@bbn.com>
+
+ * ospf_spf.c (ospf_nexthop_calculation): Initialize address family
+ in on-stack struct prefix_ipv4. Fixes point-to-multipoint SPF
+ calculation.
+
2004-08-26 Greg Troxel <gdt@fnord.ir.bbn.com>
* ospf_packet.c (ospf_recv_packet): adjust size declaration of
- buffer used to get interface index so that it compiles on other
- than Linux and includes the required alignment space. Probably
- this was only working on sparc/sparc64 because most of sockaddr_dl
- was not being written.
+ buffer used to get interface index so that it compiles on other
+ than Linux and includes the required alignment space. Probably
+ this was only working on sparc/sparc64 because most of
+ sockaddr_dl was not being written.
2004-08-19 Paul Jakma <paul@dishone.st>
diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c
index 5afdf161..bc12c366 100644
--- a/ospfd/ospf_spf.c
+++ b/ospfd/ospf_spf.c
@@ -424,6 +424,7 @@ ospf_nexthop_calculation (struct ospf_area *area,
if (oi && oi->type == OSPF_IFTYPE_POINTOMULTIPOINT)
{
struct prefix_ipv4 la;
+ la.family = AF_INET;
la.prefixlen = oi->address->prefixlen;
/* We link to them on PtMP interface
- find the interface on w */