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.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 3da4571f095883dc6ec3d1303cc00ed0f8605494..64bddca098000d1de796b5a75d807ff9c092919d 100644 (file)
--- 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 5afdf161b8cf11f15f8472ce52356659dec9929e..bc12c366d61ff588cb8f0106578d0cbd27f74cc1 100644 (file)
--- 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 */