]> git.proxmox.com Git - mirror_frr.git/blobdiff - zebra/zapi_msg.c
zebra: delay default vrf name after vrf initialization
[mirror_frr.git] / zebra / zapi_msg.c
index 008fc8f066c4554afe4c4aa4f843d947b70ec7e7..b93911bee78f9f49577293fa807d3dca1bc97dd8 100644 (file)
@@ -62,6 +62,7 @@
 #include "zebra/zebra_pbr.h"
 #include "zebra/table_manager.h"
 #include "zebra/zapi_msg.h"
+#include "zebra/zebra_errors.h"
 
 /* Encoding helpers -------------------------------------------------------- */
 
@@ -117,6 +118,7 @@ static void zserv_encode_vrf(struct stream *s, struct zebra_vrf *zvrf)
 
 static int zserv_encode_nexthop(struct stream *s, struct nexthop *nexthop)
 {
+       stream_putl(s, nexthop->vrf_id);
        stream_putc(s, nexthop->type);
        switch (nexthop->type) {
        case NEXTHOP_TYPE_IPV4:
@@ -246,7 +248,7 @@ int zsend_interface_link_params(struct zserv *client, struct interface *ifp)
  *      RTM_IFANNOUNCE or AF_NETLINK sockets is available), or when
  *      an interface is marked IFF_UP (i.e., an RTM_IFINFO message is
  *      received)
- *    - for the vty commands "ip address A.B.C.D/M [<secondary>|<label LINE>]"
+ *    - for the vty commands "ip address A.B.C.D/M [<label LINE>]"
  *      and "no bandwidth <1-10000000>", "ipv6 address X:X::X:X/M"
  *    - when an RTM_NEWADDR message is received from the kernel,
  *
@@ -267,7 +269,7 @@ int zsend_interface_link_params(struct zserv *client, struct interface *ifp)
  *             |
  *         vty commands:
  *     "no ip address A.B.C.D/M [label LINE]"
- *     "no ip address A.B.C.D/M secondary"
+ *     "no ip address A.B.C.D/M"
  *     ["no ipv6 address X:X::X:X/M"]
  *
  */
@@ -739,6 +741,20 @@ int zsend_route_notify_owner(struct route_entry *re, const struct prefix *p,
                                      re->table, note));
 }
 
