diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-02-02 14:27:13 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-02-13 10:34:19 +0100 |
| commit | 7eeb079d84bc4abe9897be0047fc28a754e46ecd (patch) | |
| tree | 9b47ac7055ce0cb1e2d86c684a2a7a1cd20c0c4d /freebsd/sbin/route | |
| parent | freebsd-to-rtems.py: Fix revert includes (diff) | |
| download | rtems-libbsd-7eeb079d84bc4abe9897be0047fc28a754e46ecd.tar.bz2 | |
Update to FreeBSD 9.3
Diffstat (limited to 'freebsd/sbin/route')
| -rw-r--r-- | freebsd/sbin/route/keywords | 2 | ||||
| -rw-r--r-- | freebsd/sbin/route/route.c | 24 |
2 files changed, 24 insertions, 2 deletions
diff --git a/freebsd/sbin/route/keywords b/freebsd/sbin/route/keywords index adfba7cf..676f781d 100644 --- a/freebsd/sbin/route/keywords +++ b/freebsd/sbin/route/keywords @@ -1,6 +1,8 @@ # @(#)keywords 8.2 (Berkeley) 3/19/94 # $FreeBSD$ +4 +6 add atalk blackhole diff --git a/freebsd/sbin/route/route.c b/freebsd/sbin/route/route.c index 158445d8..05b4f5a3 100644 --- a/freebsd/sbin/route/route.c +++ b/freebsd/sbin/route/route.c @@ -177,7 +177,7 @@ usage(const char *cp) if (cp != NULL) warnx("bad keyword: %s", cp); (void) fprintf(stderr, - "usage: route [-dnqtv] command [[modifiers] args]\n"); + "usage: route [-46dnqtv] command [[modifiers] args]\n"); exit(EX_USAGE); /* NOTREACHED */ } @@ -263,8 +263,24 @@ main(int argc, char **argv) if (argc < 2) usage(NULL); - while ((ch = getopt(argc, argv, "nqdtv")) != -1) + while ((ch = getopt(argc, argv, "46nqdtv")) != -1) switch(ch) { + case '4': +#ifdef INET + c->af = AF_INET; + c->aflen = sizeof(struct sockaddr_in); +#else + errx(1, "IPv4 support is not compiled in"); +#endif + break; + case '6': +#ifdef INET6 + c->af = AF_INET6; + c->aflen = sizeof(struct sockaddr_in6); +#else + errx(1, "IPv6 support is not compiled in"); +#endif + break; case 'n': c->nflag = 1; break; @@ -485,10 +501,12 @@ flushroutes(struct rt_ctx *c, int argc, char *argv[]) if (**argv != '-') usage(*argv); switch (keyword(*argv + 1)) { + case K_4: case K_INET: c->af = AF_INET; break; #ifdef INET6 + case K_6: case K_INET6: c->af = AF_INET6; break; @@ -903,11 +921,13 @@ newroute(struct rt_ctx *c, int argc, char **argv) c->af = AF_LINK; c->aflen = sizeof(struct sockaddr_dl); break; + case K_4: case K_INET: c->af = AF_INET; c->aflen = sizeof(struct sockaddr_in); break; #ifdef INET6 + case K_6: case K_INET6: c->af = AF_INET6; c->aflen = sizeof(struct sockaddr_in6); |