diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2021-03-17 03:21:05 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2021-03-17 03:38:13 +0100 |
| commit | a59803d0603d277269c4c5c1511cad68684752ae (patch) | |
| tree | d9be0f77de961fffcff74f43706700adf3ee7988 /bgpd/bgp_vty.c | |
| parent | Merge pull request #8258 from volta-networks/feat_ldp_snmp_with_stats (diff) | |
| download | frr-a59803d0603d277269c4c5c1511cad68684752ae.tar.xz frr-a59803d0603d277269c4c5c1511cad68684752ae.zip | |
bgpd: Attempting to activate unicast and labeled-unicast
Should return an actual useful error message.
Commit: 055679e915fc826fe13abdd8d60a22a0ca35c8c6 messed this error message
up.
Fixes: #8246
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to '')
| -rw-r--r-- | bgpd/bgp_vty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index a4e56c95c..46a017f91 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -739,7 +739,7 @@ int bgp_nb_errmsg_return(char *errmsg, size_t errmsg_len, int ret) str = "Operation not allowed on a directly connected neighbor"; break; case BGP_ERR_PEER_SAFI_CONFLICT: - str = GR_INVALID; + str = "Cannot activate peer for both 'ipv4 unicast' and 'ipv4 labeled-unicast'"; break; case BGP_ERR_GR_INVALID_CMD: str = "The Graceful Restart command used is not valid at this moment."; @@ -831,7 +831,7 @@ int bgp_vty_return(struct vty *vty, int ret) str = "Operation not allowed on a directly connected neighbor"; break; case BGP_ERR_PEER_SAFI_CONFLICT: - str = GR_INVALID; + str = "Cannot activate peer for both 'ipv4 unicast' and 'ipv4 labeled-unicast'"; break; case BGP_ERR_GR_INVALID_CMD: str = "The Graceful Restart command used is not valid at this moment."; |