Merge pull request #3560 from opensourcerouting/fix-sh-bgp-community

bgpd: fix parsing of community number in the "show bgp community" command

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 2c361bef4d5b2693f85bd1289914d44da0a86176..31cd3d1f051ee9aba04ef9f216986227e34f7d52 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -9529,9 +9529,16 @@ DEFUN (show_ip_bgp_json,
        }
 
        if (argv_find(argv, argc, "community", &idx)) {
-               char *maybecomm = idx + 1 < argc ? argv[idx + 1]->text : NULL;
+               char *maybecomm = NULL;
                char *community = NULL;
 
+               if (idx + 1 < argc) {
+                       if (argv[idx + 1]->type == VARIABLE_TKN)
+                               maybecomm = argv[idx + 1]->arg;
+                       else
+                               maybecomm = argv[idx + 1]->text;
+               }
+
                if (maybecomm && !strmatch(maybecomm, "json")
                    && !strmatch(maybecomm, "exact-match"))
                        community = maybecomm;