From: Donatas Abraitis <donatas.abraitis@gmail.com>
Date: Mon, 17 Jan 2022 14:52:06 +0000 (+0200)
Subject: bgpd: List peer-group as neighbor once and not for IPv4/IPv6/WORD
X-Git-Tag: base_8.2~24^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F10352%2Fhead;p=mirror%2Ffrr.git

bgpd: List peer-group as neighbor once and not for IPv4/IPv6/WORD

Before:

```
exit1-debian-11(config-router)# neighbor ?
  A.B.C.D   Neighbor address
     192.168.0.2 PEER PG
  WORD      Interface name or neighbor tag
     PEER PG
  X:X::X:X  Neighbor IPv6 address
     2a02:abc::17 2a02:bbd::2 PEER PG
```

After:

```
exit1-debian-11(config-router)# neighbor ?
  A.B.C.D   Neighbor address
     192.168.0.2
  WORD      Interface name or neighbor tag
     PEER PG
  X:X::X:X  Neighbor IPv6 address
     2a02:abc::17 2a02:bbd::2
```

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
---

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index ec5a07e147..69f4d66b46 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -17541,7 +17541,9 @@ static void bgp_ac_peer(vector comps, struct cmd_token *token)
 static void bgp_ac_neighbor(vector comps, struct cmd_token *token)
 {
 	bgp_ac_peer(comps, token);
-	bgp_ac_peergroup(comps, token);
+
+	if (token->type == VARIABLE_TKN)
+		bgp_ac_peergroup(comps, token);
 }
 
 static const struct cmd_variable_handler bgp_var_neighbor[] = {