[PATCH] iproute: Ignore all output fields of ip route get for route add

[Andi Kleen <andi@firstfloor.org>]

My vpnc-connect script broke in a kernel release because the new
kernel started returning the ipid in ip cache get. The script
would do ip route get, modify the route and then feed it back
to ip route add. But ip route add couldn't parse ipid ..

Make route add skip all status fields output by ip cache get

In theory they could be fed to the kernel too, but that's likely
not very useful (and I'm not fully sure if the kernel would
even use them)

Signed-off-by: Andi Kleen <ak@linux.intel.com>

diff --git a/ip/iproute.c b/ip/iproute.c
index 2fef35b..8b7421e 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -936,6 +936,17 @@ int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
 			   strcmp(*argv, "oif") == 0) {
 			NEXT_ARG();
 			d = *argv;
+		/* Ignore everything else printed by ip route get. */
+		} else if (strcmp(*argv, "ipid") == 0 ||
+			   strcmp(*argv, "ts") == 0 ||
+			   strcmp(*argv, "tsage") == 0 ||
+			   strcmp(*argv, "age") == 0 ||
+			   strcmp(*argv, "used") == 0 ||
+			   strcmp(*argv, "users") == 0 ||
+			   strcmp(*argv, "error") == 0 ||
+			   strcmp(*argv, "cache") == 0 ||
+			   strcmp(*argv, "expires") == 0) {
+			NEXT_ARG();
 		} else {
 			int type;
 			inet_prefix dst;
-- 
ak@linux.intel.com -- Speaking for myself only.