Diff for /embedaddon/bird/proto/static/static.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2017/08/22 12:33:54 version 1.1.1.2, 2021/03/17 19:50:23
Line 150  static_update_bfd(struct proto *p, struct static_route Line 150  static_update_bfd(struct proto *p, struct static_route
   if (bfd_up && !r->bfd_req)    if (bfd_up && !r->bfd_req)
   {    {
     // ip_addr local = ipa_nonzero(r->local) ? r->local : nb->ifa->ip;      // ip_addr local = ipa_nonzero(r->local) ? r->local : nb->ifa->ip;
    r->bfd_req = bfd_request_session(p->pool, r->via, nb->ifa->ip, nb->iface,    r->bfd_req = bfd_request_session(p->pool, r->via, nb->ifa->ip, nb->iface, p->vrf,
                                      static_bfd_notify, r);                                       static_bfd_notify, r);
   }    }
   
Line 498  static_same_dest(struct static_route *x, struct static Line 498  static_same_dest(struct static_route *x, struct static
 static inline int  static inline int
 static_same_rte(struct static_route *x, struct static_route *y)  static_same_rte(struct static_route *x, struct static_route *y)
 {  {
  return static_same_dest(x, y) && i_same(x->cmds, y->cmds);  /* Note that i_same() requires arguments in (new, old) order */
   return static_same_dest(x, y) && i_same(y->cmds, x->cmds);
 }  }
   
   
Line 516  static_match(struct proto *p, struct static_route *r,  Line 517  static_match(struct proto *p, struct static_route *r, 
   
   if (r->neigh)    if (r->neigh)
     r->neigh->data = NULL;      r->neigh->data = NULL;
   
     if (r->dest == RTD_MULTIPATH)
       for (t = r->mp_next; t; t = t->mp_next)
         if (t->neigh)
           t->neigh->data = NULL;
   
   WALK_LIST(t, n->iface_routes)    WALK_LIST(t, n->iface_routes)
     if (static_same_net(r, t))      if (static_same_net(r, t))

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>