Commit 668be0ff authored by Ondrej Zajicek (work)'s avatar Ondrej Zajicek (work)
Browse files

Nest: Change preference to lower-is-better

parent 5a96090a

nest/proto.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = proto->protocol->preference;

  cf->preference = 250 - proto->protocol->preference;



  add_tail(&proto->channels, &cf->n);

nest/route.h

+1 −0
Original line number Diff line number Diff line
@@ -666,6 +666,7 @@ 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 */

nest/rt-table.c

+2 −2
Original line number Diff line number Diff line
@@ -335,9 +335,9 @@ rte_better(rte *new, rte *old) 
  if (!rte_is_valid(new))

    return 0;



  if (new->pref > old->pref)

    return 1;

  if (new->pref < old->pref)

    return 1;

  if (new->pref > old->pref)

    return 0;

  if (new->attrs->src->proto->proto != old->attrs->src->proto->proto)

    {

proto/babel/babel.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e) 
    rte *rte = rte_get_temp(a);

    memset(&rte->u.babel, 0, sizeof(rte->u.babel));

    rte->pflags = 0;

    rte->pref = 1;

    rte->pref = 65535;



    e->unreachable = 1;

    rte_update2(c, e->n.addr, rte, p->p.main_source);

CRA Git | Maintained and supported by SUSTech CRA and CCSE