From: Christian Franke <chris@opensourcerouting.org>
Date: Sat, 6 May 2017 13:50:50 +0000 (+0200)
Subject: isisd: use MT to only advertise usable links
X-Git-Tag: reindent-master-before~198^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cb02eebe01cf9291582677505c8e3fa826cd9d25;p=mirror%2Ffrr.git

isisd: use MT to only advertise usable links

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
---

diff --git a/isisd/isis_mt.c b/isisd/isis_mt.c
index 552365ad10..d15da1d27a 100644
--- a/isisd/isis_mt.c
+++ b/isisd/isis_mt.c
@@ -415,7 +415,7 @@ tlvs_to_adj_mt_set(struct tlvs *tlvs, bool v4_usable, bool v6_usable,
       if (!tlvs->mt_router_info)
         {
           /* Other end does not have MT enabled */
-          if (mt_settings[i]->mtid == ISIS_MT_IPV4_UNICAST)
+          if (mt_settings[i]->mtid == ISIS_MT_IPV4_UNICAST && v4_usable)
             adj_mt_set(adj, intersect_count++, ISIS_MT_IPV4_UNICAST);
         }
       else
@@ -425,7 +425,27 @@ tlvs_to_adj_mt_set(struct tlvs *tlvs, bool v4_usable, bool v6_usable,
           for (ALL_LIST_ELEMENTS_RO(tlvs->mt_router_info, node, info))
             {
               if (mt_settings[i]->mtid == info->mtid)
-                adj_mt_set(adj, intersect_count++, info->mtid);
+                {
+                  bool usable;
+                  switch (info->mtid)
+                    {
+                      case ISIS_MT_IPV4_UNICAST:
+                      case ISIS_MT_IPV4_MGMT:
+                      case ISIS_MT_IPV4_MULTICAST:
+                        usable = v4_usable;
+                        break;
+                      case ISIS_MT_IPV6_UNICAST:
+                      case ISIS_MT_IPV6_MGMT:
+                      case ISIS_MT_IPV6_MULTICAST:
+                        usable = v6_usable;
+                        break;
+                      default:
+                        usable = true;
+                        break;
+                    }
+                  if (usable)
+                    adj_mt_set(adj, intersect_count++, info->mtid);
+                }
             }
         }
     }