Commit 3ce17142 authored by Ondrej Zajicek's avatar Ondrej Zajicek
Browse files

Fixes a new bug in BGP route ordering.

parent 2c5ca47a

proto/bgp/attrs.c

+3 −4
Original line number Diff line number Diff line
@@ -1768,12 +1768,11 @@ bgp_get_route_info(rte *e, byte *buf, ea_list *attrs) 
  eattr *o = ea_find(attrs, EA_CODE(EAP_BGP, BA_ORIGIN));

  u32 origas;



  /*

  buf += bsprintf(buf, " (%d", e->pref);



  if (e->u.bgp.suppressed)

    buf += bsprintf(buf, "-");

  */



  buf += bsprintf(buf, " (%d", e->pref);

  if (e->attrs->hostentry)

    {

      if (!rte_resolvable(e))

proto/bgp/packets.c

+2 −0
Original line number Diff line number Diff line
@@ -906,6 +906,7 @@ bgp_do_rx_update(struct bgp_conn *conn, 
	  rte *e = rte_get_temp(rta_clone(a));

	  e->net = net_get(p->p.table, prefix, pxlen);

	  e->pflags = 0;

	  e->u.bgp.suppressed = 0;

	  rte_update(p->p.table, e->net, &p->p, &p->p, e);

	}

      else
@@ -1024,6 +1025,7 @@ bgp_do_rx_update(struct bgp_conn *conn, 
	      rte *e = rte_get_temp(rta_clone(a));

	      e->net = net_get(p->p.table, prefix, pxlen);

	      e->pflags = 0;

	      e->u.bgp.suppressed = 0;

	      rte_update(p->p.table, e->net, &p->p, &p->p, e);

	    }

	  else

CRA Git | Maintained and supported by SUSTech CRA and CCSE