From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Mon, 10 Dec 2018 01:05:21 +0000 (+0100)
Subject: OSPF: Fix reconfiguration of vlinks
X-Git-Tag: v1.6.5~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c0b12ac86d9075b76a3906d0c25ba9bc73bbb2c;p=thirdparty%2Fbird.git

OSPF: Fix reconfiguration of vlinks

Fix crash during reconfiguration of OSPF config with vlinks. When vlink
is reconfigured, a generic iface-reconfiguration code is used, which in
one place supposes that it is running on a regular iface.

Thanks to Cybertinus for a bugreport.
---

diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 6e3a48b3a..feff0f436 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -524,6 +524,10 @@ add_nbma_node(struct ospf_iface *ifa, struct nbma_node *src, int found)
 static int
 ospf_iface_stubby(struct ospf_iface_patt *ip, struct ifa *addr)
 {
+  /* vlink cannot be stub */
+  if (ip->type == OSPF_IT_VLINK)
+    return 0;
+
   /* a host address */
   if (addr->flags & IA_HOST)
     return 1;