From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Thu, 25 Feb 2016 17:16:59 +0000 (+0100)
Subject: OSPF: Multicast ability is irrelevant for stub interfaces
X-Git-Tag: v1.6.0~20^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3f506f9b53bd8e44976df1c935c7ec417793ace;p=thirdparty%2Fbird.git

OSPF: Multicast ability is irrelevant for stub interfaces
---

diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 77ce839a4..67ae094dd 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -599,10 +599,10 @@ ospf_iface_new(struct ospf_area *oa, struct ifa *addr, struct ospf_iface_patt *i
   if (ospf_is_v2(p) && (ifa->type == OSPF_IT_NBMA) && (addr->flags & IA_PEER))
     ifa->type = OSPF_IT_PTMP;
 
-  if ((ifa->type == OSPF_IT_BCAST) && !(iface->flags & if_multi_flag))
+  if ((ifa->type == OSPF_IT_BCAST) && !(iface->flags & if_multi_flag) && !ifa->stub)
     ifa->type = OSPF_IT_NBMA;
 
-  if ((ifa->type == OSPF_IT_PTP) && !(iface->flags & if_multi_flag))
+  if ((ifa->type == OSPF_IT_PTP) && !(iface->flags & if_multi_flag) && !ifa->stub)
     ifa->type = OSPF_IT_PTMP;
 
   if (ifa->type != old_type)