From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Tue, 15 Aug 2023 09:13:54 +0000 (+0300)
Subject: lib: Lower precedence for ASNUM_TKN when using together with IPV4/IPV6_TKN
X-Git-Tag: base_9.1~150^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=58a93c2edaba537d14286deb1341a2a952321a00;p=matthieu%2Ffrr.git

lib: Lower precedence for ASNUM_TKN when using together with IPV4/IPV6_TKN

When using together with IPV4/IPV6_TKN, this breaks an existing command like:

```
donatas-pc# clear bgp ipv6 unicast 2a02::1
% Ambiguous command: clear bgp ipv6 unicast 2a02::1
donatas-pc#
```

With this fix:

```
donatas-pc# clear bgp ipv6 unicast 2a02::1
% BGP: Unknown neighbor - "2a02::1"
donatas-pc# clear bgp ipv6 unicast 2.2
% BGP: No IPv6 Unicast peer is configured with AS 2.2
donatas-pc# clear bgp ipv6 unicast 123
% BGP: No IPv6 Unicast peer is configured with AS 123
donatas-pc# clear bgp ipv4 unicast 127.0.0.1
donatas-pc#
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
---

diff --git a/lib/command_match.c b/lib/command_match.c
index ff3c48fc31..f740b72600 100644
--- a/lib/command_match.c
+++ b/lib/command_match.c
@@ -566,9 +566,9 @@ static int score_precedence(enum cmd_token_type type)
 	case IPV6_PREFIX_TKN:
 	case MAC_TKN:
 	case MAC_PREFIX_TKN:
-	case ASNUM_TKN:
 	case RANGE_TKN:
 		return 2;
+	case ASNUM_TKN:
 	case WORD_TKN:
 		return 3;
 	case VARIABLE_TKN: