From 72831436ed8ffa1c826c64a67e63ba3fe85d6d7f Mon Sep 17 00:00:00 2001 From: Philippe Guibert Date: Mon, 30 Jan 2017 14:57:55 +0100 Subject: [PATCH] bgpd: fix rfapi call to ecom2str with correct number of parameters This commit is a complement for bgpd: handling router mac extended community. As API of bgp_ecommunity ecom2str() function changed, rfapi file has diverged with this API. The commit adds the correct number of parameters. Signed-off-by: Philippe Guibert --- bgpd/rfapi/bgp_rfapi_cfg.c | 8 +++++--- bgpd/rfapi/rfapi.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c index 2739b1ff10..71086c8758 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.c +++ b/bgpd/rfapi/bgp_rfapi_cfg.c @@ -4685,7 +4685,8 @@ bgp_rfapi_cfg_write (struct vty *vty, struct bgp *bgp) ecommunity_cmp (rfg->rt_import_list, rfg->rt_export_list)) { char *b = ecommunity_ecom2str (rfg->rt_import_list, - ECOMMUNITY_FORMAT_ROUTE_MAP); + ECOMMUNITY_FORMAT_ROUTE_MAP, + ECOMMUNITY_ROUTE_TARGET); vty_out (vty, " rt both %s%s", b, VTY_NEWLINE); XFREE (MTYPE_ECOMMUNITY_STR, b); } @@ -4694,14 +4695,15 @@ bgp_rfapi_cfg_write (struct vty *vty, struct bgp *bgp) if (rfg->rt_import_list) { char *b = ecommunity_ecom2str (rfg->rt_import_list, - ECOMMUNITY_FORMAT_ROUTE_MAP); + ECOMMUNITY_FORMAT_ROUTE_MAP, + ECOMMUNITY_ROUTE_TARGET); vty_out (vty, " rt import %s%s", b, VTY_NEWLINE); XFREE (MTYPE_ECOMMUNITY_STR, b); } if (rfg->rt_export_list) { char *b = ecommunity_ecom2str (rfg->rt_export_list, - ECOMMUNITY_FORMAT_ROUTE_MAP); + ECOMMUNITY_FORMAT_ROUTE_MAP, ECOMMUNITY_ROUTE_TARGET); vty_out (vty, " rt export %s%s", b, VTY_NEWLINE); XFREE (MTYPE_ECOMMUNITY_STR, b); } diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c index 56ca25a131..351d4b6d5a 100644 --- a/bgpd/rfapi/rfapi.c +++ b/bgpd/rfapi/rfapi.c @@ -1733,7 +1733,7 @@ rfapi_query_inner ( __func__, rfd, buf, ppNextHopEntry); s = ecommunity_ecom2str(rfd->import_table->rt_import_list, - ECOMMUNITY_FORMAT_ROUTE_MAP); + ECOMMUNITY_FORMAT_ROUTE_MAP, ECOMMUNITY_ROUTE_TARGET); vnc_zlog_debug_verbose("%s rfd->import_table=%p, rfd->import_table->rt_import_list: %s", __func__, rfd->import_table, s); XFREE (MTYPE_ECOMMUNITY_STR, s); }