From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Tue, 13 Nov 2018 13:18:11 +0000 (+0100)
Subject: Nest: Update default preference based on Cisco values
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf58ebc0bb7947383b150f40af40701dcf950c2b;p=thirdparty%2Fbird.git

Nest: Update default preference based on Cisco values
---

diff --git a/nest/proto.c b/nest/proto.c
index b22f6d18f..15d6f4de6 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -483,7 +483,7 @@ channel_config_new(const struct channel_class *cc, const char *name, uint net_ty
 
   cf->net_type = net_type;
   cf->ra_mode = RA_OPTIMAL;
-  cf->preference = 250 - proto->protocol->preference;
+  cf->preference = proto->protocol->preference;
 
   add_tail(&proto->channels, &cf->n);
 
diff --git a/nest/route.h b/nest/route.h
index 3af86c38e..299cbac22 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -666,15 +666,14 @@ extern struct protocol *attr_class_to_protocol[EAP_MAX];
 
 /*
  *	Default protocol preferences
- *	(effective values are 250-X of these)
  */
 
-#define DEF_PREF_DIRECT		240	/* Directly connected */
-#define DEF_PREF_STATIC		200	/* Static route */
-#define DEF_PREF_OSPF		150	/* OSPF intra-area, inter-area and type 1 external routes */
-#define DEF_PREF_BABEL		130	/* Babel */
+#define DEF_PREF_DIRECT		0	/* Directly connected */
+#define DEF_PREF_STATIC		1	/* Static route */
+#define DEF_PREF_OSPF		110	/* OSPF intra-area, inter-area and type 1 external routes */
+#define DEF_PREF_BABEL		115	/* Babel */
 #define DEF_PREF_RIP		120	/* RIP */
-#define DEF_PREF_BGP		100	/* BGP */
+#define DEF_PREF_BGP		200	/* BGP */
 #define DEF_PREF_RPKI		100	/* RPKI */
 #define DEF_PREF_INHERITED	10	/* Routes inherited from other routing daemons */