diff options
author | Matteo Croce <mcroce@redhat.com> | 2019-06-18 16:49:34 +0200 |
---|---|---|
committer | Stephen Hemminger <stephen@networkplumber.org> | 2019-06-20 14:30:41 -0700 |
commit | d81d4ba15d74a51f23f61a2ddb792689e5db95f0 (patch) | |
tree | f2489587f13ca0328b386216218be211ad83f809 | |
parent | 903818fbf9c73dd71793e5829775d2ccc1775af5 (diff) | |
download | iproute2-d81d4ba15d74a51f23f61a2ddb792689e5db95f0.tar.gz |
ip vrf: use hook to change VRF in the child
On vrf exec, reset the VRF associations in the child process, via the
new hook added to cmd_exec(). In this way, the parent doesn't have to
reset the VRF associations before spawning other processes.
Signed-off-by: Matteo Croce <mcroce@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-rw-r--r-- | ip/ipvrf.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -441,6 +441,13 @@ out: return rc; } +static int do_switch(void *arg) +{ + char *vrf = arg; + + return vrf_switch(vrf); +} + static int ipvrf_exec(int argc, char **argv) { if (argc < 1) { @@ -452,10 +459,7 @@ static int ipvrf_exec(int argc, char **argv) return -1; } - if (vrf_switch(argv[0])) - return -1; - - return -cmd_exec(argv[1], argv + 1, !!batch_mode, NULL, NULL); + return -cmd_exec(argv[1], argv + 1, !!batch_mode, do_switch, argv[0]); } /* reset VRF association of current process to default VRF; |