mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-14 08:50:26 +00:00
zebra: unify the ipv4/ipv6 'show ip route' commands - part 2/2
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal
parent
ce0ff16bd9
commit
5ce91022c1
@ -55,6 +55,10 @@ static int do_show_ip_route(struct vty *vty, const char *vrf_name, afi_t afi,
|
|||||||
u_short ospf_instance_id);
|
u_short ospf_instance_id);
|
||||||
static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
|
static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
|
||||||
int mcast);
|
int mcast);
|
||||||
|
static void vty_show_ip_route_summary(struct vty *vty,
|
||||||
|
struct route_table *table);
|
||||||
|
static void vty_show_ip_route_summary_prefix(struct vty *vty,
|
||||||
|
struct route_table *table);
|
||||||
|
|
||||||
/* VNI range as per RFC 7432 */
|
/* VNI range as per RFC 7432 */
|
||||||
#define CMD_VNI_RANGE "(1-16777215)"
|
#define CMD_VNI_RANGE "(1-16777215)"
|
||||||
@ -1283,97 +1287,152 @@ DEFPY (show_route,
|
|||||||
return CMD_SUCCESS;
|
return CMD_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFUN (show_ip_route_addr,
|
DEFPY (show_route_detail,
|
||||||
show_ip_route_addr_cmd,
|
show_route_detail_cmd,
|
||||||
"show ip route [vrf NAME] A.B.C.D",
|
"show\
|
||||||
|
<\
|
||||||
|
ip$ipv4 route [vrf <NAME$vrf_name|all$vrf_all>]\
|
||||||
|
<\
|
||||||
|
A.B.C.D$address\
|
||||||
|
|A.B.C.D/M$prefix\
|
||||||
|
>\
|
||||||
|
|ipv6$ipv6 route [vrf <NAME$vrf_name|all$vrf_all>]\
|
||||||
|
<\
|
||||||
|
X:X::X:X$address\
|
||||||
|
|X:X::X:X/M$prefix\
|
||||||
|
>\
|
||||||
|
>",
|
||||||
SHOW_STR
|
SHOW_STR
|
||||||
IP_STR
|
IP_STR
|
||||||
"IP routing table\n"
|
"IP routing table\n"
|
||||||
VRF_CMD_HELP_STR
|
VRF_FULL_CMD_HELP_STR
|
||||||
"Network in the IP routing table to display\n")
|
"Network in the IP routing table to display\n"
|
||||||
|
"IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
|
||||||
|
IP6_STR
|
||||||
|
"IP routing table\n"
|
||||||
|
VRF_FULL_CMD_HELP_STR
|
||||||
|
"IPv6 Address\n"
|
||||||
|
"IPv6 prefix\n")
|
||||||
{
|
{
|
||||||
int ret;
|
afi_t afi = ipv4 ? AFI_IP : AFI_IP6;
|
||||||
struct prefix_ipv4 p;
|
|
||||||
struct route_table *table;
|
struct route_table *table;
|
||||||
|
struct prefix p;
|
||||||
struct route_node *rn;
|
struct route_node *rn;
|
||||||
vrf_id_t vrf_id = VRF_DEFAULT;
|
|
||||||
|
|
||||||
if (strmatch(argv[3]->text, "vrf")) {
|
if (address_str)
|
||||||
VRF_GET_ID(vrf_id, argv[4]->arg);
|
prefix_str = address_str;
|
||||||
ret = str2prefix_ipv4(argv[5]->arg, &p);
|
if (str2prefix(prefix_str, &p) < 0) {
|
||||||
} else {
|
vty_out(vty, "%% Malformed address\n");
|
||||||
ret = str2prefix_ipv4(argv[3]->arg, &p);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ret <= 0) {
|
|
||||||
vty_out(vty, "%% Malformed IPv4 address\n");
|
|
||||||
return CMD_WARNING;
|
return CMD_WARNING;
|
||||||
}
|
}
|
||||||
|
|
||||||
table = zebra_vrf_table(AFI_IP, SAFI_UNICAST, vrf_id);
|
if (vrf_all) {
|
||||||
|
struct vrf *vrf;
|
||||||
|
struct zebra_vrf *zvrf;
|
||||||
|
|
||||||
|
RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name) {
|
||||||
|
if ((zvrf = vrf->info) == NULL
|
||||||
|
|| (table = zvrf->table[afi][SAFI_UNICAST]) == NULL)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
rn = route_node_match(table, &p);
|
||||||
|
if (!rn)
|
||||||
|
continue;
|
||||||
|
if (!address_str && rn->p.prefixlen != p.prefixlen) {
|
||||||
|
route_unlock_node(rn);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
vty_show_ip_route_detail(vty, rn, 0);
|
||||||
|
|
||||||
|
route_unlock_node(rn);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
vrf_id_t vrf_id = VRF_DEFAULT;
|
||||||
|
|
||||||
|
if (vrf_name)
|
||||||
|
VRF_GET_ID(vrf_id, vrf_name);
|
||||||
|
|
||||||
|
table = zebra_vrf_table(afi, SAFI_UNICAST, vrf_id);
|
||||||
if (!table)
|
if (!table)
|
||||||
return CMD_SUCCESS;
|
return CMD_SUCCESS;
|
||||||
|
|
||||||
rn = route_node_match(table, (struct prefix *)&p);
|
rn = route_node_match(table, &p);
|
||||||
if (!rn) {
|
if (!rn) {
|
||||||
vty_out(vty, "%% Network not in table\n");
|
vty_out(vty, "%% Network not in table\n");
|
||||||
return CMD_WARNING;
|
return CMD_WARNING;
|
||||||
}
|
}
|
||||||
|
if (!address_str && rn->p.prefixlen != p.prefixlen) {
|
||||||
|
vty_out(vty, "%% Network not in table\n");
|
||||||
|
route_unlock_node(rn);
|
||||||
|
return CMD_WARNING;
|
||||||
|
}
|
||||||
|
|
||||||
vty_show_ip_route_detail(vty, rn, 0);
|
vty_show_ip_route_detail(vty, rn, 0);
|
||||||
|
|
||||||
route_unlock_node(rn);
|
route_unlock_node(rn);
|
||||||
|
}
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
return CMD_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFUN (show_ip_route_prefix,
|
DEFPY (show_route_summary,
|
||||||
show_ip_route_prefix_cmd,
|
show_route_summary_cmd,
|
||||||
"show ip route [vrf NAME] A.B.C.D/M",
|
"show\
|
||||||
|
<\
|
||||||
|
ip$ipv4 route [vrf <NAME$vrf_name|all$vrf_all>]\
|
||||||
|
summary [prefix$prefix]\
|
||||||
|
|ipv6$ipv6 route [vrf <NAME$vrf_name|all$vrf_all>]\
|
||||||
|
summary [prefix$prefix]\
|
||||||
|
>",
|
||||||
SHOW_STR
|
SHOW_STR
|
||||||
IP_STR
|
IP_STR
|
||||||
"IP routing table\n"
|
"IP routing table\n"
|
||||||
VRF_CMD_HELP_STR
|
VRF_FULL_CMD_HELP_STR
|
||||||
"IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
|
"Summary of all routes\n"
|
||||||
|
"Prefix routes\n"
|
||||||
|
IP6_STR
|
||||||
|
"IP routing table\n"
|
||||||
|
VRF_FULL_CMD_HELP_STR
|
||||||
|
"Summary of all routes\n"
|
||||||
|
"Prefix routes\n")
|
||||||
{
|
{
|
||||||
int ret;
|
afi_t afi = ipv4 ? AFI_IP : AFI_IP6;
|
||||||
struct prefix_ipv4 p;
|
|
||||||
struct route_table *table;
|
struct route_table *table;
|
||||||
struct route_node *rn;
|
|
||||||
|
if (vrf_all) {
|
||||||
|
struct vrf *vrf;
|
||||||
|
struct zebra_vrf *zvrf;
|
||||||
|
|
||||||
|
RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name) {
|
||||||
|
if ((zvrf = vrf->info) == NULL
|
||||||
|
|| (table = zvrf->table[afi][SAFI_UNICAST]) == NULL)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (prefix)
|
||||||
|
vty_show_ip_route_summary_prefix(vty, table);
|
||||||
|
else
|
||||||
|
vty_show_ip_route_summary(vty, table);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
vrf_id_t vrf_id = VRF_DEFAULT;
|
vrf_id_t vrf_id = VRF_DEFAULT;
|
||||||
|
|
||||||
if (strmatch(argv[3]->text, "vrf")) {
|
if (vrf_name)
|
||||||
VRF_GET_ID(vrf_id, argv[4]->arg);
|
VRF_GET_ID(vrf_id, vrf_name);
|
||||||
ret = str2prefix_ipv4(argv[5]->arg, &p);
|
|
||||||
} else {
|
|
||||||
ret = str2prefix_ipv4(argv[3]->arg, &p);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ret <= 0) {
|
table = zebra_vrf_table(afi, SAFI_UNICAST, vrf_id);
|
||||||
vty_out(vty, "%% Malformed IPv4 address\n");
|
|
||||||
return CMD_WARNING;
|
|
||||||
}
|
|
||||||
|
|
||||||
table = zebra_vrf_table(AFI_IP, SAFI_UNICAST, vrf_id);
|
|
||||||
if (!table)
|
if (!table)
|
||||||
return CMD_SUCCESS;
|
return CMD_SUCCESS;
|
||||||
|
|
||||||
rn = route_node_match(table, (struct prefix *)&p);
|
if (prefix)
|
||||||
if (!rn || rn->p.prefixlen != p.prefixlen) {
|
vty_show_ip_route_summary_prefix(vty, table);
|
||||||
if (rn)
|
else
|
||||||
route_unlock_node(rn);
|
vty_show_ip_route_summary(vty, table);
|
||||||
vty_out(vty, "%% Network not in table\n");
|
|
||||||
return CMD_WARNING;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
vty_show_ip_route_detail(vty, rn, 0);
|
|
||||||
|
|
||||||
route_unlock_node(rn);
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
return CMD_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void vty_show_ip_route_summary(struct vty *vty,
|
static void vty_show_ip_route_summary(struct vty *vty,
|
||||||
struct route_table *table)
|
struct route_table *table)
|
||||||
{
|
{
|
||||||
@ -1512,183 +1571,6 @@ static void vty_show_ip_route_summary_prefix(struct vty *vty,
|
|||||||
vty_out(vty, "\n");
|
vty_out(vty, "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Show route summary. */
|
|
||||||
DEFUN (show_ip_route_summary,
|
|
||||||
show_ip_route_summary_cmd,
|
|
||||||
"show ip route [vrf NAME] summary",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IP routing table\n"
|
|
||||||
VRF_CMD_HELP_STR
|
|
||||||
"Summary of all routes\n")
|
|
||||||
{
|
|
||||||
struct route_table *table;
|
|
||||||
vrf_id_t vrf_id = VRF_DEFAULT;
|
|
||||||
|
|
||||||
if (strmatch(argv[3]->text, "vrf"))
|
|
||||||
VRF_GET_ID(vrf_id, argv[4]->arg);
|
|
||||||
|
|
||||||
table = zebra_vrf_table(AFI_IP, SAFI_UNICAST, vrf_id);
|
|
||||||
if (!table)
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
|
|
||||||
vty_show_ip_route_summary(vty, table);
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Show route summary prefix. */
|
|
||||||
DEFUN (show_ip_route_summary_prefix,
|
|
||||||
show_ip_route_summary_prefix_cmd,
|
|
||||||
"show ip route [vrf NAME] summary prefix",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IP routing table\n"
|
|
||||||
VRF_CMD_HELP_STR
|
|
||||||
"Summary of all routes\n"
|
|
||||||
"Prefix routes\n")
|
|
||||||
{
|
|
||||||
struct route_table *table;
|
|
||||||
vrf_id_t vrf_id = VRF_DEFAULT;
|
|
||||||
|
|
||||||
if (strmatch(argv[3]->text, "vrf"))
|
|
||||||
VRF_GET_ID(vrf_id, argv[4]->arg);
|
|
||||||
|
|
||||||
table = zebra_vrf_table(AFI_IP, SAFI_UNICAST, vrf_id);
|
|
||||||
if (!table)
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
|
|
||||||
vty_show_ip_route_summary_prefix(vty, table);
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
DEFUN (show_ip_route_vrf_all_addr,
|
|
||||||
show_ip_route_vrf_all_addr_cmd,
|
|
||||||
"show ip route vrf all A.B.C.D",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IP routing table\n"
|
|
||||||
VRF_ALL_CMD_HELP_STR
|
|
||||||
"Network in the IP routing table to display\n")
|
|
||||||
{
|
|
||||||
int idx_ipv4 = 5;
|
|
||||||
int ret;
|
|
||||||
struct prefix_ipv4 p;
|
|
||||||
struct route_table *table;
|
|
||||||
struct route_node *rn;
|
|
||||||
struct vrf *vrf;
|
|
||||||
struct zebra_vrf *zvrf;
|
|
||||||
|
|
||||||
ret = str2prefix_ipv4(argv[idx_ipv4]->arg, &p);
|
|
||||||
if (ret <= 0) {
|
|
||||||
vty_out(vty, "%% Malformed IPv4 address\n");
|
|
||||||
return CMD_WARNING;
|
|
||||||
}
|
|
||||||
|
|
||||||
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
|
|
||||||
if ((zvrf = vrf->info) == NULL
|
|
||||||
|| (table = zvrf->table[AFI_IP][SAFI_UNICAST]) == NULL)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
rn = route_node_match(table, (struct prefix *)&p);
|
|
||||||
if (!rn)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
vty_show_ip_route_detail(vty, rn, 0);
|
|
||||||
|
|
||||||
route_unlock_node(rn);
|
|
||||||
}
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
DEFUN (show_ip_route_vrf_all_prefix,
|
|
||||||
show_ip_route_vrf_all_prefix_cmd,
|
|
||||||
"show ip route vrf all A.B.C.D/M",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IP routing table\n"
|
|
||||||
VRF_ALL_CMD_HELP_STR
|
|
||||||
"IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
|
|
||||||
{
|
|
||||||
int idx_ipv4_prefixlen = 5;
|
|
||||||
int ret;
|
|
||||||
struct prefix_ipv4 p;
|
|
||||||
struct route_table *table;
|
|
||||||
struct route_node *rn;
|
|
||||||
struct vrf *vrf;
|
|
||||||
struct zebra_vrf *zvrf;
|
|
||||||
|
|
||||||
ret = str2prefix_ipv4(argv[idx_ipv4_prefixlen]->arg, &p);
|
|
||||||
if (ret <= 0) {
|
|
||||||
vty_out(vty, "%% Malformed IPv4 address\n");
|
|
||||||
return CMD_WARNING;
|
|
||||||
}
|
|
||||||
|
|
||||||
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
|
|
||||||
if ((zvrf = vrf->info) == NULL
|
|
||||||
|| (table = zvrf->table[AFI_IP][SAFI_UNICAST]) == NULL)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
rn = route_node_match(table, (struct prefix *)&p);
|
|
||||||
if (!rn)
|
|
||||||
continue;
|
|
||||||
if (rn->p.prefixlen != p.prefixlen) {
|
|
||||||
route_unlock_node(rn);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
vty_show_ip_route_detail(vty, rn, 0);
|
|
||||||
|
|
||||||
route_unlock_node(rn);
|
|
||||||
}
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
DEFUN (show_ip_route_vrf_all_summary,
|
|
||||||
show_ip_route_vrf_all_summary_cmd,
|
|
||||||
"show ip route vrf all summary ",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IP routing table\n"
|
|
||||||
VRF_ALL_CMD_HELP_STR
|
|
||||||
"Summary of all routes\n")
|
|
||||||
{
|
|
||||||
struct vrf *vrf;
|
|
||||||
struct zebra_vrf *zvrf;
|
|
||||||
|
|
||||||
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
|
|
||||||
if ((zvrf = vrf->info) != NULL)
|
|
||||||
vty_show_ip_route_summary(
|
|
||||||
vty, zvrf->table[AFI_IP][SAFI_UNICAST]);
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
DEFUN (show_ip_route_vrf_all_summary_prefix,
|
|
||||||
show_ip_route_vrf_all_summary_prefix_cmd,
|
|
||||||
"show ip route vrf all summary prefix",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IP routing table\n"
|
|
||||||
VRF_ALL_CMD_HELP_STR
|
|
||||||
"Summary of all routes\n"
|
|
||||||
"Prefix routes\n")
|
|
||||||
{
|
|
||||||
struct vrf *vrf;
|
|
||||||
struct zebra_vrf *zvrf;
|
|
||||||
|
|
||||||
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
|
|
||||||
if ((zvrf = vrf->info) != NULL)
|
|
||||||
vty_show_ip_route_summary_prefix(
|
|
||||||
vty, zvrf->table[AFI_IP][SAFI_UNICAST]);
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Write static route configuration. */
|
/* Write static route configuration. */
|
||||||
static int static_config(struct vty *vty, afi_t afi, safi_t safi,
|
static int static_config(struct vty *vty, afi_t afi, safi_t safi,
|
||||||
const char *cmd)
|
const char *cmd)
|
||||||
@ -1873,149 +1755,6 @@ DEFPY(ipv6_route,
|
|||||||
tag_str, distance_str, vrf, label);
|
tag_str, distance_str, vrf, label);
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFUN (show_ipv6_route_addr,
|
|
||||||
show_ipv6_route_addr_cmd,
|
|
||||||
"show ipv6 route [vrf NAME] X:X::X:X",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IPv6 routing table\n"
|
|
||||||
VRF_CMD_HELP_STR
|
|
||||||
"IPv6 Address\n")
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
struct prefix_ipv6 p;
|
|
||||||
struct route_table *table;
|
|
||||||
struct route_node *rn;
|
|
||||||
vrf_id_t vrf_id = VRF_DEFAULT;
|
|
||||||
|
|
||||||
if (strmatch(argv[3]->text, "vrf")) {
|
|
||||||
VRF_GET_ID(vrf_id, argv[4]->arg);
|
|
||||||
ret = str2prefix_ipv6(argv[5]->arg, &p);
|
|
||||||
} else {
|
|
||||||
ret = str2prefix_ipv6(argv[3]->arg, &p);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ret <= 0) {
|
|
||||||
vty_out(vty, "Malformed IPv6 address\n");
|
|
||||||
return CMD_WARNING;
|
|
||||||
}
|
|
||||||
|
|
||||||
table = zebra_vrf_table(AFI_IP6, SAFI_UNICAST, vrf_id);
|
|
||||||
if (!table)
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
|
|
||||||
rn = route_node_match(table, (struct prefix *)&p);
|
|
||||||
if (!rn) {
|
|
||||||
vty_out(vty, "%% Network not in table\n");
|
|
||||||
return CMD_WARNING;
|
|
||||||
}
|
|
||||||
|
|
||||||
vty_show_ip_route_detail(vty, rn, 0);
|
|
||||||
|
|
||||||
route_unlock_node(rn);
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
DEFUN (show_ipv6_route_prefix,
|
|
||||||
show_ipv6_route_prefix_cmd,
|
|
||||||
"show ipv6 route [vrf NAME] X:X::X:X/M",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IPv6 routing table\n"
|
|
||||||
VRF_CMD_HELP_STR
|
|
||||||
"IPv6 prefix\n")
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
struct prefix_ipv6 p;
|
|
||||||
struct route_table *table;
|
|
||||||
struct route_node *rn;
|
|
||||||
vrf_id_t vrf_id = VRF_DEFAULT;
|
|
||||||
|
|
||||||
if (strmatch(argv[3]->text, "vrf")) {
|
|
||||||
VRF_GET_ID(vrf_id, argv[4]->arg);
|
|
||||||
ret = str2prefix_ipv6(argv[5]->arg, &p);
|
|
||||||
} else
|
|
||||||
ret = str2prefix_ipv6(argv[3]->arg, &p);
|
|
||||||
|
|
||||||
if (ret <= 0) {
|
|
||||||
vty_out(vty, "Malformed IPv6 prefix\n");
|
|
||||||
return CMD_WARNING;
|
|
||||||
}
|
|
||||||
|
|
||||||
table = zebra_vrf_table(AFI_IP6, SAFI_UNICAST, vrf_id);
|
|
||||||
if (!table)
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
|
|
||||||
rn = route_node_match(table, (struct prefix *)&p);
|
|
||||||
if (!rn || rn->p.prefixlen != p.prefixlen) {
|
|
||||||
if (rn)
|
|
||||||
route_unlock_node(rn);
|
|
||||||
vty_out(vty, "%% Network not in table\n");
|
|
||||||
return CMD_WARNING;
|
|
||||||
}
|
|
||||||
|
|
||||||
vty_show_ip_route_detail(vty, rn, 0);
|
|
||||||
|
|
||||||
route_unlock_node(rn);
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Show route summary. */
|
|
||||||
DEFUN (show_ipv6_route_summary,
|
|
||||||
show_ipv6_route_summary_cmd,
|
|
||||||
"show ipv6 route [vrf NAME] summary",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IPv6 routing table\n"
|
|
||||||
VRF_CMD_HELP_STR
|
|
||||||
"Summary of all IPv6 routes\n")
|
|
||||||
{
|
|
||||||
struct route_table *table;
|
|
||||||
vrf_id_t vrf_id = VRF_DEFAULT;
|
|
||||||
|
|
||||||
if (strmatch(argv[3]->text, "vrf"))
|
|
||||||
VRF_GET_ID(vrf_id, argv[4]->arg);
|
|
||||||
|
|
||||||
table = zebra_vrf_table(AFI_IP6, SAFI_UNICAST, vrf_id);
|
|
||||||
if (!table)
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
|
|
||||||
vty_show_ip_route_summary(vty, table);
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Show ipv6 route summary prefix. */
|
|
||||||
DEFUN (show_ipv6_route_summary_prefix,
|
|
||||||
show_ipv6_route_summary_prefix_cmd,
|
|
||||||
"show ipv6 route [vrf NAME] summary prefix",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IPv6 routing table\n"
|
|
||||||
VRF_CMD_HELP_STR
|
|
||||||
"Summary of all IPv6 routes\n"
|
|
||||||
"Prefix routes\n")
|
|
||||||
{
|
|
||||||
struct route_table *table;
|
|
||||||
vrf_id_t vrf_id = VRF_DEFAULT;
|
|
||||||
|
|
||||||
if (strmatch(argv[3]->text, "vrf"))
|
|
||||||
VRF_GET_ID(vrf_id, argv[4]->arg);
|
|
||||||
|
|
||||||
table = zebra_vrf_table(AFI_IP6, SAFI_UNICAST, vrf_id);
|
|
||||||
if (!table)
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
|
|
||||||
vty_show_ip_route_summary_prefix(vty, table);
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Show IPv6 mroute command.Used to dump
|
* Show IPv6 mroute command.Used to dump
|
||||||
* the Multicast routing table.
|
* the Multicast routing table.
|
||||||
@ -2053,110 +1792,6 @@ DEFUN (show_ipv6_mroute,
|
|||||||
return CMD_SUCCESS;
|
return CMD_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFUN (show_ipv6_route_vrf_all_addr,
|
|
||||||
show_ipv6_route_vrf_all_addr_cmd,
|
|
||||||
"show ipv6 route vrf all X:X::X:X",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IPv6 routing table\n"
|
|
||||||
VRF_ALL_CMD_HELP_STR
|
|
||||||
"IPv6 Address\n")
|
|
||||||
{
|
|
||||||
int idx_ipv6 = 5;
|
|
||||||
int ret;
|
|
||||||
struct prefix_ipv6 p;
|
|
||||||
struct route_table *table;
|
|
||||||
struct route_node *rn;
|
|
||||||
struct vrf *vrf;
|
|
||||||
struct zebra_vrf *zvrf;
|
|
||||||
|
|
||||||
ret = str2prefix_ipv6(argv[idx_ipv6]->arg, &p);
|
|
||||||
if (ret <= 0) {
|
|
||||||
vty_out(vty, "Malformed IPv6 address\n");
|
|
||||||
return CMD_WARNING;
|
|
||||||
}
|
|
||||||
|
|
||||||
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
|
|
||||||
if ((zvrf = vrf->info) == NULL
|
|
||||||
|| (table = zvrf->table[AFI_IP6][SAFI_UNICAST]) == NULL)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
rn = route_node_match(table, (struct prefix *)&p);
|
|
||||||
if (!rn)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
vty_show_ip_route_detail(vty, rn, 0);
|
|
||||||
|
|
||||||
route_unlock_node(rn);
|
|
||||||
}
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
DEFUN (show_ipv6_route_vrf_all_prefix,
|
|
||||||
show_ipv6_route_vrf_all_prefix_cmd,
|
|
||||||
"show ipv6 route vrf all X:X::X:X/M",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IPv6 routing table\n"
|
|
||||||
VRF_ALL_CMD_HELP_STR
|
|
||||||
"IPv6 prefix\n")
|
|
||||||
{
|
|
||||||
int idx_ipv6_prefixlen = 5;
|
|
||||||
int ret;
|
|
||||||
struct prefix_ipv6 p;
|
|
||||||
struct route_table *table;
|
|
||||||
struct route_node *rn;
|
|
||||||
struct vrf *vrf;
|
|
||||||
struct zebra_vrf *zvrf;
|
|
||||||
|
|
||||||
ret = str2prefix_ipv6(argv[idx_ipv6_prefixlen]->arg, &p);
|
|
||||||
if (ret <= 0) {
|
|
||||||
vty_out(vty, "Malformed IPv6 prefix\n");
|
|
||||||
return CMD_WARNING;
|
|
||||||
}
|
|
||||||
|
|
||||||
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
|
|
||||||
if ((zvrf = vrf->info) == NULL
|
|
||||||
|| (table = zvrf->table[AFI_IP6][SAFI_UNICAST]) == NULL)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
rn = route_node_match(table, (struct prefix *)&p);
|
|
||||||
if (!rn)
|
|
||||||
continue;
|
|
||||||
if (rn->p.prefixlen != p.prefixlen) {
|
|
||||||
route_unlock_node(rn);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
vty_show_ip_route_detail(vty, rn, 0);
|
|
||||||
|
|
||||||
route_unlock_node(rn);
|
|
||||||
}
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
DEFUN (show_ipv6_route_vrf_all_summary,
|
|
||||||
show_ipv6_route_vrf_all_summary_cmd,
|
|
||||||
"show ipv6 route vrf all summary",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IPv6 routing table\n"
|
|
||||||
VRF_ALL_CMD_HELP_STR
|
|
||||||
"Summary of all IPv6 routes\n")
|
|
||||||
{
|
|
||||||
struct vrf *vrf;
|
|
||||||
struct zebra_vrf *zvrf;
|
|
||||||
|
|
||||||
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
|
|
||||||
if ((zvrf = vrf->info) != NULL)
|
|
||||||
vty_show_ip_route_summary(
|
|
||||||
vty, zvrf->table[AFI_IP6][SAFI_UNICAST]);
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
DEFUN (show_ipv6_mroute_vrf_all,
|
DEFUN (show_ipv6_mroute_vrf_all,
|
||||||
show_ipv6_mroute_vrf_all_cmd,
|
show_ipv6_mroute_vrf_all_cmd,
|
||||||
"show ipv6 mroute vrf all",
|
"show ipv6 mroute vrf all",
|
||||||
@ -2190,27 +1825,6 @@ DEFUN (show_ipv6_mroute_vrf_all,
|
|||||||
return CMD_SUCCESS;
|
return CMD_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFUN (show_ipv6_route_vrf_all_summary_prefix,
|
|
||||||
show_ipv6_route_vrf_all_summary_prefix_cmd,
|
|
||||||
"show ipv6 route vrf all summary prefix",
|
|
||||||
SHOW_STR
|
|
||||||
IP_STR
|
|
||||||
"IPv6 routing table\n"
|
|
||||||
VRF_ALL_CMD_HELP_STR
|
|
||||||
"Summary of all IPv6 routes\n"
|
|
||||||
"Prefix routes\n")
|
|
||||||
{
|
|
||||||
struct vrf *vrf;
|
|
||||||
struct zebra_vrf *zvrf;
|
|
||||||
|
|
||||||
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
|
|
||||||
if ((zvrf = vrf->info) != NULL)
|
|
||||||
vty_show_ip_route_summary_prefix(
|
|
||||||
vty, zvrf->table[AFI_IP6][SAFI_UNICAST]);
|
|
||||||
|
|
||||||
return CMD_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
DEFUN (allow_external_route_update,
|
DEFUN (allow_external_route_update,
|
||||||
allow_external_route_update_cmd,
|
allow_external_route_update_cmd,
|
||||||
"allow-external-route-update",
|
"allow-external-route-update",
|
||||||
@ -2661,23 +2275,16 @@ void zebra_vty_init(void)
|
|||||||
|
|
||||||
install_element(VIEW_NODE, &show_vrf_cmd);
|
install_element(VIEW_NODE, &show_vrf_cmd);
|
||||||
install_element(VIEW_NODE, &show_route_cmd);
|
install_element(VIEW_NODE, &show_route_cmd);
|
||||||
|
install_element(VIEW_NODE, &show_route_detail_cmd);
|
||||||
|
install_element(VIEW_NODE, &show_route_summary_cmd);
|
||||||
install_element(VIEW_NODE, &show_ip_nht_cmd);
|
install_element(VIEW_NODE, &show_ip_nht_cmd);
|
||||||
install_element(VIEW_NODE, &show_ip_nht_vrf_all_cmd);
|
install_element(VIEW_NODE, &show_ip_nht_vrf_all_cmd);
|
||||||
install_element(VIEW_NODE, &show_ipv6_nht_cmd);
|
install_element(VIEW_NODE, &show_ipv6_nht_cmd);
|
||||||
install_element(VIEW_NODE, &show_ipv6_nht_vrf_all_cmd);
|
install_element(VIEW_NODE, &show_ipv6_nht_vrf_all_cmd);
|
||||||
install_element(VIEW_NODE, &show_ip_route_addr_cmd);
|
|
||||||
install_element(VIEW_NODE, &show_ip_route_prefix_cmd);
|
|
||||||
install_element(VIEW_NODE, &show_ip_route_summary_cmd);
|
|
||||||
install_element(VIEW_NODE, &show_ip_route_summary_prefix_cmd);
|
|
||||||
|
|
||||||
install_element(VIEW_NODE, &show_ip_rpf_cmd);
|
install_element(VIEW_NODE, &show_ip_rpf_cmd);
|
||||||
install_element(VIEW_NODE, &show_ip_rpf_addr_cmd);
|
install_element(VIEW_NODE, &show_ip_rpf_addr_cmd);
|
||||||
|
|
||||||
install_element(VIEW_NODE, &show_ip_route_vrf_all_addr_cmd);
|
|
||||||
install_element(VIEW_NODE, &show_ip_route_vrf_all_prefix_cmd);
|
|
||||||
install_element(VIEW_NODE, &show_ip_route_vrf_all_summary_cmd);
|
|
||||||
install_element(VIEW_NODE, &show_ip_route_vrf_all_summary_prefix_cmd);
|
|
||||||
|
|
||||||
install_element(CONFIG_NODE, &ipv6_route_blackhole_cmd);
|
install_element(CONFIG_NODE, &ipv6_route_blackhole_cmd);
|
||||||
install_element(CONFIG_NODE, &ipv6_route_address_interface_cmd);
|
install_element(CONFIG_NODE, &ipv6_route_address_interface_cmd);
|
||||||
install_element(CONFIG_NODE, &ipv6_route_cmd);
|
install_element(CONFIG_NODE, &ipv6_route_cmd);
|
||||||
@ -2685,18 +2292,9 @@ void zebra_vty_init(void)
|
|||||||
install_element(CONFIG_NODE, &no_ip_nht_default_route_cmd);
|
install_element(CONFIG_NODE, &no_ip_nht_default_route_cmd);
|
||||||
install_element(CONFIG_NODE, &ipv6_nht_default_route_cmd);
|
install_element(CONFIG_NODE, &ipv6_nht_default_route_cmd);
|
||||||
install_element(CONFIG_NODE, &no_ipv6_nht_default_route_cmd);
|
install_element(CONFIG_NODE, &no_ipv6_nht_default_route_cmd);
|
||||||
install_element(VIEW_NODE, &show_ipv6_route_summary_cmd);
|
|
||||||
install_element(VIEW_NODE, &show_ipv6_route_summary_prefix_cmd);
|
|
||||||
install_element(VIEW_NODE, &show_ipv6_route_addr_cmd);
|
|
||||||
install_element(VIEW_NODE, &show_ipv6_route_prefix_cmd);
|
|
||||||
install_element(VIEW_NODE, &show_ipv6_mroute_cmd);
|
install_element(VIEW_NODE, &show_ipv6_mroute_cmd);
|
||||||
|
|
||||||
/* Commands for VRF */
|
/* Commands for VRF */
|
||||||
install_element(VIEW_NODE, &show_ipv6_route_vrf_all_summary_cmd);
|
|
||||||
install_element(VIEW_NODE, &show_ipv6_route_vrf_all_summary_prefix_cmd);
|
|
||||||
install_element(VIEW_NODE, &show_ipv6_route_vrf_all_addr_cmd);
|
|
||||||
install_element(VIEW_NODE, &show_ipv6_route_vrf_all_prefix_cmd);
|
|
||||||
|
|
||||||
install_element(VIEW_NODE, &show_ipv6_mroute_vrf_all_cmd);
|
install_element(VIEW_NODE, &show_ipv6_mroute_vrf_all_cmd);
|
||||||
|
|
||||||
install_element(VIEW_NODE, &show_evpn_vni_cmd);
|
install_element(VIEW_NODE, &show_evpn_vni_cmd);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user