diff options
| author | David Lamparter <equinox@diac24.net> | 2021-03-12 02:01:08 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2021-03-14 22:56:07 +0100 |
| commit | 5e9f9adbb4e51051f81f7e61db5d4136b6f34ae0 (patch) | |
| tree | ac07fe71cd5f1ece1bcf43b198d46e27b79ac395 /zebra | |
| parent | *: fix printf extension types (diff) | |
| download | frr-5e9f9adbb4e51051f81f7e61db5d4136b6f34ae0.tar.xz frr-5e9f9adbb4e51051f81f7e61db5d4136b6f34ae0.zip | |
fpm: use printfrr exts
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/zebra_fpm.c | 6 | ||||
| -rw-r--r-- | zebra/zebra_fpm_netlink.c | 11 |
2 files changed, 6 insertions, 11 deletions
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c index 73534c433..099ac1434 100644 --- a/zebra/zebra_fpm.c +++ b/zebra/zebra_fpm.c @@ -1555,7 +1555,6 @@ static void zfpm_mac_info_del(struct fpm_mac_info_t *fpm_mac) static int zfpm_trigger_rmac_update(zebra_mac_t *rmac, zebra_l3vni_t *zl3vni, bool delete, const char *reason) { - char buf[ETHER_ADDR_STRLEN]; struct fpm_mac_info_t *fpm_mac, key; struct interface *vxlan_if, *svi_if; bool mac_found = false; @@ -1568,9 +1567,8 @@ static int zfpm_trigger_rmac_update(zebra_mac_t *rmac, zebra_l3vni_t *zl3vni, return 0; if (reason) { - zfpm_debug("triggering update to FPM - Reason: %s - %s", - reason, - prefix_mac2str(&rmac->macaddr, buf, sizeof(buf))); + zfpm_debug("triggering update to FPM - Reason: %s - %pEA", + reason, &rmac->macaddr); } vxlan_if = zl3vni_map_to_vxlan_if(zl3vni); diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c index f7c5da5de..cebd57636 100644 --- a/zebra/zebra_fpm_netlink.c +++ b/zebra/zebra_fpm_netlink.c @@ -500,9 +500,8 @@ static void zfpm_log_route_info(struct netlink_route_info *ri, unsigned int i; char buf[PREFIX_STRLEN]; - zfpm_debug("%s : %s %s, Proto: %s, Metric: %u", label, - nl_msg_type_to_str(ri->nlmsg_type), - prefix2str(ri->prefix, buf, sizeof(buf)), + zfpm_debug("%s : %s %pFX, Proto: %s, Metric: %u", label, + nl_msg_type_to_str(ri->nlmsg_type), ri->prefix, nl_rtproto_to_str(ri->rtm_protocol), ri->metric ? *ri->metric : 0); @@ -557,7 +556,6 @@ int zfpm_netlink_encode_route(int cmd, rib_dest_t *dest, struct route_entry *re, int zfpm_netlink_encode_mac(struct fpm_mac_info_t *mac, char *in_buf, size_t in_buf_len) { - char buf1[ETHER_ADDR_STRLEN]; size_t buf_offset; struct macmsg { @@ -600,11 +598,10 @@ int zfpm_netlink_encode_mac(struct fpm_mac_info_t *mac, char *in_buf, assert(req->hdr.nlmsg_len < in_buf_len); - zfpm_debug("Tx %s family %s ifindex %u MAC %s DEST %pI4", + zfpm_debug("Tx %s family %s ifindex %u MAC %pEA DEST %pI4", nl_msg_type_to_str(req->hdr.nlmsg_type), nl_family_to_str(req->ndm.ndm_family), req->ndm.ndm_ifindex, - prefix_mac2str(&mac->macaddr, buf1, sizeof(buf1)), - &mac->r_vtep_ip); + &mac->macaddr, &mac->r_vtep_ip); return req->hdr.nlmsg_len; } |