zebra: add boolean to control pw reachability checking

Add a boolean to control whether pseudowire reachability
checking needs to be strict.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
(cherry picked from commit 6fb3580882bef9cf94aa69a4b202eb9ea5307898)

diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c
index 850ca1763682fc9cfd23f3f877e9857260572b82..a4576b310e15c119f10fb4c8a0da257160f8a311 100644 (file)
--- a/zebra/zebra_mpls.c
+++ b/zebra/zebra_mpls.c
@@ -54,6 +54,7 @@ DEFINE_MTYPE_STATIC(ZEBRA, FEC, "MPLS FEC object");
 DEFINE_MTYPE_STATIC(ZEBRA, NHLFE, "MPLS nexthop object");
 
 int mpls_enabled;
+bool mpls_pw_reach_strict; /* Strict reachability checking */
 
 /* static function declarations */
 
@@ -3977,6 +3978,7 @@ void zebra_mpls_init_tables(struct zebra_vrf *zvrf)
 void zebra_mpls_init(void)
 {
        mpls_enabled = 0;
+       mpls_pw_reach_strict = false;
 
        if (mpls_kernel_init() < 0) {
                flog_warn(EC_ZEBRA_MPLS_SUPPORT_DISABLED,

diff --git a/zebra/zebra_mpls.h b/zebra/zebra_mpls.h
index dd2d2e5658ea1e5b2701baf2852305d57f76c358..7059d393edf5af7cbbe907912cc78f4e5156198c 100644 (file)
--- a/zebra/zebra_mpls.h
+++ b/zebra/zebra_mpls.h
@@ -576,6 +576,7 @@ static inline int mpls_should_lsps_be_processed(struct route_node *rn)
 
 /* Global variables. */
 extern int mpls_enabled;
+extern bool mpls_pw_reach_strict; /* Strict pseudowire reachability checking */
 
 #ifdef __cplusplus
 }

diff --git a/zebra/zebra_mpls_openbsd.c b/zebra/zebra_mpls_openbsd.c
index b767929dc0a554898aea8456b241a662771a5b41..74b1e372783b6bcd5a72ef92ecc07858701b6829 100644 (file)
--- a/zebra/zebra_mpls_openbsd.c
+++ b/zebra/zebra_mpls_openbsd.c
@@ -458,6 +458,9 @@ int mpls_kernel_init(void)
 
        kr_state.rtseq = 1;
 
+       /* Strict pseudowire reachability checking required for obsd */
+       mpls_pw_reach_strict = true;
+
        return 0;
 }