summaryrefslogtreecommitdiffstats
path: root/ospf6d
diff options
context:
space:
mode:
authorDinesh Dutt <ddutt@cumulusnetworks.com>2013-08-26 03:40:37 +0000
committerDavid Lamparter <equinox@opensourcerouting.org>2013-11-20 10:35:59 +0100
commitba960d5ae43e49991ed70fbe9ffa2e4567437a31 (patch)
tree8ffe0291edf209d936ce874c7a7104369f611e7e /ospf6d
parenta0edf6740e8203abec1ee3efa344a417c16fec7b (diff)
downloadquagga-ba960d5ae43e49991ed70fbe9ffa2e4567437a31.tar.bz2
quagga-ba960d5ae43e49991ed70fbe9ffa2e4567437a31.tar.xz
ospf6d: fix integrated config
With integrated config, the line defining an interface to be p2p is defined before assigning the interface to an area. When during the interface transition, there is an attempt to generate a router LSA, the process crashes. This fix addresses that. Signed-off-by: Dinesh G Dutt <ddutt at cumulusnetworks.com> Reviewed-by: Pradosh Mohapatra <pmohapat at cumulusnetworks.com> Reviewed-by: Scott Feldman <sfeldma at cumulusnetworks.com> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospf6d')
-rw-r--r--ospf6d/ospf6_interface.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index fee1632a..111b929a 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -654,6 +654,14 @@ interface_up (struct thread *thread)
return 0;
}
+ /* If no area assigned, return */
+ if (oi->area == NULL)
+ {
+ zlog_debug ("%s: Not scheduleing Hello for %s as there is no area assigned yet", __func__,
+ oi->interface->name);
+ return 0;
+ }
+
/* Join AllSPFRouters */
ospf6_sso (oi->interface->ifindex, &allspfrouters6, IPV6_JOIN_GROUP);