X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fipcalc.c;h=bcd272b8544e848ce0d27c74662749982b8e21d8;hb=3603f79ce594a1043d1a7b2c0b45cf8c79d33f60;hp=f130f3b7c941785d279ec41418c4784d3fe99731;hpb=c11986d89eba564945b226660031e624bf897561;p=oweals%2Fbusybox.git diff --git a/networking/ipcalc.c b/networking/ipcalc.c index f130f3b7c..bcd272b85 100644 --- a/networking/ipcalc.c +++ b/networking/ipcalc.c @@ -5,8 +5,8 @@ * By Jordan Crouse * Stephan Linz * - * This is a complete reimplentation of the ipcalc program - * from Redhat. I didn't look at their source code, but there + * This is a complete reimplementation of the ipcalc program + * from Red Hat. I didn't look at their source code, but there * is no denying that this is a loving reimplementation */ @@ -22,100 +22,156 @@ #define IPCALC_MSG(CMD,ALTCMD) if (mode & SILENT) {ALTCMD;} else {CMD;} +#define CLASS_A_NETMASK ntohl(0xFF000000) +#define CLASS_B_NETMASK ntohl(0xFFFF0000) +#define CLASS_C_NETMASK ntohl(0xFFFFFF00) + static unsigned long get_netmask(unsigned long ipaddr) { - if (ipaddr & 0xC0) { - return 0x00FFFFFF; /* Class C */ - } - if (ipaddr & 0x10) { - return 0x0000FFFF; /* Class B */ + ipaddr = htonl(ipaddr); + + if ((ipaddr & 0xC0000000) == 0xC0000000) + return CLASS_C_NETMASK; + else if ((ipaddr & 0x80000000) == 0x80000000) + return CLASS_B_NETMASK; + else if ((ipaddr & 0x80000000) == 0) + return CLASS_A_NETMASK; + else + return 0; +} + +#ifdef CONFIG_FEATURE_IPCALC_FANCY +static int get_prefix(unsigned long netmask) +{ + unsigned long msk = 0x80000000; + int ret = 0; + + netmask = htonl(netmask); + while(msk) { + if (netmask & msk) + ret++; + msk >>= 1; } - return 0x000000FF; /* Class A */ + return ret; } +#endif #define NETMASK 0x01 #define BROADCAST 0x02 #define NETWORK 0x04 -#define HOSTNAME 0x08 -#define SILENT 0x80 +#define NETPREFIX 0x08 +#define HOSTNAME 0x10 +#define SILENT 0x20 + int ipcalc_main(int argc, char **argv) { - unsigned char mode = 0; + unsigned long mode; - unsigned long netmask = 0; - unsigned long broadcast = 0; - unsigned long network = 0; - unsigned long ipaddr = 0; + in_addr_t netmask; + in_addr_t broadcast; + in_addr_t network; + in_addr_t ipaddr; + struct in_addr a; - int opt = 0; +#ifdef CONFIG_FEATURE_IPCALC_FANCY + unsigned long netprefix = 0; + int have_netmask = 0; + char *ipstr, *prefixstr; +#endif - struct option long_options[] = { - {"netmask", no_argument, NULL, 'n'}, - {"broadcast", no_argument, NULL, 'b'}, - {"network", no_argument, NULL, 'w'}, + static const struct option long_options[] = { + {"netmask", no_argument, NULL, 'm'}, + {"broadcast", no_argument, NULL, 'b'}, + {"network", no_argument, NULL, 'n'}, #ifdef CONFIG_FEATURE_IPCALC_FANCY - {"hostname", no_argument, NULL, 'h'}, - {"silent", no_argument, NULL, 's'}, + {"prefix", no_argument, NULL, 'p'}, + {"hostname", no_argument, NULL, 'h'}, + {"silent", no_argument, NULL, 's'}, #endif {NULL, 0, NULL, 0} }; - - while ((opt = getopt_long(argc, argv, + bb_applet_long_options = long_options; + mode = bb_getopt_ulflags(argc, argv, #ifdef CONFIG_FEATURE_IPCALC_FANCY - "nbwhs", + "mbnphs" #else - "nbw", -#endif - long_options, NULL)) != EOF) { - if (opt == 'n') - mode |= NETMASK; - else if (opt == 'b') - mode |= BROADCAST; - else if (opt == 'w') - mode |= NETWORK; -#ifdef CONFIG_FEATURE_IPCALC_FANCY - else if (opt == 'h') - mode |= HOSTNAME; - else if (opt == 's') - mode |= SILENT; + "mbn" #endif - else { - show_usage(); - } - } - - if (mode & (BROADCAST | NETWORK)) { + ); + if (mode & (BROADCAST | NETWORK | NETPREFIX)) { if (argc - optind > 2) { - show_usage(); + bb_show_usage(); } } else { if (argc - optind != 1) { - show_usage(); + bb_show_usage(); } } - ipaddr = inet_addr(argv[optind]); - - if (ipaddr == INADDR_NONE) { - IPCALC_MSG(error_msg_and_die("bad IP address: %s\n", argv[optind]), - exit(EXIT_FAILURE)); +#ifdef CONFIG_FEATURE_IPCALC_FANCY + prefixstr = ipstr = argv[optind]; + + while(*prefixstr) { + if (*prefixstr == '/') { + *prefixstr = (char)0; + prefixstr++; + if (*prefixstr) { + unsigned int msk; + + if (safe_strtoul(prefixstr, &netprefix) || netprefix > 32) { + IPCALC_MSG(bb_error_msg_and_die("bad IP prefix: %s\n", prefixstr), + exit(EXIT_FAILURE)); + } + netmask = 0; + msk = 0x80000000; + while (netprefix > 0) { + netmask |= msk; + msk >>= 1; + netprefix--; + } + netmask = htonl(netmask); + /* Even if it was 0, we will signify that we have a netmask. This allows */ + /* for specification of default routes, etc which have a 0 netmask/prefix */ + have_netmask = 1; + } + break; + } + prefixstr++; } + ipaddr = inet_aton(ipstr, &a); +#else + ipaddr = inet_aton(argv[optind], &a); +#endif + if (ipaddr == 0) { + IPCALC_MSG(bb_error_msg_and_die("bad IP address: %s", argv[optind]), + exit(EXIT_FAILURE)); + } + ipaddr = a.s_addr; if (argc - optind == 2) { - netmask = inet_addr(argv[optind + 1]); - } +#ifdef CONFIG_FEATURE_IPCALC_FANCY + if (have_netmask) { + IPCALC_MSG(bb_error_msg_and_die("Both prefix and netmask were specified, use one or the other.\n"), + exit(EXIT_FAILURE)); + } - if (ipaddr == INADDR_NONE) { - IPCALC_MSG(error_msg_and_die("bad netmask: %s\n", argv[optind + 1]), - exit(EXIT_FAILURE)); - } +#endif + netmask = inet_aton(argv[optind + 1], &a); + if (netmask == 0) { + IPCALC_MSG(bb_error_msg_and_die("bad netmask: %s", argv[optind + 1]), + exit(EXIT_FAILURE)); + } + netmask = a.s_addr; + } else { +#ifdef CONFIG_FEATURE_IPCALC_FANCY - /* JHC - If the netmask wasn't provided then calculate it */ - if (!netmask) { - netmask = get_netmask(ipaddr); + if (!have_netmask) +#endif + /* JHC - If the netmask wasn't provided then calculate it */ + netmask = get_netmask(ipaddr); } if (mode & NETMASK) { @@ -131,16 +187,20 @@ int ipcalc_main(int argc, char **argv) network = ipaddr & netmask; printf("NETWORK=%s\n", inet_ntoa((*(struct in_addr *) &network))); } + #ifdef CONFIG_FEATURE_IPCALC_FANCY + if (mode & NETPREFIX) { + printf("PREFIX=%i\n", get_prefix(netmask)); + } + if (mode & HOSTNAME) { struct hostent *hostinfo; int x; hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET); if (!hostinfo) { - IPCALC_MSG(error_msg("cannot find hostname for %s", argv[optind]); - herror(NULL); - putc('\n', stderr);,); + IPCALC_MSG(bb_herror_msg_and_die( + "cannot find hostname for %s", argv[optind]),); exit(EXIT_FAILURE); } for (x = 0; hostinfo->h_name[x]; x++) {