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>

diff --git a/ip/ipvrf.c b/ip/ipvrf.c
index aebcb2532addf92804de59592c47231aa4966bc7..f589f7f8f46871e696c38c4ccebfb24b3a333947 100644 (file)
--- a/ip/ipvrf.c
+++ b/ip/ipvrf.c
@@ -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;