Merge pull request #6730 from wesleycoakley/pbrd-dscp-ecn

[mirror_frr.git] / zebra / zapi_msg.c

diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index daf08e96a0a08873261581fa6aaa302c6dff6f0f..062941a1e4945c7907b131f35fe4b715d6025bbc 100644 (file)
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -1879,7 +1879,7 @@ static void zread_router_id_add(ZAPI_HANDLER_ARGS)
        /* Router-id information is needed. */
        vrf_bitmap_set(client->ridinfo, zvrf_id(zvrf));
 
-       router_id_get(&p, zvrf_id(zvrf));
+       router_id_get(&p, zvrf);
 
        zsend_router_id_update(client, &p, zvrf_id(zvrf));
 }
@@ -2566,8 +2566,7 @@ static inline void zread_rule(ZAPI_HANDLER_ARGS)
                if (!(zpr.rule.filter.src_ip.family == AF_INET
                      || zpr.rule.filter.src_ip.family == AF_INET6)) {
                        zlog_warn(
-                               "Unsupported PBR source IP family: %s (%" PRIu8
-                               ")",
+                               "Unsupported PBR source IP family: %s (%hhu)",
                                family2str(zpr.rule.filter.src_ip.family),
                                zpr.rule.filter.src_ip.family);
                        return;
@@ -2575,8 +2574,7 @@ static inline void zread_rule(ZAPI_HANDLER_ARGS)
                if (!(zpr.rule.filter.dst_ip.family == AF_INET
                      || zpr.rule.filter.dst_ip.family == AF_INET6)) {
                        zlog_warn(
-                               "Unsupported PBR destination IP family: %s (%" PRIu8
-                               ")",
+                               "Unsupported PBR destination IP family: %s (%hhu)",
                                family2str(zpr.rule.filter.dst_ip.family),
                                zpr.rule.filter.dst_ip.family);
                        return;
@@ -2671,16 +2669,14 @@ static inline void zread_ipset_entry(ZAPI_HANDLER_ARGS)
                if (!(zpi.dst.family == AF_INET
                      || zpi.dst.family == AF_INET6)) {
                        zlog_warn(
-                               "Unsupported PBR destination IP family: %s (%" PRIu8
-                               ")",
+                               "Unsupported PBR destination IP family: %s (%hhu)",
                                family2str(zpi.dst.family), zpi.dst.family);
                        goto stream_failure;
                }
                if (!(zpi.src.family == AF_INET
                      || zpi.src.family == AF_INET6)) {
                        zlog_warn(
-                               "Unsupported PBR source IP family: %s (%" PRIu8
-                               ")",
+                               "Unsupported PBR source IP family: %s (%hhu)",
                                family2str(zpi.src.family), zpi.src.family);
                        goto stream_failure;
                }