]> git.puffer.fish Git - mirror/frr.git/commitdiff
lib: Allow / and . to match VARIABLE_TKN, fix range matches
authorQuentin Young <qlyoung@cumulusnetworks.com>
Tue, 4 Oct 2016 20:56:30 +0000 (20:56 +0000)
committerQuentin Young <qlyoung@cumulusnetworks.com>
Tue, 4 Oct 2016 20:56:30 +0000 (20:56 +0000)
Range matching function was returning 0 instead of no_match
on failed match, causing all input to match ranges.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
lib/command_match.c

index 85d627e1bef7c47ce0876e3e88c03df2db563947..dcad943619348924e4c591537fc4201cf52e05e2 100644 (file)
@@ -758,7 +758,7 @@ match_range (struct cmd_token *token, const char *str)
 
   val = strtoll (str, &endptr, 10);
   if (*endptr != '\0')
-    return 0;
+    return no_match;
 
   if (val < token->min || val > token->max)
     return no_match;
@@ -789,7 +789,7 @@ match_word (struct cmd_token *token, const char *word)
 }
 
 #define VARIABLE_ALPHABET \
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890:"
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890:/."
 
 static enum match_type
 match_variable (struct cmd_token *token, const char *word)