Merge pull request #3776 from opensourcerouting/pbrd-interface-nexthops

pbrd: add support for interface nexthops

diff --cc lib/nexthop_group.c
index f940418d8325b89dd1a1de747ce0da64ec891399,bf298c6dec286359288e7f80ac0436f052b043ed..27ab04279c1cc3617dca745fd3b19c2f54def98c
--- 1/lib/nexthop_group.c
--- 2/lib/nexthop_group.c
+++ b/lib/nexthop_group.c
@@@ -205,10 -219,15 +219,13 @@@ static int nhgl_cmp(struct nexthop_hol
  
  static void nhgl_delete(struct nexthop_hold *nh)
  {
 -      if (nh->intf)
 -              XFREE(MTYPE_TMP, nh->intf);
 +      XFREE(MTYPE_TMP, nh->intf);
  
 -      if (nh->nhvrf_name)
 -              XFREE(MTYPE_TMP, nh->nhvrf_name);
 +      XFREE(MTYPE_TMP, nh->nhvrf_name);
  
+       if (nh->addr)
+               sockunion_free(nh->addr);
+ 
        XFREE(MTYPE_TMP, nh);
  }
  

diff --cc pbrd/pbr_nht.c
Simple merge

diff --cc pbrd/pbr_vty.c
Simple merge

diff --cc pbrd/pbr_zebra.c
Simple merge