From: Maria Matejka <mq@ucw.cz>
Date: Thu, 29 Sep 2022 07:58:27 +0000 (+0200)
Subject: Merge commit '9efaf6ba' into tmp-bad-learn
X-Git-Tag: v3.0-alpha1~107^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61c127c021ac34eba25d3245ccf8f9eb9dd352f5;p=thirdparty%2Fbird.git

Merge commit '9efaf6ba' into tmp-bad-learn

Also fixed forgotten best route selection among alien routes.
---

61c127c021ac34eba25d3245ccf8f9eb9dd352f5
diff --cc sysdep/unix/krt.c
index 4539feee5,67d19cbb4..93d196149
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@@ -974,6 -757,6 +757,14 @@@ krt_feed_end(struct channel *C
    krt_scan_timer_kick(p);
  }
  
++static int
++krt_rte_better(rte *new, rte *old)
++{
++  u32 n = ea_get_int(new->attrs, &ea_krt_metric, IGP_METRIC_UNKNOWN);
++  u32 o = ea_get_int(old->attrs, &ea_krt_metric, IGP_METRIC_UNKNOWN);
++
++  return (n < o);
++}
  
  /*
   *	Protocol glue
@@@ -1033,6 -816,6 +824,7 @@@ krt_init(struct proto_config *CF
    p->p.if_notify = krt_if_notify;
    p->p.reload_routes = krt_reload_routes;
    p->p.feed_end = krt_feed_end;
++  p->p.rte_better = krt_rte_better;
  
    krt_sys_init(p);
    return &p->p;