bgpd: Somewhat optimize string returns

There is no need for a cascading series of if statements
for the afi.  Clean it up slightly

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2020-12-17 16:33:11 -05:00
parent ff4a6e5d94
commit 7d0d37de0c

View File

@ -209,33 +209,37 @@ static enum node_type bgp_node_type(afi_t afi, safi_t safi)
static const char *get_afi_safi_vty_str(afi_t afi, safi_t safi) static const char *get_afi_safi_vty_str(afi_t afi, safi_t safi)
{ {
if (afi == AFI_IP && safi == SAFI_UNICAST) if (afi == AFI_IP) {
if (safi == SAFI_UNICAST)
return "IPv4 Unicast"; return "IPv4 Unicast";
else if (afi == AFI_IP && safi == SAFI_MULTICAST) if (safi == SAFI_MULTICAST)
return "IPv4 Multicast"; return "IPv4 Multicast";
else if (afi == AFI_IP && safi == SAFI_LABELED_UNICAST) if (safi == SAFI_LABELED_UNICAST)
return "IPv4 Labeled Unicast"; return "IPv4 Labeled Unicast";
else if (afi == AFI_IP && safi == SAFI_MPLS_VPN) if (safi == SAFI_MPLS_VPN)
return "IPv4 VPN"; return "IPv4 VPN";
else if (afi == AFI_IP && safi == SAFI_ENCAP) if (safi == SAFI_ENCAP)
return "IPv4 Encap"; return "IPv4 Encap";
else if (afi == AFI_IP && safi == SAFI_FLOWSPEC) if (safi == SAFI_FLOWSPEC)
return "IPv4 Flowspec"; return "IPv4 Flowspec";
else if (afi == AFI_IP6 && safi == SAFI_UNICAST) } else if (afi == AFI_IP6) {
if (safi == SAFI_UNICAST)
return "IPv6 Unicast"; return "IPv6 Unicast";
else if (afi == AFI_IP6 && safi == SAFI_MULTICAST) if (safi == SAFI_MULTICAST)
return "IPv6 Multicast"; return "IPv6 Multicast";
else if (afi == AFI_IP6 && safi == SAFI_LABELED_UNICAST) if (safi == SAFI_LABELED_UNICAST)
return "IPv6 Labeled Unicast"; return "IPv6 Labeled Unicast";
else if (afi == AFI_IP6 && safi == SAFI_MPLS_VPN) if (safi == SAFI_MPLS_VPN)
return "IPv6 VPN"; return "IPv6 VPN";
else if (afi == AFI_IP6 && safi == SAFI_ENCAP) if (safi == SAFI_ENCAP)
return "IPv6 Encap"; return "IPv6 Encap";
else if (afi == AFI_IP6 && safi == SAFI_FLOWSPEC) if (safi == SAFI_FLOWSPEC)
return "IPv6 Flowspec"; return "IPv6 Flowspec";
else if (afi == AFI_L2VPN && safi == SAFI_EVPN) } else if (afi == AFI_L2VPN) {
if (safi == SAFI_EVPN)
return "L2VPN EVPN"; return "L2VPN EVPN";
else }
return "Unknown"; return "Unknown";
} }
@ -247,33 +251,37 @@ static const char *get_afi_safi_vty_str(afi_t afi, safi_t safi)
*/ */
static const char *get_afi_safi_json_str(afi_t afi, safi_t safi) static const char *get_afi_safi_json_str(afi_t afi, safi_t safi)
{ {
if (afi == AFI_IP && safi == SAFI_UNICAST) if (afi == AFI_IP) {
if (safi == SAFI_UNICAST)
return "ipv4Unicast"; return "ipv4Unicast";
else if (afi == AFI_IP && safi == SAFI_MULTICAST) if (safi == SAFI_MULTICAST)
return "ipv4Multicast"; return "ipv4Multicast";
else if (afi == AFI_IP && safi == SAFI_LABELED_UNICAST) if (safi == SAFI_LABELED_UNICAST)
return "ipv4LabeledUnicast"; return "ipv4LabeledUnicast";
else if (afi == AFI_IP && safi == SAFI_MPLS_VPN) if (safi == SAFI_MPLS_VPN)
return "ipv4Vpn"; return "ipv4Vpn";
else if (afi == AFI_IP && safi == SAFI_ENCAP) if (safi == SAFI_ENCAP)
return "ipv4Encap"; return "ipv4Encap";
else if (afi == AFI_IP && safi == SAFI_FLOWSPEC) if (safi == SAFI_FLOWSPEC)
return "ipv4Flowspec"; return "ipv4Flowspec";
else if (afi == AFI_IP6 && safi == SAFI_UNICAST) } else if (afi == AFI_IP6) {
if (safi == SAFI_UNICAST)
return "ipv6Unicast"; return "ipv6Unicast";
else if (afi == AFI_IP6 && safi == SAFI_MULTICAST) if (safi == SAFI_MULTICAST)
return "ipv6Multicast"; return "ipv6Multicast";
else if (afi == AFI_IP6 && safi == SAFI_LABELED_UNICAST) if (safi == SAFI_LABELED_UNICAST)
return "ipv6LabeledUnicast"; return "ipv6LabeledUnicast";
else if (afi == AFI_IP6 && safi == SAFI_MPLS_VPN) if (safi == SAFI_MPLS_VPN)
return "ipv6Vpn"; return "ipv6Vpn";
else if (afi == AFI_IP6 && safi == SAFI_ENCAP) if (safi == SAFI_ENCAP)
return "ipv6Encap"; return "ipv6Encap";
else if (afi == AFI_IP6 && safi == SAFI_FLOWSPEC) if (safi == SAFI_FLOWSPEC)
return "ipv6Flowspec"; return "ipv6Flowspec";
else if (afi == AFI_L2VPN && safi == SAFI_EVPN) } else if (afi == AFI_L2VPN) {
if (safi == SAFI_EVPN)
return "l2VpnEvpn"; return "l2VpnEvpn";
else }
return "Unknown"; return "Unknown";
} }
@ -282,29 +290,33 @@ static const char *get_afi_safi_json_str(afi_t afi, safi_t safi)
*/ */
const char *bgp_afi_safi_get_container_str(afi_t afi, safi_t safi) const char *bgp_afi_safi_get_container_str(afi_t afi, safi_t safi)
{ {
if (afi == AFI_IP && safi == SAFI_UNICAST) if (afi == AFI_IP) {
if (safi == SAFI_UNICAST)
return "ipv4-unicast"; return "ipv4-unicast";
else if (afi == AFI_IP && safi == SAFI_MULTICAST) if (safi == SAFI_MULTICAST)
return "ipv4-multicast"; return "ipv4-multicast";
else if (afi == AFI_IP && safi == SAFI_LABELED_UNICAST) if (safi == SAFI_LABELED_UNICAST)
return "ipv4-labeled-unicast"; return "ipv4-labeled-unicast";
else if (afi == AFI_IP && safi == SAFI_MPLS_VPN) if (safi == SAFI_MPLS_VPN)
return "l3vpn-ipv4-unicast"; return "l3vpn-ipv4-unicast";
else if (afi == AFI_IP && safi == SAFI_FLOWSPEC) if (safi == SAFI_FLOWSPEC)
return "ipv4-flowspec"; return "ipv4-flowspec";
else if (afi == AFI_IP6 && safi == SAFI_UNICAST) } else if (afi == AFI_IP6) {
if (safi == SAFI_UNICAST)
return "ipv6-unicast"; return "ipv6-unicast";
else if (afi == AFI_IP6 && safi == SAFI_MULTICAST) if (safi == SAFI_MULTICAST)
return "ipv6-multicast"; return "ipv6-multicast";
else if (afi == AFI_IP6 && safi == SAFI_LABELED_UNICAST) if (safi == SAFI_LABELED_UNICAST)
return "ipv6-labeled-unicast"; return "ipv6-labeled-unicast";
else if (afi == AFI_IP6 && safi == SAFI_MPLS_VPN) if (safi == SAFI_MPLS_VPN)
return "l3vpn-ipv6-unicast"; return "l3vpn-ipv6-unicast";
else if (afi == AFI_IP6 && safi == SAFI_FLOWSPEC) if (safi == SAFI_FLOWSPEC)
return "ipv6-flowspec"; return "ipv6-flowspec";
else if (afi == AFI_L2VPN && safi == SAFI_EVPN) } else if (afi == AFI_L2VPN) {
if (safi == SAFI_EVPN)
return "l2vpn-evpn"; return "l2vpn-evpn";
else }
return "Unknown"; return "Unknown";
} }