Merge pull request #2133 from Fredi-raspall/fix_label_manager

Fix broken label manager (proxy-mode) and improve of proxy function

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc lib/zclient.c
index 05bd907589ce4940273098b9c56c6750a2d7e57b,dac3af5821c0919d7bd235ca080aa4fe377f679a..0f7cf350dbad7e1a5a3c4b3a659a8c6c10825664
--- 1/lib/zclient.c
--- 2/lib/zclient.c
+++ b/lib/zclient.c
@@@ -2789,24 -2792,8 +2818,24 @@@ static int zclient_read(struct thread *
        case ZEBRA_GET_LABEL_CHUNK:
                if (zclient->label_chunk)
                        (*zclient->label_chunk)(command, zclient, length,
-                                                     vrf_id);
+                                               vrf_id);
                break;
 +      case ZEBRA_IPSET_NOTIFY_OWNER:
 +              if (zclient->ipset_notify_owner)
 +                      (*zclient->ipset_notify_owner)(command, zclient, length,
 +                                                    vrf_id);
 +              break;
 +      case ZEBRA_IPSET_ENTRY_NOTIFY_OWNER:
 +              if (zclient->ipset_entry_notify_owner)
 +                      (*zclient->ipset_entry_notify_owner)(command,
 +                                                   zclient, length,
 +                                                   vrf_id);
 +              break;
 +      case ZEBRA_IPTABLE_NOTIFY_OWNER:
 +              if (zclient->iptable_notify_owner)
 +                      (*zclient->iptable_notify_owner)(command,
 +                                               zclient, length,
 +                                               vrf_id);
        default:
                break;
        }

diff --cc zebra/zapi_msg.c
Simple merge