+/*
+ * Route-owner notification using info from dataplane update context.
+ */
+int zsend_route_notify_owner_ctx(const struct zebra_dplane_ctx *ctx,
+                                enum zapi_route_notify_owner note)
+{
+       return (route_notify_internal(dplane_ctx_get_dest(ctx),
+                                     dplane_ctx_get_type(ctx),
+                                     dplane_ctx_get_instance(ctx),
+                                     dplane_ctx_get_vrf(ctx),
+                                     dplane_ctx_get_table(ctx),
+                                     note));
+}
+
 void zsend_rule_notify_owner(struct zebra_pbr_rule *rule,
                             enum zapi_rule_notify_owner note)
 {
@@ -1022,6 +1038,7 @@ static void zread_rnh_register(ZAPI_HANDLER_ARGS)
        unsigned short l = 0;
        uint8_t flags = 0;
        uint16_t type = cmd2type[hdr->command];
+       bool exist;
 
        if (IS_ZEBRA_DEBUG_NHT)
                zlog_debug(
@@ -1040,8 +1057,9 @@ static void zread_rnh_register(ZAPI_HANDLER_ARGS)
                STREAM_GETC(s, p.prefixlen);
                l += 4;
                if (p.family == AF_INET) {
+                       client->v4_nh_watch_add_cnt++;
                        if (p.prefixlen > IPV4_MAX_BITLEN) {
-                               zlog_warn(
+                               zlog_debug(
                                        "%s: Specified prefix hdr->length %d is too large for a v4 address",
                                        __PRETTY_FUNCTION__, p.prefixlen);
                                return;
@@ -1049,8 +1067,9 @@ static void zread_rnh_register(ZAPI_HANDLER_ARGS)
                        STREAM_GET(&p.u.prefix4.s_addr, s, IPV4_MAX_BYTELEN);
                        l += IPV4_MAX_BYTELEN;
                } else if (p.family == AF_INET6) {
+                       client->v6_nh_watch_add_cnt++;
                        if (p.prefixlen > IPV6_MAX_BITLEN) {
-                               zlog_warn(
+                               zlog_debug(
                                        "%s: Specified prefix hdr->length %d is to large for a v6 address",
                                        __PRETTY_FUNCTION__, p.prefixlen);
                                return;
@@ -1059,12 +1078,15 @@ static void zread_rnh_register(ZAPI_HANDLER_ARGS)
                        l += IPV6_MAX_BYTELEN;
                } else {
                        flog_err(
-                               ZEBRA_ERR_UNKNOWN_FAMILY,
+                               EC_ZEBRA_UNKNOWN_FAMILY,
                                "rnh_register: Received unknown family type %d\n",
                                p.family);
                        return;
                }
-               rnh = zebra_add_rnh(&p, zvrf_id(zvrf), type);
+               rnh = zebra_add_rnh(&p, zvrf_id(zvrf), type, &exist);
+               if (!rnh)
+                       return;
+
                if (type == RNH_NEXTHOP_TYPE) {
                        if (flags
                            && !CHECK_FLAG(rnh->flags, ZEBRA_NHT_CONNECTED))
@@ -1084,7 +1106,8 @@ static void zread_rnh_register(ZAPI_HANDLER_ARGS)
 
                zebra_add_rnh_client(rnh, client, type, zvrf_id(zvrf));
                /* Anything not AF_INET/INET6 has been filtered out above */
-               zebra_evaluate_rnh(zvrf_id(zvrf), p.family, 1, type, &p);
+               if (!exist)
+                       zebra_evaluate_rnh(zvrf, p.family, 1, type, &p);
        }
 
 stream_failure:
@@ -1119,8 +1142,9 @@ static void zread_rnh_unregister(ZAPI_HANDLER_ARGS)
                STREAM_GETC(s, p.prefixlen);
                l += 4;
                if (p.family == AF_INET) {
+                       client->v4_nh_watch_rem_cnt++;
                        if (p.prefixlen > IPV4_MAX_BITLEN) {
-                               zlog_warn(
+                               zlog_debug(
                                        "%s: Specified prefix hdr->length %d is to large for a v4 address",
                                        __PRETTY_FUNCTION__, p.prefixlen);
                                return;
@@ -1128,8 +1152,9 @@ static void zread_rnh_unregister(ZAPI_HANDLER_ARGS)
                        STREAM_GET(&p.u.prefix4.s_addr, s, IPV4_MAX_BYTELEN);
                        l += IPV4_MAX_BYTELEN;
                } else if (p.family == AF_INET6) {
+                       client->v6_nh_watch_rem_cnt++;
                        if (p.prefixlen > IPV6_MAX_BITLEN) {
-                               zlog_warn(
+                               zlog_debug(
                                        "%s: Specified prefix hdr->length %d is to large for a v6 address",
                                        __PRETTY_FUNCTION__, p.prefixlen);
                                return;
@@ -1138,7 +1163,7 @@ static void zread_rnh_unregister(ZAPI_HANDLER_ARGS)
                        l += IPV6_MAX_BYTELEN;
                } else {
                        flog_err(
-                               ZEBRA_ERR_UNKNOWN_FAMILY,
+                               EC_ZEBRA_UNKNOWN_FAMILY,
                                "rnh_register: Received unknown family type %d\n",
                                p.family);
                        return;
@@ -1175,7 +1200,7 @@ static void zread_fec_register(ZAPI_HANDLER_ARGS)
         */
        if (hdr->length < ZEBRA_MIN_FEC_LENGTH) {
                flog_err(
-                       ZEBRA_ERR_IRDP_LEN_MISMATCH,
+                       EC_ZEBRA_IRDP_LEN_MISMATCH,
                        "fec_register: Received a fec register of hdr->length %d, it is of insufficient size to properly decode",
                        hdr->length);
                return;
@@ -1187,7 +1212,7 @@ static void zread_fec_register(ZAPI_HANDLER_ARGS)
                STREAM_GETW(s, p.family);
                if (p.family != AF_INET && p.family != AF_INET6) {
                        flog_err(
-                               ZEBRA_ERR_UNKNOWN_FAMILY,
+                               EC_ZEBRA_UNKNOWN_FAMILY,
                                "fec_register: Received unknown family type %d\n",
                                p.family);
                        return;
@@ -1196,7 +1221,7 @@ static void zread_fec_register(ZAPI_HANDLER_ARGS)
                if ((p.family == AF_INET && p.prefixlen > IPV4_MAX_BITLEN)
                    || (p.family == AF_INET6
                        && p.prefixlen > IPV6_MAX_BITLEN)) {
-                       zlog_warn(
+                       zlog_debug(
                                "%s: Specified prefix hdr->length: %d is to long for %d",
                                __PRETTY_FUNCTION__, p.prefixlen, p.family);
                        return;
@@ -1235,7 +1260,7 @@ static void zread_fec_unregister(ZAPI_HANDLER_ARGS)
         */
        if (hdr->length < ZEBRA_MIN_FEC_LENGTH) {
                flog_err(
-                       ZEBRA_ERR_IRDP_LEN_MISMATCH,
+                       EC_ZEBRA_IRDP_LEN_MISMATCH,
                        "fec_unregister: Received a fec unregister of hdr->length %d, it is of insufficient size to properly decode",
                        hdr->length);
                return;
@@ -1250,7 +1275,7 @@ static void zread_fec_unregister(ZAPI_HANDLER_ARGS)
                STREAM_GETW(s, p.family);
                if (p.family != AF_INET && p.family != AF_INET6) {
                        flog_err(
-                               ZEBRA_ERR_UNKNOWN_FAMILY,
+                               EC_ZEBRA_UNKNOWN_FAMILY,
                                "fec_unregister: Received unknown family type %d\n",
                                p.family);
                        return;
@@ -1259,7 +1284,7 @@ static void zread_fec_unregister(ZAPI_HANDLER_ARGS)
                if ((p.family == AF_INET && p.prefixlen > IPV4_MAX_BITLEN)
                    || (p.family == AF_INET6
                        && p.prefixlen > IPV6_MAX_BITLEN)) {
-                       zlog_warn(
+                       zlog_debug(
                                "%s: Received prefix hdr->length %d which is greater than %d can support",
                                __PRETTY_FUNCTION__, p.prefixlen, p.family);
                        return;
@@ -1312,7 +1337,8 @@ void zserv_nexthop_num_warn(const char *caller, const struct prefix *p,
                char buff[PREFIX2STR_BUFFER];
 
                prefix2str(p, buff, sizeof(buff));
-               zlog_warn(
+               flog_warn(
+                       EC_ZEBRA_MORE_NH_THAN_MULTIPATH,
                        "%s: Prefix %s has %d nexthops, but we can only use the first %d",
                        caller, buff, nexthop_num, multipath_num);
        }
@@ -1475,7 +1501,8 @@ static void zread_route_add(ZAPI_HANDLER_ARGS)
                        }
 
                        if (!nexthop) {
-                               zlog_warn(
+                               flog_warn(
+                                       EC_ZEBRA_NEXTHOP_CREATION_FAILED,
                                        "%s: Nexthops Specified: %d but we failed to properly create one",
                                        __PRETTY_FUNCTION__, api.nexthop_num);
                                nexthops_free(re->ng.nexthop);
@@ -1515,7 +1542,8 @@ static void zread_route_add(ZAPI_HANDLER_ARGS)
 
        afi = family2afi(api.prefix.family);
        if (afi != AFI_IP6 && CHECK_FLAG(api.message, ZAPI_MESSAGE_SRCPFX)) {
-               zlog_warn("%s: Received SRC Prefix but afi is not v6",
+               flog_warn(EC_ZEBRA_RX_SRCDEST_WRONG_AFI,
+                         "%s: Received SRC Prefix but afi is not v6",
                          __PRETTY_FUNCTION__);
                nexthops_free(re->ng.nexthop);
                XFREE(MTYPE_RE, re);
@@ -1557,7 +1585,8 @@ static void zread_route_del(ZAPI_HANDLER_ARGS)
 
        afi = family2afi(api.prefix.family);
        if (afi != AFI_IP6 && CHECK_FLAG(api.message, ZAPI_MESSAGE_SRCPFX)) {
-               zlog_warn("%s: Received a src prefix while afi is not v6",
+               flog_warn(EC_ZEBRA_RX_SRCDEST_WRONG_AFI,
+                         "%s: Received a src prefix while afi is not v6",
                          __PRETTY_FUNCTION__);
                return;
        }
@@ -1584,202 +1613,6 @@ static void zread_route_del(ZAPI_HANDLER_ARGS)
        }
 }
 
-/* This function support multiple nexthop. */
-/*
- * Parse the ZEBRA_IPV4_ROUTE_ADD sent from client. Update re and
- * add kernel route.
- */
-static void zread_ipv4_add(ZAPI_HANDLER_ARGS)
-{
-       int i;
-       struct route_entry *re;
-       struct prefix p;
-       uint8_t message;
-       struct in_addr nhop_addr;
-       uint8_t nexthop_num;
-       uint8_t nexthop_type;
-       struct stream *s;
-       ifindex_t ifindex;
-       safi_t safi;
-       int ret;
-       enum lsp_types_t label_type = ZEBRA_LSP_NONE;
-       mpls_label_t label;
-       struct nexthop *nexthop;
-       enum blackhole_type bh_type = BLACKHOLE_NULL;
-
-       /* Get input stream.  */
-       s = msg;
-
-       /* Allocate new re. */
-       re = XCALLOC(MTYPE_RE, sizeof(struct route_entry));
-
-       /* Type, flags, message. */
-       STREAM_GETC(s, re->type);
-       if (re->type > ZEBRA_ROUTE_MAX) {
-               zlog_warn("%s: Specified route type %d is not a legal value\n",
-                         __PRETTY_FUNCTION__, re->type);
-               XFREE(MTYPE_RE, re);
-               return;
-       }
-       STREAM_GETW(s, re->instance);
-       STREAM_GETL(s, re->flags);
-       STREAM_GETC(s, message);
-       STREAM_GETW(s, safi);
-       re->uptime = time(NULL);
-
-       /* IPv4 prefix. */
-       memset(&p, 0, sizeof(struct prefix_ipv4));
-       p.family = AF_INET;
-       STREAM_GETC(s, p.prefixlen);
-       if (p.prefixlen > IPV4_MAX_BITLEN) {
-               zlog_warn(
-                       "%s: Specified prefix length %d is greater than what v4 can be",
-                       __PRETTY_FUNCTION__, p.prefixlen);
-               XFREE(MTYPE_RE, re);
-               return;
-       }
-       STREAM_GET(&p.u.prefix4, s, PSIZE(p.prefixlen));
-
-       /* VRF ID */
-       re->vrf_id = zvrf_id(zvrf);
-
-       /* Nexthop parse. */
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_NEXTHOP)) {
-               STREAM_GETC(s, nexthop_num);
-               zserv_nexthop_num_warn(__func__, (const struct prefix *)&p,
-                                      nexthop_num);
-
-               if (CHECK_FLAG(message, ZAPI_MESSAGE_LABEL))
-                       label_type = lsp_type_from_re_type(client->proto);
-
-               for (i = 0; i < nexthop_num; i++) {
-                       STREAM_GETC(s, nexthop_type);
-
-                       switch (nexthop_type) {
-                       case NEXTHOP_TYPE_IFINDEX:
-                               STREAM_GETL(s, ifindex);
-                               route_entry_nexthop_ifindex_add(re, ifindex,
-                                                               re->vrf_id);
-                               break;
-                       case NEXTHOP_TYPE_IPV4:
-                               STREAM_GET(&nhop_addr.s_addr, s,
-                                          IPV4_MAX_BYTELEN);
-                               nexthop = route_entry_nexthop_ipv4_add(
-                                       re, &nhop_addr, NULL, re->vrf_id);
-                               /*
-                                * For labeled-unicast, each nexthop is followed
-                                * by the label.
-                                */
-                               if (CHECK_FLAG(message, ZAPI_MESSAGE_LABEL)) {
-                                       STREAM_GETL(s, label);
-                                       nexthop_add_labels(nexthop, label_type,
-                                                          1, &label);
-                               }
-                               break;
-                       case NEXTHOP_TYPE_IPV4_IFINDEX:
-                               STREAM_GET(&nhop_addr.s_addr, s,
-                                          IPV4_MAX_BYTELEN);
-                               STREAM_GETL(s, ifindex);
-                               route_entry_nexthop_ipv4_ifindex_add(
-                                       re, &nhop_addr, NULL, ifindex,
-                                       re->vrf_id);
-                               break;
-                       case NEXTHOP_TYPE_IPV6:
-                               zlog_warn(
-                                       "%s: Please use ZEBRA_ROUTE_ADD if you want to pass v6 nexthops",
-                                       __PRETTY_FUNCTION__);
-                               nexthops_free(re->ng.nexthop);
-                               XFREE(MTYPE_RE, re);
-                               return;
-                       case NEXTHOP_TYPE_BLACKHOLE:
-                               route_entry_nexthop_blackhole_add(re, bh_type);
-                               break;
-                       default:
-                               zlog_warn(
-                                       "%s: Specified nexthop type: %d does not exist",
-                                       __PRETTY_FUNCTION__, nexthop_type);
-                               nexthops_free(re->ng.nexthop);
-                               XFREE(MTYPE_RE, re);
-                               return;
-                       }
-               }
-       }
-
-       /* Distance. */
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_DISTANCE))
-               STREAM_GETC(s, re->distance);
-
-       /* Metric. */
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_METRIC))
-               STREAM_GETL(s, re->metric);
-
-       /* Tag */
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_TAG))
-               STREAM_GETL(s, re->tag);
-       else
-               re->tag = 0;
-
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_MTU))
-               STREAM_GETL(s, re->mtu);
-       else
-               re->mtu = 0;
-
-       /* Table */
-       re->table = zvrf->table_id;
-
-       ret = rib_add_multipath(AFI_IP, safi, &p, NULL, re);
-
-       /* Stats */
-       if (ret > 0)
-               client->v4_route_add_cnt++;
-       else if (ret < 0)
-               client->v4_route_upd8_cnt++;
-
-       return;
-
-stream_failure:
-       nexthops_free(re->ng.nexthop);
-       XFREE(MTYPE_RE, re);
-}
-
-/* Zebra server IPv4 prefix delete function. */
-static void zread_ipv4_delete(ZAPI_HANDLER_ARGS)
-{
-       struct stream *s;
-       struct zapi_ipv4 api;
-       struct prefix p;
-       uint32_t table_id;
-
-       s = msg;
-
-       /* Type, flags, message. */
-       STREAM_GETC(s, api.type);
-       STREAM_GETW(s, api.instance);
-       STREAM_GETL(s, api.flags);
-       STREAM_GETC(s, api.message);
-       STREAM_GETW(s, api.safi);
-
-       /* IPv4 prefix. */
-       memset(&p, 0, sizeof(struct prefix));
-       p.family = AF_INET;
-       STREAM_GETC(s, p.prefixlen);
-       if (p.prefixlen > IPV4_MAX_BITLEN) {
-               zlog_warn("%s: Passed in prefixlen %d is impossible",
-                         __PRETTY_FUNCTION__, p.prefixlen);
-               return;
-       }
-       STREAM_GET(&p.u.prefix4, s, PSIZE(p.prefixlen));
-
-       table_id = zvrf->table_id;
-
-       rib_delete(AFI_IP, api.safi, zvrf_id(zvrf), api.type, api.instance,
-                  api.flags, &p, NULL, NULL, table_id, 0, 0, false);
-       client->v4_route_del_cnt++;
-
-stream_failure:
-       return;
-}
-
 /* MRIB Nexthop lookup for IPv4. */
 static void zread_ipv4_nexthop_lookup_mrib(ZAPI_HANDLER_ARGS)
 {
@@ -1794,417 +1627,6 @@ stream_failure:
        return;
 }
 
-/* Zebra server IPv6 prefix add function. */
-static void zread_ipv4_route_ipv6_nexthop_add(ZAPI_HANDLER_ARGS)
-{
-       unsigned int i;
-       struct stream *s;
-       struct in6_addr nhop_addr;
-       struct route_entry *re;
-       uint8_t message;
-       uint8_t nexthop_num;
-       uint8_t nexthop_type;
-       struct prefix p;
-       safi_t safi;
-       static struct in6_addr nexthops[MULTIPATH_NUM];
-       static unsigned int ifindices[MULTIPATH_NUM];
-       int ret;
-       static mpls_label_t labels[MULTIPATH_NUM];
-       enum lsp_types_t label_type = ZEBRA_LSP_NONE;
-       mpls_label_t label;
-       struct nexthop *nexthop;
-       enum blackhole_type bh_type = BLACKHOLE_NULL;
-
-       /* Get input stream.  */
-       s = msg;
-
-       memset(&nhop_addr, 0, sizeof(struct in6_addr));
-
-       /* Allocate new re. */
-       re = XCALLOC(MTYPE_RE, sizeof(struct route_entry));
-
-       /* Type, flags, message. */
-       STREAM_GETC(s, re->type);
-       if (re->type > ZEBRA_ROUTE_MAX) {
-               zlog_warn("%s: Specified route type: %d is not a legal value\n",
-                         __PRETTY_FUNCTION__, re->type);
-               XFREE(MTYPE_RE, re);
-               return;
-       }
-       STREAM_GETW(s, re->instance);
-       STREAM_GETL(s, re->flags);
-       STREAM_GETC(s, message);
-       STREAM_GETW(s, safi);
-       re->uptime = time(NULL);
-
-       /* IPv4 prefix. */
-       memset(&p, 0, sizeof(struct prefix_ipv4));
-       p.family = AF_INET;
-       STREAM_GETC(s, p.prefixlen);
-       if (p.prefixlen > IPV4_MAX_BITLEN) {
-               zlog_warn(
-                       "%s: Prefix Length %d is greater than what a v4 address can use",
-                       __PRETTY_FUNCTION__, p.prefixlen);
-               XFREE(MTYPE_RE, re);
-               return;
-       }
-       STREAM_GET(&p.u.prefix4, s, PSIZE(p.prefixlen));
-
-       /* VRF ID */
-       re->vrf_id = zvrf_id(zvrf);
-
-       /*
-        * We need to give nh-addr, nh-ifindex with the same next-hop object
-        * to the re to ensure that IPv6 multipathing works; need to coalesce
-        * these. Clients should send the same number of paired set of
-        * next-hop-addr/next-hop-ifindices.
-        */
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_NEXTHOP)) {
-               unsigned int nh_count = 0;
-               unsigned int if_count = 0;
-               unsigned int max_nh_if = 0;
-
-               STREAM_GETC(s, nexthop_num);
-               zserv_nexthop_num_warn(__func__, (const struct prefix *)&p,
-                                      nexthop_num);
-
-               if (CHECK_FLAG(message, ZAPI_MESSAGE_LABEL))
-                       label_type = lsp_type_from_re_type(client->proto);
-
-               for (i = 0; i < nexthop_num; i++) {
-                       STREAM_GETC(s, nexthop_type);
-
-                       switch (nexthop_type) {
-                       case NEXTHOP_TYPE_IPV6:
-                               STREAM_GET(&nhop_addr, s, 16);
-                               if (nh_count < MULTIPATH_NUM) {
-                                       /*
-                                        * For labeled-unicast, each nexthop is
-                                        * followed by the label.
-                                        */
-                                       if (CHECK_FLAG(message,
-                                                      ZAPI_MESSAGE_LABEL)) {
-                                               STREAM_GETL(s, label);
-                                               labels[nh_count] = label;
-                                       }
-                                       nexthops[nh_count] = nhop_addr;
-                                       nh_count++;
-                               }
-                               break;
-                       case NEXTHOP_TYPE_IFINDEX:
-                               if (if_count < multipath_num)
-                                       STREAM_GETL(s, ifindices[if_count++]);
-                               break;
-                       case NEXTHOP_TYPE_BLACKHOLE:
-                               route_entry_nexthop_blackhole_add(re, bh_type);
-                               break;
-                       default:
-                               zlog_warn(
-                                       "%s: Please use ZEBRA_ROUTE_ADD if you want to pass non v6 nexthops",
-                                       __PRETTY_FUNCTION__);
-                               nexthops_free(re->ng.nexthop);
-                               XFREE(MTYPE_RE, re);
-                               return;
-                       }
-               }
-
-               max_nh_if = (nh_count > if_count) ? nh_count : if_count;
-               for (i = 0; i < max_nh_if; i++) {
-                       if ((i < nh_count)
-                           && !IN6_IS_ADDR_UNSPECIFIED(&nexthops[i])) {
-                               if ((i < if_count) && ifindices[i])
-                                       nexthop =
-                                               route_entry_nexthop_ipv6_ifindex_add(
-                                                       re, &nexthops[i],
-                                                       ifindices[i],
-                                                       re->vrf_id);
-                               else
-                                       nexthop = route_entry_nexthop_ipv6_add(
-                                               re, &nexthops[i], re->vrf_id);
-
-                               if (CHECK_FLAG(message, ZAPI_MESSAGE_LABEL))
-                                       nexthop_add_labels(nexthop, label_type,
-                                                          1, &labels[i]);
-                       } else {
-                               if ((i < if_count) && ifindices[i])
-                                       route_entry_nexthop_ifindex_add(
-                                               re, ifindices[i], re->vrf_id);
-                       }
-               }
-       }
-
-       /* Distance. */
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_DISTANCE))
-               STREAM_GETC(s, re->distance);
-
-       /* Metric. */
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_METRIC))
-               STREAM_GETL(s, re->metric);
-
-       /* Tag */
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_TAG))
-               STREAM_GETL(s, re->tag);
-       else
-               re->tag = 0;
-
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_MTU))
-               STREAM_GETL(s, re->mtu);
-       else
-               re->mtu = 0;
-
-       /* Table */
-       re->table = zvrf->table_id;
-
-       ret = rib_add_multipath(AFI_IP6, safi, &p, NULL, re);
-       /* Stats */
-       if (ret > 0)
-               client->v4_route_add_cnt++;
-       else if (ret < 0)
-               client->v4_route_upd8_cnt++;
-
-       return;
-
-stream_failure:
-       nexthops_free(re->ng.nexthop);
-       XFREE(MTYPE_RE, re);
-}
-
-static void zread_ipv6_add(ZAPI_HANDLER_ARGS)
-{
-       unsigned int i;
-       struct stream *s;
-       struct in6_addr nhop_addr;
-       ifindex_t ifindex;
-       struct route_entry *re;
-       uint8_t message;
-       uint8_t nexthop_num;
-       uint8_t nexthop_type;
-       struct prefix p;
-       struct prefix_ipv6 src_p, *src_pp;
-       safi_t safi;
-       static struct in6_addr nexthops[MULTIPATH_NUM];
-       static unsigned int ifindices[MULTIPATH_NUM];
-       int ret;
-       static mpls_label_t labels[MULTIPATH_NUM];
-       enum lsp_types_t label_type = ZEBRA_LSP_NONE;
-       mpls_label_t label;
-       struct nexthop *nexthop;
-       enum blackhole_type bh_type = BLACKHOLE_NULL;
-
-       /* Get input stream.  */
-       s = msg;
-
-       memset(&nhop_addr, 0, sizeof(struct in6_addr));
-
-       /* Allocate new re. */
-       re = XCALLOC(MTYPE_RE, sizeof(struct route_entry));
-
-       /* Type, flags, message. */
-       STREAM_GETC(s, re->type);
-       if (re->type > ZEBRA_ROUTE_MAX) {
-               zlog_warn("%s: Specified route type: %d is not a legal value\n",
-                         __PRETTY_FUNCTION__, re->type);
-               XFREE(MTYPE_RE, re);
-               return;
-       }
-       STREAM_GETW(s, re->instance);
-       STREAM_GETL(s, re->flags);
-       STREAM_GETC(s, message);
-       STREAM_GETW(s, safi);
-       re->uptime = time(NULL);
-
-       /* IPv6 prefix. */
-       memset(&p, 0, sizeof(p));
-       p.family = AF_INET6;
-       STREAM_GETC(s, p.prefixlen);
-       if (p.prefixlen > IPV6_MAX_BITLEN) {
-               zlog_warn(
-                       "%s: Specified prefix length %d is to large for v6 prefix",
-                       __PRETTY_FUNCTION__, p.prefixlen);
-               XFREE(MTYPE_RE, re);
-               return;
-       }
-       STREAM_GET(&p.u.prefix6, s, PSIZE(p.prefixlen));
-
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_SRCPFX)) {
-               memset(&src_p, 0, sizeof(src_p));
-               src_p.family = AF_INET6;
-               STREAM_GETC(s, src_p.prefixlen);
-               if (src_p.prefixlen > IPV6_MAX_BITLEN) {
-                       zlog_warn(
-                               "%s: Specified src prefix length %d is to large for v6 prefix",
-                               __PRETTY_FUNCTION__, src_p.prefixlen);
-                       XFREE(MTYPE_RE, re);
-                       return;
-               }
-               STREAM_GET(&src_p.prefix, s, PSIZE(src_p.prefixlen));
-               src_pp = &src_p;
-       } else
-               src_pp = NULL;
-
-       /* VRF ID */
-       re->vrf_id = zvrf_id(zvrf);
-
-       /*
-        * We need to give nh-addr, nh-ifindex with the same next-hop object
-        * to the re to ensure that IPv6 multipathing works; need to coalesce
-        * these. Clients should send the same number of paired set of
-        * next-hop-addr/next-hop-ifindices.
-        */
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_NEXTHOP)) {
-               unsigned int nh_count = 0;
-               unsigned int if_count = 0;
-               unsigned int max_nh_if = 0;
-
-               STREAM_GETC(s, nexthop_num);
-               zserv_nexthop_num_warn(__func__, (const struct prefix *)&p,
-                                      nexthop_num);
-
-               if (CHECK_FLAG(message, ZAPI_MESSAGE_LABEL))
-                       label_type = lsp_type_from_re_type(client->proto);
-
-               for (i = 0; i < nexthop_num; i++) {
-                       STREAM_GETC(s, nexthop_type);
-
-                       switch (nexthop_type) {
-                       case NEXTHOP_TYPE_IPV6:
-                               STREAM_GET(&nhop_addr, s, 16);
-                               if (nh_count < MULTIPATH_NUM) {
-                                       /*
-                                        * For labeled-unicast, each nexthop is
-                                        * followed by label.
-                                        */
-                                       if (CHECK_FLAG(message,
-                                                      ZAPI_MESSAGE_LABEL)) {
-                                               STREAM_GETL(s, label);
-                                               labels[nh_count] = label;
-                                       }
-                                       nexthops[nh_count++] = nhop_addr;
-                               }
-                               break;
-                       case NEXTHOP_TYPE_IPV6_IFINDEX:
-                               STREAM_GET(&nhop_addr, s, 16);
-                               STREAM_GETL(s, ifindex);
-                               route_entry_nexthop_ipv6_ifindex_add(
-                                       re, &nhop_addr, ifindex, re->vrf_id);
-                               break;
-                       case NEXTHOP_TYPE_IFINDEX:
-                               if (if_count < multipath_num)
-                                       STREAM_GETL(s, ifindices[if_count++]);
-                               break;
-                       case NEXTHOP_TYPE_BLACKHOLE:
-                               route_entry_nexthop_blackhole_add(re, bh_type);
-                               break;
-                       default:
-                               zlog_warn(
-                                       "%s: Please use ZEBRA_ROUTE_ADD if you want to pass non v6 nexthops",
-                                       __PRETTY_FUNCTION__);
-                               nexthops_free(re->ng.nexthop);
-                               XFREE(MTYPE_RE, re);
-                               return;
-                       }
-               }
-
-               max_nh_if = (nh_count > if_count) ? nh_count : if_count;
-               for (i = 0; i < max_nh_if; i++) {
-                       if ((i < nh_count)
-                           && !IN6_IS_ADDR_UNSPECIFIED(&nexthops[i])) {
-                               if ((i < if_count) && ifindices[i])
-                                       nexthop =
-                                               route_entry_nexthop_ipv6_ifindex_add(
-                                                       re, &nexthops[i],
-                                                       ifindices[i],
-                                                       re->vrf_id);
-                               else
-                                       nexthop = route_entry_nexthop_ipv6_add(
-                                               re, &nexthops[i], re->vrf_id);
-                               if (CHECK_FLAG(message, ZAPI_MESSAGE_LABEL))
-                                       nexthop_add_labels(nexthop, label_type,
-                                                          1, &labels[i]);
-                       } else {
-                               if ((i < if_count) && ifindices[i])
-                                       route_entry_nexthop_ifindex_add(
-                                               re, ifindices[i], re->vrf_id);
-                       }
-               }
-       }
-
-       /* Distance. */
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_DISTANCE))
-               STREAM_GETC(s, re->distance);
-
-       /* Metric. */
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_METRIC))
-               STREAM_GETL(s, re->metric);
-
-       /* Tag */
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_TAG))
-               STREAM_GETL(s, re->tag);
-       else
-               re->tag = 0;
-
-       if (CHECK_FLAG(message, ZAPI_MESSAGE_MTU))
-               STREAM_GETL(s, re->mtu);
-       else
-               re->mtu = 0;
-
-       re->table = zvrf->table_id;
-
-       ret = rib_add_multipath(AFI_IP6, safi, &p, src_pp, re);
-       /* Stats */
-       if (ret > 0)
-               client->v6_route_add_cnt++;
-       else if (ret < 0)
-               client->v6_route_upd8_cnt++;
-
-       return;
-
-stream_failure:
-       nexthops_free(re->ng.nexthop);
-       XFREE(MTYPE_RE, re);
-}
-
-/* Zebra server IPv6 prefix delete function. */
-static void zread_ipv6_delete(ZAPI_HANDLER_ARGS)
-{
-       struct stream *s;
-       struct zapi_ipv6 api;
-       struct prefix p;
-       struct prefix_ipv6 src_p, *src_pp;
-
-       s = msg;
-
-       /* Type, flags, message. */
-       STREAM_GETC(s, api.type);
-       STREAM_GETW(s, api.instance);
-       STREAM_GETL(s, api.flags);
-       STREAM_GETC(s, api.message);
-       STREAM_GETW(s, api.safi);
-
-       /* IPv4 prefix. */
-       memset(&p, 0, sizeof(struct prefix));
-       p.family = AF_INET6;
-       STREAM_GETC(s, p.prefixlen);
-       STREAM_GET(&p.u.prefix6, s, PSIZE(p.prefixlen));
-
-       if (CHECK_FLAG(api.message, ZAPI_MESSAGE_SRCPFX)) {
-               memset(&src_p, 0, sizeof(struct prefix_ipv6));
-               src_p.family = AF_INET6;
-               STREAM_GETC(s, src_p.prefixlen);
-               STREAM_GET(&src_p.prefix, s, PSIZE(src_p.prefixlen));
-               src_pp = &src_p;
-       } else
-               src_pp = NULL;
-
-       rib_delete(AFI_IP6, api.safi, zvrf_id(zvrf), api.type, api.instance,
-                  api.flags, &p, src_pp, NULL, client->rtm_table, 0, 0, false);
-
-       client->v6_route_del_cnt++;
-
-stream_failure:
-       return;
-}
-
 /* Register zebra server router-id information.  Send current router-id */
 static void zread_router_id_add(ZAPI_HANDLER_ARGS)
 {
@@ -2304,7 +1726,7 @@ static void zread_mpls_labels(ZAPI_HANDLER_ARGS)
                STREAM_GET(&prefix.u.prefix4.s_addr, s, IPV4_MAX_BYTELEN);
                STREAM_GETC(s, prefix.prefixlen);
                if (prefix.prefixlen > IPV4_MAX_BITLEN) {
-                       zlog_warn(
+                       zlog_debug(
                                "%s: Specified prefix length %d is greater than a v4 address can support",
                                __PRETTY_FUNCTION__, prefix.prefixlen);
                        return;
@@ -2315,7 +1737,7 @@ static void zread_mpls_labels(ZAPI_HANDLER_ARGS)
                STREAM_GET(&prefix.u.prefix6, s, 16);
                STREAM_GETC(s, prefix.prefixlen);
                if (prefix.prefixlen > IPV6_MAX_BITLEN) {
-                       zlog_warn(
+                       zlog_debug(
                                "%s: Specified prefix length %d is greater than a v6 address can support",
                                __PRETTY_FUNCTION__, prefix.prefixlen);
                        return;
@@ -2323,8 +1745,8 @@ static void zread_mpls_labels(ZAPI_HANDLER_ARGS)
                STREAM_GET(&gate.ipv6, s, 16);
                break;
        default:
-               zlog_warn("%s: Specified AF %d is not supported for this call",
-                         __PRETTY_FUNCTION__, prefix.family);
+               zlog_debug("%s: Specified AF %d is not supported for this call",
+                          __PRETTY_FUNCTION__, prefix.family);
                return;
        }
        STREAM_GETL(s, ifindex);
@@ -2382,9 +1804,9 @@ static void zread_table_manager_connect(struct zserv *client,
 
        /* accept only dynamic routing protocols */
        if ((proto >= ZEBRA_ROUTE_MAX) || (proto <= ZEBRA_ROUTE_STATIC)) {
-               flog_err(ZEBRA_ERR_TM_WRONG_PROTO,
-                         "client %d has wrong protocol %s", client->sock,
-                         zebra_route_string(proto));
+               flog_err(EC_ZEBRA_TM_WRONG_PROTO,
+                        "client %d has wrong protocol %s", client->sock,
+                        zebra_route_string(proto));
                zsend_table_manager_connect_response(client, vrf_id, 1);
                return;
        }
@@ -2422,10 +1844,11 @@ static void zread_label_manager_connect(struct zserv *client,
 
        /* accept only dynamic routing protocols */
        if ((proto >= ZEBRA_ROUTE_MAX) || (proto <= ZEBRA_ROUTE_STATIC)) {
-               flog_err(ZEBRA_ERR_TM_WRONG_PROTO,
-                         "client %d has wrong protocol %s", client->sock,
-                         zebra_route_string(proto));
-               zsend_label_manager_connect_response(client, vrf_id, 1);
+               flog_err(EC_ZEBRA_TM_WRONG_PROTO,
+                        "client %d has wrong protocol %s", client->sock,
+                        zebra_route_string(proto));
+               if (client->is_synchronous)
+                       zsend_label_manager_connect_response(client, vrf_id, 1);
                return;
        }
        zlog_notice("client %d with vrf %u instance %u connected as %s",
@@ -2443,33 +1866,12 @@ static void zread_label_manager_connect(struct zserv *client,
                " Label Manager client connected: sock %d, proto %s, vrf %u instance %u",
                client->sock, zebra_route_string(proto), vrf_id, instance);
        /* send response back */
-       zsend_label_manager_connect_response(client, vrf_id, 0);
+       if (client->is_synchronous)
+               zsend_label_manager_connect_response(client, vrf_id, 0);
 
 stream_failure:
        return;
 }
-static int msg_client_id_mismatch(const char *op, struct zserv *client,
-                                 uint8_t proto, unsigned int instance)
-{
-       if (proto != client->proto) {
-               flog_err(ZEBRA_ERR_PROTO_OR_INSTANCE_MISMATCH,
-                         "%s: msg vs client proto mismatch, client=%u msg=%u",
-                         op, client->proto, proto);
-               /* TODO: fail when BGP sets proto and instance */
-               /* return 1; */
-       }
-
-       if (instance != client->instance) {
-               flog_err(
-                       ZEBRA_ERR_PROTO_OR_INSTANCE_MISMATCH,
-                       "%s: msg vs client instance mismatch, client=%u msg=%u",
-                       op, client->instance, instance);
-               /* TODO: fail when BGP sets proto and instance */
-               /* return 1; */
-       }
-
-       return 0;
-}
 
 static void zread_get_label_chunk(struct zserv *client, struct stream *msg,
                                  vrf_id_t vrf_id)
@@ -2490,21 +1892,16 @@ static void zread_get_label_chunk(struct zserv *client, struct stream *msg,
        STREAM_GETC(s, keep);
        STREAM_GETL(s, size);
 
-       /* detect client vs message (proto,instance) mismatch */
-       if (msg_client_id_mismatch("Get-label-chunk", client, proto, instance))
-               return;
-
-       lmc = assign_label_chunk(client->proto, client->instance, keep, size);
+       lmc = assign_label_chunk(proto, instance, keep, size);
        if (!lmc)
                flog_err(
-                       ZEBRA_ERR_LM_CANNOT_ASSIGN_CHUNK,
+                       EC_ZEBRA_LM_CANNOT_ASSIGN_CHUNK,
                        "Unable to assign Label Chunk of size %u to %s instance %u",
-                       size, zebra_route_string(client->proto),
-                       client->instance);
+                       size, zebra_route_string(proto), instance);
        else
                zlog_debug("Assigned Label Chunk %u - %u to %s instance %u",
                           lmc->start, lmc->end,
-                          zebra_route_string(client->proto), client->instance);
+                          zebra_route_string(proto), instance);
        /* send response back */
        zsend_assign_label_chunk_response(client, vrf_id, lmc);
 
@@ -2528,12 +1925,7 @@ static void zread_release_label_chunk(struct zserv *client, struct stream *msg)
        STREAM_GETL(s, start);
        STREAM_GETL(s, end);
 
-       /* detect client vs message (proto,instance) mismatch */
-       if (msg_client_id_mismatch("Release-label-chunk", client, proto,
-                                  instance))
-               return;
-
-       release_label_chunk(client->proto, client->instance, start, end);
+       release_label_chunk(proto, instance, start, end);
 
 stream_failure:
        return;
@@ -2541,8 +1933,8 @@ stream_failure:
 static void zread_label_manager_request(ZAPI_HANDLER_ARGS)
 {
        /* to avoid sending other messages like ZERBA_INTERFACE_UP */
-       if (hdr->command == ZEBRA_LABEL_MANAGER_CONNECT)
-               client->is_synchronous = 1;
+       client->is_synchronous = hdr->command ==
+                                ZEBRA_LABEL_MANAGER_CONNECT;
 
        /* external label manager */
        if (lm_is_external)
@@ -2550,16 +1942,10 @@ static void zread_label_manager_request(ZAPI_HANDLER_ARGS)
                                                  zvrf_id(zvrf));
        /* this is a label manager */
        else {
-               if (hdr->command == ZEBRA_LABEL_MANAGER_CONNECT)
+               if (hdr->command == ZEBRA_LABEL_MANAGER_CONNECT ||
+                   hdr->command == ZEBRA_LABEL_MANAGER_CONNECT_ASYNC)
                        zread_label_manager_connect(client, msg, zvrf_id(zvrf));
                else {
-                       /* Sanity: don't allow 'unidentified' requests */
-                       if (!client->proto) {
-                               flog_err(
-                                       ZEBRA_ERR_LM_ALIENS,
-                                       "Got label request from an unidentified client");
-                               return;
-                       }
                        if (hdr->command == ZEBRA_GET_LABEL_CHUNK)
                                zread_get_label_chunk(client, msg,
                                                      zvrf_id(zvrf));
@@ -2584,9 +1970,9 @@ static void zread_get_table_chunk(struct zserv *client, struct stream *msg,
 
        tmc = assign_table_chunk(client->proto, client->instance, size);
        if (!tmc)
-               flog_err(ZEBRA_ERR_TM_CANNOT_ASSIGN_CHUNK,
-                         "%s: Unable to assign Table Chunk of size %u",
-                         __func__, size);
+               flog_err(EC_ZEBRA_TM_CANNOT_ASSIGN_CHUNK,
+                        "%s: Unable to assign Table Chunk of size %u",
+                        __func__, size);
        else
                zlog_debug("Assigned Table Chunk %u - %u", tmc->start,
                           tmc->end);
@@ -2624,7 +2010,7 @@ static void zread_table_manager_request(ZAPI_HANDLER_ARGS)
                /* Sanity: don't allow 'unidentified' requests */
                if (!client->proto) {
                        flog_err(
-                               ZEBRA_ERR_TM_ALIENS,
+                               EC_ZEBRA_TM_ALIENS,
                                "Got table request from an unidentified client");
                        return;
                }
@@ -2678,7 +2064,8 @@ static void zread_pseudowire(ZAPI_HANDLER_ARGS)
        switch (hdr->command) {
        case ZEBRA_PW_ADD:
                if (pw) {
-                       zlog_warn("%s: pseudowire %s already exists [%s]",
+                       flog_warn(EC_ZEBRA_PSEUDOWIRE_EXISTS,
+                                 "%s: pseudowire %s already exists [%s]",
                                  __func__, ifname,
                                  zserv_command_string(hdr->command));
                        return;
@@ -2688,7 +2075,8 @@ static void zread_pseudowire(ZAPI_HANDLER_ARGS)
                break;
        case ZEBRA_PW_DELETE:
                if (!pw) {
-                       zlog_warn("%s: pseudowire %s not found [%s]", __func__,
+                       flog_warn(EC_ZEBRA_PSEUDOWIRE_NONEXISTENT,
+                                 "%s: pseudowire %s not found [%s]", __func__,
                                  ifname, zserv_command_string(hdr->command));
                        return;
                }
@@ -2698,7 +2086,8 @@ static void zread_pseudowire(ZAPI_HANDLER_ARGS)
        case ZEBRA_PW_SET:
        case ZEBRA_PW_UNSET:
                if (!pw) {
-                       zlog_warn("%s: pseudowire %s not found [%s]", __func__,
+                       flog_warn(EC_ZEBRA_PSEUDOWIRE_NONEXISTENT,
+                                 "%s: pseudowire %s not found [%s]", __func__,
                                  ifname, zserv_command_string(hdr->command));
                        return;
                }
@@ -2873,10 +2262,11 @@ static inline void zread_rule(ZAPI_HANDLER_ARGS)
                if (zpr.rule.filter.fwmark)
                        zpr.rule.filter.filter_bm |= PBR_FILTER_FWMARK;
 
+               zpr.vrf_id = zvrf->vrf->vrf_id;
                if (hdr->command == ZEBRA_RULE_ADD)
-                       zebra_pbr_add_rule(zvrf->zns, &zpr);
+                       zebra_pbr_add_rule(&zpr);
                else
-                       zebra_pbr_del_rule(zvrf->zns, &zpr);
+                       zebra_pbr_del_rule(&zpr);
        }
 
 stream_failure:
@@ -2902,9 +2292,9 @@ static inline void zread_ipset(ZAPI_HANDLER_ARGS)
                STREAM_GET(&zpi.ipset_name, s, ZEBRA_IPSET_NAME_SIZE);
 
                if (hdr->command == ZEBRA_IPSET_CREATE)
-                       zebra_pbr_create_ipset(zvrf->zns, &zpi);
+                       zebra_pbr_create_ipset(&zpi);
                else
-                       zebra_pbr_destroy_ipset(zvrf->zns, &zpi);
+                       zebra_pbr_destroy_ipset(&zpi);
        }
 
 stream_failure:
@@ -2957,12 +2347,12 @@ static inline void zread_ipset_entry(ZAPI_HANDLER_ARGS)
                        zpi.filter_bm |= PBR_FILTER_PROTO;
 
                /* calculate backpointer */
-               zpi.backpointer = zebra_pbr_lookup_ipset_pername(
-                       zvrf->zns, ipset.ipset_name);
+               zpi.backpointer =
+                       zebra_pbr_lookup_ipset_pername(ipset.ipset_name);
                if (hdr->command == ZEBRA_IPSET_ENTRY_ADD)
-                       zebra_pbr_add_ipset_entry(zvrf->zns, &zpi);
+                       zebra_pbr_add_ipset_entry(&zpi);
                else
-                       zebra_pbr_del_ipset_entry(zvrf->zns, &zpi);
+                       zebra_pbr_del_ipset_entry(&zpi);
        }
 
 stream_failure:
@@ -2997,9 +2387,9 @@ static inline void zread_iptable(ZAPI_HANDLER_ARGS)
        zebra_pbr_iptable_update_interfacelist(s, &zpi);
 
        if (hdr->command == ZEBRA_IPTABLE_ADD)
-               zebra_pbr_add_iptable(zvrf->zns, &zpi);
+               zebra_pbr_add_iptable(&zpi);
        else
-               zebra_pbr_del_iptable(zvrf->zns, &zpi);
+               zebra_pbr_del_iptable(&zpi);
 stream_failure:
        return;
 }
@@ -3011,11 +2401,6 @@ void (*zserv_handlers[])(ZAPI_HANDLER_ARGS) = {
        [ZEBRA_INTERFACE_DELETE] = zread_interface_delete,
        [ZEBRA_ROUTE_ADD] = zread_route_add,
        [ZEBRA_ROUTE_DELETE] = zread_route_del,
-       [ZEBRA_IPV4_ROUTE_ADD] = zread_ipv4_add,
-       [ZEBRA_IPV4_ROUTE_DELETE] = zread_ipv4_delete,
-       [ZEBRA_IPV4_ROUTE_IPV6_NEXTHOP_ADD] = zread_ipv4_route_ipv6_nexthop_add,
-       [ZEBRA_IPV6_ROUTE_ADD] = zread_ipv6_add,
-       [ZEBRA_IPV6_ROUTE_DELETE] = zread_ipv6_delete,
        [ZEBRA_REDISTRIBUTE_ADD] = zebra_redistribute_add,
        [ZEBRA_REDISTRIBUTE_DELETE] = zebra_redistribute_delete,
        [ZEBRA_REDISTRIBUTE_DEFAULT_ADD] = zebra_redistribute_default_add,
@@ -3046,6 +2431,7 @@ void (*zserv_handlers[])(ZAPI_HANDLER_ARGS) = {
        [ZEBRA_MPLS_LABELS_DELETE] = zread_mpls_labels,
        [ZEBRA_IPMR_ROUTE_STATS] = zebra_ipmr_route_stats,
        [ZEBRA_LABEL_MANAGER_CONNECT] = zread_label_manager_request,
+       [ZEBRA_LABEL_MANAGER_CONNECT_ASYNC] = zread_label_manager_request,
        [ZEBRA_GET_LABEL_CHUNK] = zread_label_manager_request,
        [ZEBRA_RELEASE_LABEL_CHUNK] = zread_label_manager_request,
        [ZEBRA_FEC_REGISTER] = zread_fec_register,
@@ -3073,6 +2459,7 @@ void (*zserv_handlers[])(ZAPI_HANDLER_ARGS) = {
        [ZEBRA_IPSET_ENTRY_DELETE] = zread_ipset_entry,
        [ZEBRA_IPTABLE_ADD] = zread_iptable,
        [ZEBRA_IPTABLE_DELETE] = zread_iptable,
+       [ZEBRA_VXLAN_FLOOD_CONTROL] = zebra_vxlan_flood_control,
 };
 
 #if defined(HANDLE_ZAPI_FUZZING)
@@ -3115,8 +2502,8 @@ void zserv_handle_commands(struct zserv *client, struct stream *msg)
        zvrf = zebra_vrf_lookup_by_id(hdr.vrf_id);
        if (!zvrf) {
                if (IS_ZEBRA_DEBUG_PACKET && IS_ZEBRA_DEBUG_RECV)
-                       zlog_warn("ZAPI message specifies unknown VRF: %d",
-                                 hdr.vrf_id);
+                       zlog_debug("ZAPI message specifies unknown VRF: %d",
+                                  hdr.vrf_id);
                return;
        }