From: Dinesh Dutt <ddutt@cumulusnetworks.com>
Date: Mon, 26 Aug 2013 03:40:37 +0000 (+0000)
Subject: ospf6d: fix integrated config
X-Git-Tag: frr-2.0-rc1~1628^2~7
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ba960d5ae43e49991ed70fbe9ffa2e4567437a31;p=mirror%2Ffrr.git

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>
---

diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index fee1632a1a..111b929a59 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);