proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2026-01-07 04:54:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ip route: Add support for vrf keyword

Browse Source 
Add vrf keyword to 'ip route' commands. Allows:
1. Users can list routes by VRF name:
       $ ip route show vrf NAME

   VRF tables have all routes including local and broadcast routes.
   The VRF keyword filters LOCAL and BROADCAST routes; to see all
   routes the table option can be used. Or to see local routes only
   for a VRF:
       $ ip route show vrf NAME type local

2. Add or delete a route for a VRF:
       $ ip route {add|delete} vrf NAME <route spec>

3. Do a route lookup for a VRF:
       $ ip route get vrf NAME ADDRESS

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
This commit is contained in:
David Ahern 2016-06-29 11:27:02 -07:00 committed by Stephen Hemminger
parent 9b76577042
commit 0130f0120b
2 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ip/iproute.c
View File

@ -67,10 +67,10 @@ static void usage(void)
fprintf(stderr, " ip route showdump\n");
fprintf(stderr, " ip route get ADDRESS [ from ADDRESS iif STRING ]\n");
fprintf(stderr, " [ oif STRING ] [ tos TOS ]\n");
fprintf(stderr, " [ mark NUMBER ]\n");
fprintf(stderr, " [ mark NUMBER ] [ vrf NAME ]\n");
fprintf(stderr, " ip route { add | del | change | append | replace } ROUTE\n");
fprintf(stderr, "SELECTOR := [ root PREFIX ] [ match PREFIX ] [ exact PREFIX ]\n");
fprintf(stderr, " [ table TABLE_ID ] [ proto RTPROTO ]\n");
fprintf(stderr, " [ table TABLE_ID ] [ vrf NAME ] [ proto RTPROTO ]\n");
fprintf(stderr, " [ type TYPE ] [ scope SCOPE ]\n");
fprintf(stderr, "ROUTE := NODE_SPEC [ INFO_SPEC ]\n");
fprintf(stderr, "NODE_SPEC := [ TYPE ] PREFIX [ tos TOS ]\n");
@ -1138,6 +1138,20 @@ static int iproute_modify(int cmd, unsigned int flags, int argc, char **argv)
addattr32(&req.n, sizeof(req), RTA_TABLE, tid);
}
table_ok = 1;
} else if (matches(*argv, "vrf") == 0) {
__u32 tid;
NEXT_ARG();
tid = ipvrf_get_table(*argv);
if (tid == 0)
invarg("Invalid VRF\n", *argv);
if (tid < 256)
req.r.rtm_table = tid;
else {
req.r.rtm_table = RT_TABLE_UNSPEC;
addattr32(&req.n, sizeof(req), RTA_TABLE, tid);
}
table_ok = 1;
} else if (strcmp(*argv, "dev") == 0 ||
strcmp(*argv, "oif") == 0) {
NEXT_ARG();
@ -1392,6 +1406,15 @@ static int iproute_list_flush_or_save(int argc, char **argv, int action)
}
} else
filter.tb = tid;
} else if (matches(*argv, "vrf") == 0) {
__u32 tid;
NEXT_ARG();
tid = ipvrf_get_table(*argv);
if (tid == 0)
invarg("Invalid VRF\n", *argv);
filter.tb = tid;
filter.typemask = ~(1 << RTN_LOCAL | 1<<RTN_BROADCAST);
} else if (matches(*argv, "cached") == 0 ||
matches(*argv, "cloned") == 0) {
filter.cloned = 1;
@ -1678,6 +1701,11 @@ static int iproute_get(int argc, char **argv)
req.r.rtm_flags |= RTM_F_NOTIFY;
} else if (matches(*argv, "connected") == 0) {
connected = 1;
} else if (matches(*argv, "vrf") == 0) {
NEXT_ARG();
if (!name_is_vrf(*argv))
invarg("Invalid VRF\n", *argv);
odev = *argv;
} else {
inet_prefix addr;

19
man/man8/ip-route.8.in
View File

@ -33,7 +33,9 @@ ip-route \- routing table management
.RB " ] [ " oif
.IR STRING " ] [ "
.B tos
.IR TOS " ]"
.IR TOS " ] [ "
.B vrf
.IR NAME " ] "
.ti -8
.BR "ip route" " { " add " | " del " | " change " | " append " | "\
@ -50,6 +52,8 @@ replace " } "
.IR PREFIX " ] [ "
.B table
.IR TABLE_ID " ] [ "
.B vrf
.IR NAME " ] [ "
.B proto
.IR RTPROTO " ] [ "
.B type
@ -368,6 +372,11 @@ routes, which are put into the
.B local
table by default.
.TP
.BI vrf " NAME"
the vrf name to add this route to. Implicitly means the table
associated with the VRF.
.TP
.BI dev " NAME"
the output device name.
@ -745,6 +754,10 @@ may either be the ID of a real table or one of the special values:
- dump the routing cache.
.in -8
.TP
.BI vrf " NAME"
show the routes for the table associated with the vrf name
.TP
.B cloned
.TP
@ -854,6 +867,10 @@ the device from which this packet is expected to arrive.
.BI oif " NAME"
force the output device on which this packet will be routed.
.TP
.BI vrf " NAME"
force the vrf device on which this packet will be routed.
.TP
.B connected
if no source address