toolbox: route: Reflow some of the mess, fix route add parameter names to (83ec181d) · Commits · e / os / android_system_core

toolbox/route.c

+62 −58

Original line number	Diff line number	Diff line
		@@ -54,7 +54,8 @@ int route_main(int argc, char *argv[])
		struct rtentry rt;
		struct sockaddr_in ina;

		if(argc == 0) return 0;
		if (!argc)
		return 0;

		strncpy(ifr.ifr_name, argv[0], IFNAMSIZ);
		ifr.ifr_name[IFNAMSIZ-1] = 0;
		@@ -75,7 +76,8 @@ int route_main(int argc, char *argv[])
		EXPECT_NEXT(argc, argv);
		rt.rt_flags = RTF_UP \| RTF_HOST;
		rt.rt_dev = argv[0];
		if (ioctl(s, SIOCADDRT, &rt) < 0) die("SIOCADDRT\n");
		if (ioctl(s, SIOCADDRT, &rt) < 0)
		die("SIOCADDRT\n");
		} else if (!strcmp(argv[0], "gw")) {
		EXPECT_NEXT(argc, argv);
		rt.rt_flags = RTF_UP \| RTF_GATEWAY;
		@@ -95,7 +97,7 @@ int route_main(int argc, char *argv[])
		}
		}
		} else {
		char keywords[3][5] = { "net", "mask", "gw" };
		char keywords[3][10] = { "-net", "netmask", "gw" };
		struct sockaddr_in *paddr[3] = { &rt.rt_dst, &rt.rt_genmask, &rt.rt_gateway };
		int k = 0;

		@@ -109,11 +111,13 @@ int route_main(int argc, char *argv[])
		} else {
		die("expecting an IP/MASK address for parameter %s\n", keywords[k]);
		}
		if(k < 2) EXPECT_NEXT(argc, argv);
		if (k < 2)
		EXPECT_NEXT(argc, argv);
		} else {
		die("expecting keyword(s)\n");
		}
		} while (++k < 3);

		if (ioctl(s, SIOCADDRT, &rt) < 0) {
		die("SIOCADDRT\n");
		}