Merge pull request #12600 from donaldsharp/local_routes

*: Introduce Local Host Routes to FRR

diff --cc lib/zclient.h
Simple merge

diff --cc zebra/connected.c
index 9a41400f4e0c0c952d1548a8bf4cbff5d8a4b954,78aca5ee5c35825823d21c7e63fc2977a0ef3050..297234b6afb7a11618589606cdfa5ec95e62089e
--- 1/zebra/connected.c
--- 2/zebra/connected.c
+++ b/zebra/connected.c
@@@ -190,7 -192,9 +190,8 @@@ void connected_up(struct interface *ifp
        uint32_t metric;
        uint32_t flags = 0;
        uint32_t count = 0;
 -      struct listnode *cnode;
        struct connected *c;
+       bool install_local = true;
  
        zvrf = ifp->vrf->info;
        if (!zvrf) {
@@@ -373,7 -394,9 +391,8 @@@ void connected_down(struct interface *i
        };
        struct zebra_vrf *zvrf;
        uint32_t count = 0;
 -      struct listnode *cnode;
        struct connected *c;
+       bool remove_local = true;
  
        zvrf = ifp->vrf->info;
        if (!zvrf) {

diff --cc zebra/redistribute.c
Simple merge

diff --cc zebra/rib.h
Simple merge

diff --cc zebra/rt_netlink.c
Simple merge

diff --cc zebra/zapi_msg.c
Simple merge

diff --cc zebra/zebra_mpls.c
Simple merge

diff --cc zebra/zebra_nhg.c
Simple merge

diff --cc zebra/zebra_rib.c
Simple merge

diff --cc zebra/zebra_rnh.c
Simple merge

diff --cc zebra/zebra_vty.c
Simple merge

diff --cc zebra/zserv.h
Simple merge