From: David van Moolenbroek Date: Tue, 14 Feb 2017 17:17:29 +0000 (+0000) Subject: Retire MINIX add_route(8) X-Git-Url: http://zhaoyanbai.com/repos/html/static/gitweb.js?a=commitdiff_plain;h=73ee574be373307e51088470f4985869e25c3b7f;p=minix.git Retire MINIX add_route(8) Change-Id: I900a3c6ac8e8fac15f5f84960bb89f92aeb90863 --- diff --git a/distrib/sets/lists/minix-base/mi b/distrib/sets/lists/minix-base/mi index 9c618f631..3ca481413 100644 --- a/distrib/sets/lists/minix-base/mi +++ b/distrib/sets/lists/minix-base/mi @@ -268,7 +268,7 @@ ./usr/bin minix-base ./usr/bin/DESCRIBE minix-base ./usr/bin/MAKEDEV minix-base -./usr/bin/add_route minix-base +./usr/bin/add_route minix-base obsolete ./usr/bin/apropos minix-base ./usr/bin/arp minix-base ./usr/bin/asa minix-base @@ -323,7 +323,7 @@ ./usr/bin/datasizes minix-base obsolete ./usr/bin/dd minix-base obsolete ./usr/bin/decomp16 minix-base obsolete -./usr/bin/del_route minix-base +./usr/bin/del_route minix-base obsolete ./usr/bin/deroff minix-base ./usr/bin/devmand minix-base ./usr/bin/devsize minix-base diff --git a/distrib/sets/lists/minix-debug/mi b/distrib/sets/lists/minix-debug/mi index 6882a5fca..da130e996 100644 --- a/distrib/sets/lists/minix-debug/mi +++ b/distrib/sets/lists/minix-debug/mi @@ -208,7 +208,7 @@ ./usr/libdata/debug/service/vnd.debug minix-debug debug ./usr/libdata/debug/usr minix-debug ./usr/libdata/debug/usr/bin minix-debug -./usr/libdata/debug/usr/bin/add_route.debug minix-debug debug +./usr/libdata/debug/usr/bin/add_route.debug minix-debug debug,obsolete ./usr/libdata/debug/usr/bin/addr2line.debug minix-debug debug ./usr/libdata/debug/usr/bin/apropos.debug minix-debug debug ./usr/libdata/debug/usr/bin/ar.debug minix-debug debug diff --git a/distrib/sets/lists/minix-man/mi b/distrib/sets/lists/minix-man/mi index 943654a11..abd958732 100644 --- a/distrib/sets/lists/minix-man/mi +++ b/distrib/sets/lists/minix-man/mi @@ -3365,7 +3365,7 @@ ./usr/man/man7/re_format.7 minix-man ./usr/man/man8 minix-man ./usr/man/man8/MAKEDEV.8 minix-man -./usr/man/man8/add_route.8 minix-man +./usr/man/man8/add_route.8 minix-man obsolete ./usr/man/man8/adduser.8 minix-man ./usr/man/man8/atnormalize.8 minix-man ./usr/man/man8/autopart.8 minix-man diff --git a/minix/commands/Makefile b/minix/commands/Makefile index 115811adb..c7b023871 100644 --- a/minix/commands/Makefile +++ b/minix/commands/Makefile @@ -2,7 +2,7 @@ .include -SUBDIR= add_route arp at backup \ +SUBDIR= arp at backup \ cawf cdprobe \ cleantmp \ compress crc cron crontab \ diff --git a/minix/commands/add_route/Makefile b/minix/commands/add_route/Makefile deleted file mode 100644 index e1e0d742f..000000000 --- a/minix/commands/add_route/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -PROG= add_route -MAN= add_route.8 - -LINKS+= ${BINDIR}/add_route ${BINDIR}/del_route - -.include diff --git a/minix/commands/add_route/add_route.8 b/minix/commands/add_route/add_route.8 deleted file mode 100644 index 1debdc6d6..000000000 --- a/minix/commands/add_route/add_route.8 +++ /dev/null @@ -1,78 +0,0 @@ -.TH ADD_ROUTE 8 -.SH NAME -add_route, del_route \- configure IP routing. -.SH SYNOPSIS -.B add_route -.RB \-g -.RI gateway -.RB [ \-d -.RI destination -.RB [ \-n -.RI netmask " ]]" -.RB [ \-I -.RI "ip device]" -.B del_route -.RB [ \-o "]" -.RB [ \-D "]" -.RB \-g -.RI gateway -.RB [ \-d -.RI destination "]" -.RB [ \-n -.RI netmask " ]]" -.RB [ \-I -.RI ipdev "]" -.RB [ \-v "]" - -.B del_route -.RB \-i -.RB [ \-D "]" -.RB \-g -.RI gateway -.RB \-d -.RI dst -.RB [ \-n -.RI netmask "]" -.RB [ \-I -.RI ipdev "]" -.RB [ \-v "]" - - -.SH DESCRIPTION -.de SP -.if t .sp 0.4 -.if n .sp -.. -.B Add_route -and -.B del_route -are used for manual maintenance of routes in the IP routing table. - -.SH OPTIONS -.TP -.B \-g -.I gateway -specifies the gateway IP address to use. -.TP -.B \-d -.I destination -specifies the destination(s) reached via this gateway. -.TP -.B \-n -.I netmask -specifies a netmask when the destination is a net. -.TP -.B \-I -.I "ip device" -specifies the ip device. -.SH "SEE ALSO" -.BR irdp (8), -.BR pr_routes (8). -.SH AUTHOR -.I Add_route.c -was created August 7, 1991 by Philip Homburg. -This manual page by A. S. Woodhull, last revised 13.02.96. Added -alias for del_route 17.11.05. - - - diff --git a/minix/commands/add_route/add_route.c b/minix/commands/add_route/add_route.c deleted file mode 100644 index c914fcae9..000000000 --- a/minix/commands/add_route/add_route.c +++ /dev/null @@ -1,352 +0,0 @@ -/* -add_route.c - -Created August 7, 1991 by Philip Homburg -*/ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static char *prog_name; -static enum { ADD, DEL } action; - -static void usage(void); -static int name_to_ip(const char *name, ipaddr_t *addr); -static int parse_cidr(const char *cidr, ipaddr_t *addr, ipaddr_t *mask); - -int main(int argc, char *argv[]) -{ - struct netent *netent; - ipaddr_t gateway, destination, netmask, defaultmask=0; - u8_t high_byte; - nwio_route_t route; - int ip_fd, itab; - int r; - int metric; - char *check; - char *ip_device; - char *netmask_str, *metric_str, *destination_str, *gateway_str; - int c; - char *d_arg, *g_arg, *m_arg, *n_arg, *I_arg; - int i_flag, o_flag, D_flag, v_flag; - int cidr; - - prog_name= strrchr(argv[0], '/'); - if (prog_name == NULL) prog_name= argv[0]; else prog_name++; - - if (strcmp(prog_name, "add_route") == 0) - action= ADD; - else if (strcmp(prog_name, "del_route") == 0) - action= DEL; - else - { - fprintf(stderr, "Don't know what to do when named '%s'\n", - prog_name); - exit(1); - } - - i_flag= 0; - o_flag= 0; - D_flag= 0; - v_flag= 0; - g_arg= NULL; - d_arg= NULL; - m_arg= NULL; - n_arg= NULL; - I_arg= NULL; - while ((c= getopt(argc, argv, "iovDg:d:m:n:I:?")) != -1) - { - switch(c) - { - case 'i': - if (i_flag) - usage(); - i_flag= 1; - break; - case 'o': - if (o_flag) - usage(); - o_flag= 1; - break; - case 'v': - if (v_flag) - usage(); - v_flag= 1; - break; - case 'D': - if (D_flag) - usage(); - D_flag= 1; - break; - case 'g': - if (g_arg) - usage(); - g_arg= optarg; - break; - case 'd': - if (d_arg) - usage(); - d_arg= optarg; - break; - case 'm': - if (m_arg) - usage(); - m_arg= optarg; - break; - case 'n': - if (n_arg) - usage(); - n_arg= optarg; - break; - case 'I': - if (I_arg) - usage(); - I_arg= optarg; - break; - case '?': - usage(); - default: - fprintf(stderr, "%s: getopt failed\n", prog_name); - exit(1); - } - } - if (optind != argc) - usage(); - if (i_flag && o_flag) - usage(); - itab= i_flag; - - if (i_flag) - { - if (g_arg == NULL || d_arg == NULL || m_arg == NULL) - usage(); - } - else - { - if (g_arg == NULL || (d_arg == NULL && n_arg != NULL)) - { - usage(); - } - } - - gateway_str= g_arg; - destination_str= d_arg; - metric_str= m_arg; - netmask_str= n_arg; - ip_device= I_arg; - - if (!name_to_ip(gateway_str, &gateway)) - { - fprintf(stderr, "%s: unknown host '%s'\n", prog_name, - gateway_str); - exit(1); - } - - destination= 0; - netmask= 0; - cidr= 0; - - if (destination_str) - { - if (parse_cidr(destination_str, &destination, &netmask)) - cidr= 1; - else if (inet_aton(destination_str, - (struct in_addr *)&destination)) - ; - else if ((netent= getnetbyname(destination_str)) != NULL) - destination= netent->n_net; - else if (!name_to_ip(destination_str, &destination)) - { - fprintf(stderr, "%s: unknown network/host '%s'\n", - prog_name, destination_str); - exit(1); - } - high_byte= *(u8_t *)&destination; - if (!(high_byte & 0x80)) /* class A or 0 */ - { - if (destination) - defaultmask= htonl(0xff000000); - - } - else if (!(high_byte & 0x40)) /* class B */ - { - defaultmask= htonl(0xffff0000); - - } - else if (!(high_byte & 0x20)) /* class C */ - { - defaultmask= htonl(0xffffff00); - } - else /* class D is multicast ... */ - { - fprintf(stderr, "%s: Warning: Martian address '%s'\n", - prog_name, - inet_ntoa(*(struct in_addr *)&destination)); - defaultmask= htonl(0xffffffff); - } - if (destination & ~defaultmask) - { - /* host route */ - defaultmask= htonl(0xffffffff); - } - if (!cidr) - netmask= defaultmask; - } - - if (netmask_str) - { - if (cidr) - usage(); - if (inet_aton(netmask_str, (struct in_addr *)&netmask) == 0) - { - fprintf(stderr, "%s: illegal netmask'%s'\n", prog_name, - netmask_str); - exit(1); - } - } - - if (metric_str) - { - metric= strtol(metric_str, &check, 0); - if (check[0] != '\0' || metric < 1) - { - fprintf(stderr, "%s: illegal metric %s\n", - prog_name, metric_str); - } - } - else - metric= 1; - - if (!ip_device) - ip_device= getenv("IP_DEVICE"); - if (!ip_device) - ip_device= IP_DEVICE; - - ip_fd= open(ip_device, O_RDWR); - if (ip_fd == -1) - { - fprintf(stderr, "%s: unable to open('%s'): %s\n", - prog_name, ip_device, strerror(errno)); - exit(1); - } - - if (v_flag) - { - printf("%s %s route to %s ", - action == ADD ? "adding" : "deleting", - itab ? "input" : "output", - inet_ntoa(*(struct in_addr *)&destination)); - printf("with netmask %s ", - inet_ntoa(*(struct in_addr *)&netmask)); - printf("using gateway %s", - inet_ntoa(*(struct in_addr *)&gateway)); - if (itab && action == ADD) - printf(" at distance %d", metric); - printf("\n"); - } - - route.nwr_ent_no= 0; - route.nwr_dest= destination; - route.nwr_netmask= netmask; - route.nwr_gateway= gateway; - route.nwr_dist= action == ADD ? metric : 0; - route.nwr_flags= (action == DEL && D_flag) ? 0 : NWRF_STATIC; - route.nwr_pref= 0; - route.nwr_mtu= 0; - - if (action == ADD) - r= ioctl(ip_fd, itab ? NWIOSIPIROUTE : NWIOSIPOROUTE, &route); - else - r= ioctl(ip_fd, itab ? NWIODIPIROUTE : NWIODIPOROUTE, &route); - if (r == -1) - { - fprintf(stderr, "%s: NWIO%cIP%cROUTE: %s\n", - prog_name, - action == ADD ? 'S' : 'D', - itab ? 'I' : 'O', - strerror(errno)); - exit(1); - } - return(0); -} - -static void usage(void) -{ - fprintf(stderr, - "Usage: %s\n" - "\t[-o] %s-g gw [-d dst [-n netmask]] %s[-I ipdev] [-v]\n" - "\t-i %s-g gw -d dst [-n netmask] %s[-I ipdev] [-v]\n" - "Note: may be in CIDR notation\n", - prog_name, - action == DEL ? "[-D] " : "", - action == ADD ? "[-m metric] " : "", - action == DEL ? "[-D] " : "", - action == ADD ? "-m metric " : "" - ); - exit(1); -} - -static int name_to_ip(const char *name, ipaddr_t *addr) -{ - /* Translate a name to an IP address. Try first with inet_aton(), then - * with gethostbyname(). (The latter can also recognize an IP address, - * but only decimals with at least one dot).) - */ - struct hostent *hostent; - - if (!inet_aton(name, (struct in_addr *)addr)) { - if ((hostent= gethostbyname(name)) == NULL) return 0; - if (hostent->h_addrtype != AF_INET) return 0; - if (hostent->h_length != sizeof(*addr)) return 0; - memcpy(addr, hostent->h_addr, sizeof(*addr)); - } - return 1; -} - -static int parse_cidr(const char *cidr, ipaddr_t *addr, ipaddr_t *mask) -{ - char *slash, *check; - ipaddr_t a; - int ok; - unsigned long len; - - if ((slash= strchr(cidr, '/')) == NULL) - return 0; - - *slash++= 0; - ok= 1; - - if (!inet_aton(cidr, (struct in_addr *)&a)) - ok= 0; - - len= strtoul(slash, &check, 10); - if (check == slash || *check != 0 || len > 32) - ok= 0; - - *--slash= '/'; - if (!ok) - return 0; - *addr= a; - *mask= htonl(len == 0 ? 0 : (0xFFFFFFFF << (32-len)) & 0xFFFFFFFF); - return 1; -} - -/* - * $PchId: add_route.c,v 1.6 2001/04/20 10:45:07 philip Exp $ - */