summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2020-06-30 08:28:06 -0400
committerAndrew Yourtchenko <ayourtch@gmail.com>2020-08-18 19:47:21 +0000
commit64c2689c3e67678520002317eadd31b461c7ad6c (patch)
tree3bfa363074640ca668c2f294aa115b3616646002
parent1ff8a6c32abdfb00d427e1ab408997fc0908f50b (diff)
classify: fix debug CLI
unformat_ip6_mask wasn't accounting for customized field names when deciding if it managed to parse at least one field. Type: fix Signed-off-by: Dave Barach <dave@barachs.net> Change-Id: I26cab4c6828b510e277079628af5115ac43af3ff (cherry picked from commit 126c88544103d3775252f741398111875f6a62d7)
-rwxr-xr-xsrc/vnet/classify/vnet_classify.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/vnet/classify/vnet_classify.c b/src/vnet/classify/vnet_classify.c
index d97042eda36..dd846cbe3d2 100755
--- a/src/vnet/classify/vnet_classify.c
+++ b/src/vnet/classify/vnet_classify.c
@@ -1037,7 +1037,7 @@ unformat_ip6_mask (unformat_input_t * input, va_list * args)
{
u8 **maskp = va_arg (*args, u8 **);
u8 *mask = 0;
- u8 found_something = 0;
+ u8 found_something;
ip6_header_t *ip;
u32 ip_version_traffic_class_and_flow_label;
@@ -1070,6 +1070,10 @@ unformat_ip6_mask (unformat_input_t * input, va_list * args)
break;
}
+ /* Account for "special" field names */
+ found_something = version + traffic_class + flow_label
+ + src_address + dst_address + protocol;
+
#define _(a) found_something += a;
foreach_ip6_proto_field;
#undef _