Merge pull request #8008 from chiragshah6/yang_nb5

[mirror_frr.git] / lib / zclient.c

diff --git a/lib/zclient.c b/lib/zclient.c
index 20c285cf7f1d73592762ac85d230a98248033128..c5e844933c90a43e5f98eb611a66d87985b5fcac 100644 (file)
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -1551,15 +1551,16 @@ bool zapi_ipset_notify_decode(struct stream *s, uint32_t *unique,
                              enum zapi_ipset_notify_owner *note)
 {
        uint32_t uni;
+       uint16_t notew;
 
-       STREAM_GET(note, s, sizeof(*note));
+       STREAM_GETW(s, notew);
 
        STREAM_GETL(s, uni);
 
        if (zclient_debug)
                zlog_debug("%s: %u", __func__, uni);
        *unique = uni;
-
+       *note = (enum zapi_ipset_notify_owner)notew;
        return true;
 
 stream_failure:
@@ -1571,8 +1572,9 @@ bool zapi_ipset_entry_notify_decode(struct stream *s, uint32_t *unique,
                                    enum zapi_ipset_entry_notify_owner *note)
 {
        uint32_t uni;
+       uint16_t notew;
 
-       STREAM_GET(note, s, sizeof(*note));
+       STREAM_GETW(s, notew);
 
        STREAM_GETL(s, uni);
 
@@ -1581,6 +1583,7 @@ bool zapi_ipset_entry_notify_decode(struct stream *s, uint32_t *unique,
        if (zclient_debug)
                zlog_debug("%s: %u", __func__, uni);
        *unique = uni;
+       *note = (enum zapi_ipset_entry_notify_owner)notew;
 
        return true;
 
@@ -1593,14 +1596,16 @@ bool zapi_iptable_notify_decode(struct stream *s,
                enum zapi_iptable_notify_owner *note)
 {
        uint32_t uni;
+       uint16_t notew;
 
-       STREAM_GET(note, s, sizeof(*note));
+       STREAM_GETW(s, notew);
 
        STREAM_GETL(s, uni);
 
        if (zclient_debug)
                zlog_debug("%s: %u", __func__, uni);
        *unique = uni;
+       *note = (enum zapi_iptable_notify_owner)notew;
 
        return true;
 
@@ -2335,7 +2340,7 @@ struct connected *zebra_interface_address_read(int type, struct stream *s,
                                 * "peer" */
                                flog_err(
                                        EC_LIB_ZAPI_ENCODE,
-                                       "warning: interface %s address %pFX with peer flag set, but no peer address!",
+                                       "interface %s address %pFX with peer flag set, but no peer address!",
                                        ifp->name, ifc->address);
                                UNSET_FLAG(ifc->flags, ZEBRA_IFA_PEER);
                        }