Nest: Update default preference based on Cisco values

diff --git a/nest/proto.c b/nest/proto.c
index b22f6d18fe537551598eeed73caad6744ed32865..15d6f4de6d9d056b77c5bbe3ab49c0ed64da7c67 100644 (file)
--- 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 3af86c38e905f2e4751a1a7af7d1789a46db9403..299cbac22b4e5dd73613d9cf13152bc0ac451666 100644 (file)
--- 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 */