diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-12-05 09:44:11 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-12-11 08:42:51 -0500 |
| commit | 872ed4c7937b0f66d2bd01ffffe433132169c5e8 (patch) | |
| tree | a918fac6588a29630c9b3ed0463322493850c319 /bgpd/rfapi/bgp_rfapi_cfg.c | |
| parent | eac04bc5d3405eb9f931a7573c6a04fae815857e (diff) | |
bgpd: Fix prefix2str using BUFSIZ to PREFIX_STRLEN
PREFIX_STRLEN is the correct length for buffers needed to output
a prefix2str. Additionally cleanup some setting of the last
value to a `\0` this is handled by prefix2str.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'bgpd/rfapi/bgp_rfapi_cfg.c')
| -rw-r--r-- | bgpd/rfapi/bgp_rfapi_cfg.c | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c index 3ecc4be94e..5eb4b78341 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.c +++ b/bgpd/rfapi/bgp_rfapi_cfg.c @@ -170,12 +170,12 @@ struct rfapi_nve_group_cfg *bgp_rfapi_cfg_match_group(struct rfapi_cfg *hc, #if BGP_VNC_DEBUG_MATCH_GROUP { - char buf[BUFSIZ]; + char buf[PREFIX_STRLEN]; - prefix2str(vn, buf, BUFSIZ); + prefix2str(vn, buf, sizeof(buf)); vnc_zlog_debug_verbose("%s: vn prefix: %s", __func__, buf); - prefix2str(un, buf, BUFSIZ); + prefix2str(un, buf, sizeof(buf)); vnc_zlog_debug_verbose("%s: un prefix: %s", __func__, buf); vnc_zlog_debug_verbose( @@ -4187,32 +4187,21 @@ int bgp_rfapi_cfg_write(struct vty *vty, struct bgp *bgp) vty_out(vty, " vnc nve-group %s\n", rfg->name); if (rfg->vn_prefix.family && rfg->vn_node) { - char buf[BUFSIZ]; - buf[0] = buf[BUFSIZ - 1] = 0; + char buf[PREFIX_STRLEN]; prefix2str(&rfg->vn_prefix, buf, - BUFSIZ); - if (!buf[0] || buf[BUFSIZ - 1]) { - vty_out(vty, - "!Error: Can't convert prefix\n"); - } else { - vty_out(vty, " prefix %s %s\n", - "vn", buf); - } + sizeof(buf)); + vty_out(vty, " prefix %s %s\n", + "vn", buf); } if (rfg->un_prefix.family && rfg->un_node) { - char buf[BUFSIZ]; - buf[0] = buf[BUFSIZ - 1] = 0; + char buf[PREFIX_STRLEN]; + prefix2str(&rfg->un_prefix, buf, - BUFSIZ); - if (!buf[0] || buf[BUFSIZ - 1]) { - vty_out(vty, - "!Error: Can't convert prefix\n"); - } else { - vty_out(vty, " prefix %s %s\n", - "un", buf); - } + sizeof(buf)); + vty_out(vty, " prefix %s %s\n", + "un", buf); } |