proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-20 08:43:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: cleanup vpn label config, set BoS, use 'label' in place of 'tag'

Browse Source 
Signed-off-by: Lou Berger <lberger@labn.net>
This commit is contained in:
Lou Berger 2017-05-18 08:56:26 -04:00
parent f1deac618b
commit fb1d2a2d97
3 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bgpd/bgp_encap.c
View File

@ -208,25 +208,22 @@ bgp_nlri_parse_encap(
/* For testing purpose, static route of ENCAP. */ /* For testing purpose, static route of ENCAP. */
DEFUN (encap_network, DEFUN (encap_network,
encap_network_cmd, encap_network_cmd,
"network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD", "network A.B.C.D/M rd ASN:nn_or_IP-address:nn",
"Specify a network to announce via BGP\n" "Specify a network to announce via BGP\n"
"IPv4 prefix\n" "IPv4 prefix\n"
"Specify Route Distinguisher\n" "Specify Route Distinguisher\n"
"ENCAP Route Distinguisher\n" "ENCAP Route Distinguisher\n")
"BGP tag\n"
"tag value\n")
{ {
int idx_ipv4 = 1; int idx_ipv4 = 1;
int idx_rd = 3; int idx_rd = 3;
int idx_word = 5; return bgp_static_set_safi (AFI_IP, SAFI_ENCAP, vty, argv[idx_ipv4]->arg, argv[idx_rd]->arg, NULL,
return bgp_static_set_safi (AFI_IP, SAFI_ENCAP, vty, argv[idx_ipv4]->arg, argv[idx_rd]->arg, argv[idx_word]->arg,
NULL, 0, NULL, NULL, NULL, NULL); NULL, 0, NULL, NULL, NULL, NULL);
} }
/* For testing purpose, static route of ENCAP. */ /* For testing purpose, static route of ENCAP. */
DEFUN (no_encap_network, DEFUN (no_encap_network,
no_encap_network_cmd, no_encap_network_cmd,
"no network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD", "no network A.B.C.D/M rd ASN:nn_or_IP-address:nn",
NO_STR NO_STR
"Specify a network to announce via BGP\n" "Specify a network to announce via BGP\n"
"IPv4 prefix\n" "IPv4 prefix\n"
@ -237,8 +234,7 @@ DEFUN (no_encap_network,
{ {
int idx_ipv4 = 2; int idx_ipv4 = 2;
int idx_rd = 4; int idx_rd = 4;
int idx_word = 6; return bgp_static_unset_safi (AFI_IP, SAFI_ENCAP, vty, argv[idx_ipv4]->arg, argv[idx_rd]->arg, NULL,
return bgp_static_unset_safi (AFI_IP, SAFI_ENCAP, vty, argv[idx_ipv4]->arg, argv[idx_rd]->arg, argv[idx_word]->arg,
0, NULL, NULL, NULL); 0, NULL, NULL, NULL);
} }

57
bgpd/bgp_mplsvpn.c
View File

@ -460,99 +460,104 @@ prefix_rd2str (struct prefix_rd *prd, char *buf, size_t size)
/* For testing purpose, static route of MPLS-VPN. */ /* For testing purpose, static route of MPLS-VPN. */
DEFUN (vpnv4_network, DEFUN (vpnv4_network,
vpnv4_network_cmd, vpnv4_network_cmd,
"network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD", "network A.B.C.D/M rd ASN:nn_or_IP-address:nn <tag|label> (0-1048575)",
"Specify a network to announce via BGP\n" "Specify a network to announce via BGP\n"
"IPv4 prefix\n" "IPv4 prefix\n"
"Specify Route Distinguisher\n" "Specify Route Distinguisher\n"
"VPN Route Distinguisher\n" "VPN Route Distinguisher\n"
"BGP tag\n" "VPN NLRI label (tag)\n"
"tag value\n") "VPN NLRI label (tag)\n"
"Label value\n")
{ {
int idx_ipv4_prefixlen = 1; int idx_ipv4_prefixlen = 1;
int idx_ext_community = 3; int idx_ext_community = 3;
int idx_word = 5; int idx_label = 5;
return bgp_static_set_safi (AFI_IP, SAFI_MPLS_VPN, vty, argv[idx_ipv4_prefixlen]->arg, argv[idx_ext_community]->arg, return bgp_static_set_safi (AFI_IP, SAFI_MPLS_VPN, vty, argv[idx_ipv4_prefixlen]->arg, argv[idx_ext_community]->arg,
argv[idx_word]->arg, NULL, 0, NULL, NULL, NULL, NULL); argv[idx_label]->arg, NULL, 0, NULL, NULL, NULL, NULL);
} }
DEFUN (vpnv4_network_route_map, DEFUN (vpnv4_network_route_map,
vpnv4_network_route_map_cmd, vpnv4_network_route_map_cmd,
"network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD route-map WORD", "network A.B.C.D/M rd ASN:nn_or_IP-address:nn <tag|label> (0-1048575) route-map WORD",
"Specify a network to announce via BGP\n" "Specify a network to announce via BGP\n"
"IPv4 prefix\n" "IPv4 prefix\n"
"Specify Route Distinguisher\n" "Specify Route Distinguisher\n"
"VPN Route Distinguisher\n" "VPN Route Distinguisher\n"
"BGP tag\n" "VPN NLRI label (tag)\n"
"tag value\n" "VPN NLRI label (tag)\n"
"Label value\n"
"route map\n" "route map\n"
"route map name\n") "route map name\n")
{ {
int idx_ipv4_prefixlen = 1; int idx_ipv4_prefixlen = 1;
int idx_ext_community = 3; int idx_ext_community = 3;
int idx_word = 5; int idx_label = 5;
int idx_word_2 = 7; int idx_word_2 = 7;
return bgp_static_set_safi (AFI_IP, SAFI_MPLS_VPN, vty, argv[idx_ipv4_prefixlen]->arg, argv[idx_ext_community]->arg, argv[idx_word]->arg, return bgp_static_set_safi (AFI_IP, SAFI_MPLS_VPN, vty, argv[idx_ipv4_prefixlen]->arg, argv[idx_ext_community]->arg, argv[idx_label]->arg,
argv[idx_word_2]->arg, 0, NULL, NULL, NULL, NULL); argv[idx_word_2]->arg, 0, NULL, NULL, NULL, NULL);
} }
/* For testing purpose, static route of MPLS-VPN. */ /* For testing purpose, static route of MPLS-VPN. */
DEFUN (no_vpnv4_network, DEFUN (no_vpnv4_network,
no_vpnv4_network_cmd, no_vpnv4_network_cmd,
"no network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD", "no network A.B.C.D/M rd ASN:nn_or_IP-address:nn <tag|label> (0-1048575)",
NO_STR NO_STR
"Specify a network to announce via BGP\n" "Specify a network to announce via BGP\n"
"IPv4 prefix\n" "IPv4 prefix\n"
"Specify Route Distinguisher\n" "Specify Route Distinguisher\n"
"VPN Route Distinguisher\n" "VPN Route Distinguisher\n"
"BGP tag\n" "VPN NLRI label (tag)\n"
"tag value\n") "VPN NLRI label (tag)\n"
"Label value\n")
{ {
int idx_ipv4_prefixlen = 2; int idx_ipv4_prefixlen = 2;
int idx_ext_community = 4; int idx_ext_community = 4;
int idx_word = 6; int idx_label = 6;
return bgp_static_unset_safi (AFI_IP, SAFI_MPLS_VPN, vty, argv[idx_ipv4_prefixlen]->arg, return bgp_static_unset_safi (AFI_IP, SAFI_MPLS_VPN, vty, argv[idx_ipv4_prefixlen]->arg,
argv[idx_ext_community]->arg, argv[idx_word]->arg, argv[idx_ext_community]->arg, argv[idx_label]->arg,
0, NULL, NULL, NULL); 0, NULL, NULL, NULL);
} }
DEFUN (vpnv6_network, DEFUN (vpnv6_network,
vpnv6_network_cmd, vpnv6_network_cmd,
"network X:X::X:X/M rd ASN:nn_or_IP-address:nn tag WORD [route-map WORD]", "network X:X::X:X/M rd ASN:nn_or_IP-address:nn <tag|label> (0-1048575) [route-map WORD]",
"Specify a network to announce via BGP\n" "Specify a network to announce via BGP\n"
"IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n" "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n"
"Specify Route Distinguisher\n" "Specify Route Distinguisher\n"
"VPN Route Distinguisher\n" "VPN Route Distinguisher\n"
"BGP tag\n" "VPN NLRI label (tag)\n"
"tag value\n" "VPN NLRI label (tag)\n"
"Label value\n"
"route map\n" "route map\n"
"route map name\n") "route map name\n")
{ {
int idx_ipv6_prefix = 1; int idx_ipv6_prefix = 1;
int idx_ext_community = 3; int idx_ext_community = 3;
int idx_word = 5; int idx_label = 5;
int idx_word_2 = 7; int idx_word_2 = 7;
if (argc == 8) if (argc == 8)
return bgp_static_set_safi (AFI_IP6, SAFI_MPLS_VPN, vty, argv[idx_ipv6_prefix]->arg, argv[idx_ext_community]->arg, argv[idx_word]->arg, argv[idx_word_2]->arg, 0, NULL, NULL, NULL, NULL); return bgp_static_set_safi (AFI_IP6, SAFI_MPLS_VPN, vty, argv[idx_ipv6_prefix]->arg, argv[idx_ext_community]->arg, argv[idx_label]->arg, argv[idx_word_2]->arg, 0, NULL, NULL, NULL, NULL);
else else
return bgp_static_set_safi (AFI_IP6, SAFI_MPLS_VPN, vty, argv[idx_ipv6_prefix]->arg, argv[idx_ext_community]->arg, argv[idx_word]->arg, NULL, 0, NULL, NULL, NULL, NULL); return bgp_static_set_safi (AFI_IP6, SAFI_MPLS_VPN, vty, argv[idx_ipv6_prefix]->arg, argv[idx_ext_community]->arg, argv[idx_label]->arg, NULL, 0, NULL, NULL, NULL, NULL);
} }
/* For testing purpose, static route of MPLS-VPN. */ /* For testing purpose, static route of MPLS-VPN. */
DEFUN (no_vpnv6_network, DEFUN (no_vpnv6_network,
no_vpnv6_network_cmd, no_vpnv6_network_cmd,
"no network X:X::X:X/M rd ASN:nn_or_IP-address:nn tag WORD", "no network X:X::X:X/M rd ASN:nn_or_IP-address:nn <tag|label> (0-1048575)",
NO_STR NO_STR
"Specify a network to announce via BGP\n" "Specify a network to announce via BGP\n"
"IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n" "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n"
"Specify Route Distinguisher\n" "Specify Route Distinguisher\n"
"VPN Route Distinguisher\n" "VPN Route Distinguisher\n"
"BGP tag\n" "VPN NLRI label (tag)\n"
"tag value\n") "VPN NLRI label (tag)\n"
"Label value\n")
{ {
int idx_ipv6_prefix = 2; int idx_ipv6_prefix = 2;
int idx_ext_community = 4; int idx_ext_community = 4;
int idx_word = 6; int idx_label = 6;
return bgp_static_unset_safi (AFI_IP6, SAFI_MPLS_VPN, vty, argv[idx_ipv6_prefix]->arg, argv[idx_ext_community]->arg, argv[idx_word]->arg, 0, NULL, NULL, NULL); return bgp_static_unset_safi (AFI_IP6, SAFI_MPLS_VPN, vty, argv[idx_ipv6_prefix]->arg, argv[idx_ext_community]->arg, argv[idx_label]->arg, 0, NULL, NULL, NULL);
} }
int int

31
bgpd/bgp_route.c
View File

@ -4454,7 +4454,7 @@ bgp_purge_static_redist_routes (struct bgp *bgp)
*/ */
int int
bgp_static_set_safi (afi_t afi, safi_t safi, struct vty *vty, const char *ip_str, bgp_static_set_safi (afi_t afi, safi_t safi, struct vty *vty, const char *ip_str,
const char *rd_str, const char *tag_str, const char *rd_str, const char *label_str,
const char *rmap_str, int evpn_type, const char *esi, const char *gwip, const char *rmap_str, int evpn_type, const char *esi, const char *gwip,
const char *ethtag, const char *routermac) const char *ethtag, const char *routermac)
{ {
@ -4491,18 +4491,15 @@ bgp_static_set_safi (afi_t afi, safi_t safi, struct vty *vty, const char *ip_str
return CMD_WARNING; return CMD_WARNING;
} }
if (tag_str) if (label_str)
{ {
ret = str2tag (tag_str, tag); unsigned long label_val;
if (! ret) VTY_GET_INTEGER_RANGE("Label/tag", label_val, label_str, 0, 16777215);
{ encode_label (label_val, tag);
vty_out (vty, "%% Malformed tag%s", VTY_NEWLINE);
return CMD_WARNING;
}
} }
else else
{ {
encode_label (0, tag); memset (tag, 0, sizeof(tag)); /* empty, not even BoS */
} }
if (safi == SAFI_EVPN) if (safi == SAFI_EVPN)
{ {
@ -4594,7 +4591,7 @@ bgp_static_set_safi (afi_t afi, safi_t safi, struct vty *vty, const char *ip_str
/* Configure static BGP network. */ /* Configure static BGP network. */
int int
bgp_static_unset_safi(afi_t afi, safi_t safi, struct vty *vty, const char *ip_str, bgp_static_unset_safi(afi_t afi, safi_t safi, struct vty *vty, const char *ip_str,
const char *rd_str, const char *tag_str, const char *rd_str, const char *label_str,
int evpn_type, const char *esi, const char *gwip, const char *ethtag) int evpn_type, const char *esi, const char *gwip, const char *ethtag)
{ {
VTY_DECLVAR_CONTEXT(bgp, bgp); VTY_DECLVAR_CONTEXT(bgp, bgp);
@ -4628,11 +4625,15 @@ bgp_static_unset_safi(afi_t afi, safi_t safi, struct vty *vty, const char *ip_st
return CMD_WARNING; return CMD_WARNING;
} }
ret = str2tag (tag_str, tag); if (label_str)
if (! ret)
{ {
vty_out (vty, "%% Malformed tag%s", VTY_NEWLINE); unsigned long label_val;
return CMD_WARNING; VTY_GET_INTEGER_RANGE("Label/tag", label_val, label_str, 0, MPLS_LABEL_MAX);
encode_label (label_val, tag);
}
else
{
memset (tag, 0, sizeof(tag)); /* empty, not even BoS */
} }
prn = bgp_node_get (bgp->route[afi][safi], prn = bgp_node_get (bgp->route[afi][safi],
@ -10433,7 +10434,7 @@ bgp_config_write_network_vpn (struct vty *vty, struct bgp *bgp,
prefix_rd2str (prd, rdbuf, RD_ADDRSTRLEN); prefix_rd2str (prd, rdbuf, RD_ADDRSTRLEN);
label = decode_label (bgp_static->tag); label = decode_label (bgp_static->tag);
vty_out (vty, " network %s/%d rd %s tag %d", vty_out (vty, " network %s/%d rd %s label %d",
inet_ntop (p->family, &p->u.prefix, buf, SU_ADDRSTRLEN), inet_ntop (p->family, &p->u.prefix, buf, SU_ADDRSTRLEN),
p->prefixlen, p->prefixlen,
rdbuf, label); rdbuf, label);