From: Renato Westphal <renato@opensourcerouting.org>
Date: Sat, 14 Nov 2020 02:28:07 +0000 (-0300)
Subject: isisd: move and rename the infinity metric constants
X-Git-Tag: base_7.6~170^2~7
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=35f70ed3f9f1379e7a0b5ff339562e97e7c24a5e;p=matthieu%2Ffrr.git

isisd: move and rename the infinity metric constants

Those constants are also useful in contexts other than LDP-IGP
Synchronization (e.g. the upcoming LFA work will need them). Move
them to a more general header to reflect that.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/isisd/isis_ldp_sync.c b/isisd/isis_ldp_sync.c
index 988af64c48..3b1faffe53 100644
--- a/isisd/isis_ldp_sync.c
+++ b/isisd/isis_ldp_sync.c
@@ -429,20 +429,24 @@ void isis_ldp_sync_set_if_metric(struct isis_circuit *circuit, bool run_regen)
 			if (circuit->area->newmetric) {
 				ldp_sync_info->metric[0] =
 					circuit->te_metric[0];
-				circuit->te_metric[0] = LDP_ISIS_LSINFINITY;
+				circuit->te_metric[0] =
+					ISIS_WIDE_METRIC_INFINITY;
 			} else {
 				ldp_sync_info->metric[0] = circuit->metric[0];
-				circuit->metric[0] = LDP_ISIS_LSINFINITY_NL;
+				circuit->metric[0] =
+					ISIS_NARROW_METRIC_INFINITY;
 			}
 		}
 		if (circuit->is_type & IS_LEVEL_2) {
 			if (circuit->area->newmetric) {
 				ldp_sync_info->metric[1] =
 					circuit->te_metric[1];
-				circuit->te_metric[1] = LDP_ISIS_LSINFINITY;
+				circuit->te_metric[1] =
+					ISIS_WIDE_METRIC_INFINITY;
 			} else {
 				ldp_sync_info->metric[1] = circuit->metric[1];
-				circuit->metric[1] = LDP_ISIS_LSINFINITY_NL;
+				circuit->metric[1] =
+					ISIS_NARROW_METRIC_INFINITY;
 			}
 		}
 	} else {
diff --git a/isisd/isis_ldp_sync.h b/isisd/isis_ldp_sync.h
index 6017cdf001..61ac946078 100644
--- a/isisd/isis_ldp_sync.h
+++ b/isisd/isis_ldp_sync.h
@@ -20,9 +20,6 @@
 #ifndef _ZEBRA_ISIS_LDP_SYNC_H
 #define _ZEBRA_ISIS_LDP_SYNC_H
 
-#define LDP_ISIS_LSINFINITY 0xFFFFFE  /* wide link metric */
-#define LDP_ISIS_LSINFINITY_NL 62     /* narrow link metric */
-
 /* Macro to log debug message */
 #define ils_debug(...)                                                         \
 	do {                                                                   \
diff --git a/isisd/isis_tlvs.h b/isisd/isis_tlvs.h
index 54ded8121d..037f91f0b8 100644
--- a/isisd/isis_tlvs.h
+++ b/isisd/isis_tlvs.h
@@ -42,6 +42,9 @@ struct isis_area_address {
 	uint8_t len;
 };
 
+#define ISIS_WIDE_METRIC_INFINITY   0xFFFFFE
+#define ISIS_NARROW_METRIC_INFINITY 62
+
 struct isis_oldstyle_reach;
 struct isis_oldstyle_reach {
 	struct isis_oldstyle_reach *next;