X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fipcalc.c;h=aafb7869b6897faee9dc2261b7dc6794265340cb;hb=e40c04b82695c1cde8ad9ed1e2aa1756463d73a7;hp=2f1c02b7b63f4905b59fb4ab69054aa0158db639;hpb=14092a1ed2369eead23fa9d642fd126b19564a27;p=oweals%2Fbusybox.git diff --git a/networking/ipcalc.c b/networking/ipcalc.c index 2f1c02b7b..aafb7869b 100644 --- a/networking/ipcalc.c +++ b/networking/ipcalc.c @@ -1,25 +1,23 @@ -/* vi: set sw=4 ts=4 ai: */ +/* vi: set sw=4 ts=4: */ /* * Mini ipcalc implementation for busybox * * 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 + * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include -#include +#include "busybox.h" #include #include #include -#include #include -#include "busybox.h" - #define IPCALC_MSG(CMD,ALTCMD) if (mode & SILENT) {ALTCMD;} else {CMD;} #define CLASS_A_NETMASK ntohl(0xFF000000) @@ -44,16 +42,18 @@ static unsigned long get_netmask(unsigned long ipaddr) static int get_prefix(unsigned long netmask) { unsigned long msk = 0x80000000; - int ret = 0; + int ret = 0; netmask = htonl(netmask); while(msk) { if (netmask & msk) ret++; msk >>= 1; - } - return ret; + } + return ret; } +#else +int get_prefix(unsigned long netmask); #endif #define NETMASK 0x01 @@ -63,115 +63,107 @@ static int get_prefix(unsigned long netmask) #define HOSTNAME 0x10 #define SILENT 0x20 +#if ENABLE_FEATURE_IPCALC_LONG_OPTIONS + 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 + {"prefix", no_argument, NULL, 'p'}, + {"hostname", no_argument, NULL, 'h'}, + {"silent", no_argument, NULL, 's'}, +#endif + {NULL, 0, NULL, 0} + }; +#else +#define long_options 0 +#endif + + int ipcalc_main(int argc, char **argv) { unsigned long mode; - - unsigned long netmask; - unsigned long broadcast; - unsigned long network; - unsigned long ipaddr; + int have_netmask = 0; + in_addr_t netmask, broadcast, network, ipaddr; struct in_addr a; + char *ipstr; -#ifdef CONFIG_FEATURE_IPCALC_FANCY - unsigned long netprefix = 0; - int have_netmask = 0; - char *ipstr, *prefixstr; -#endif + if (ENABLE_FEATURE_IPCALC_LONG_OPTIONS) + bb_applet_long_options = long_options; - 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 - {"prefix", no_argument, NULL, 'p'}, - {"hostname", no_argument, NULL, 'h'}, - {"silent", no_argument, NULL, 's'}, -#endif - {NULL, 0, NULL, 0} - }; + mode = bb_getopt_ulflags(argc, argv, "mbn" USE_FEATURE_IPCALC_FANCY("phs")); - bb_applet_long_options = long_options; - mode = bb_getopt_ulflags(argc, argv, -#ifdef CONFIG_FEATURE_IPCALC_FANCY - "mbnphs"); -#else - "mbn"); -#endif + argc -= optind; + argv += optind; if (mode & (BROADCAST | NETWORK | NETPREFIX)) { - if (argc - optind > 2) { + if (argc > 2 || argc <= 0) bb_show_usage(); - } } else { - if (argc - optind != 1) { + if (argc != 1) bb_show_usage(); - } } -#ifdef CONFIG_FEATURE_IPCALC_FANCY - prefixstr = ipstr = argv[optind]; - - while(*prefixstr) { - if (*prefixstr == '/') { - *prefixstr = (char)0; - prefixstr++; - if (*prefixstr) { - unsigned int msk; - - netprefix = atol(prefixstr); - if (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++; - } + ipstr = argv[0]; + if (ENABLE_FEATURE_IPCALC_FANCY) { + unsigned long netprefix = 0; + char *prefixstr; + + prefixstr = ipstr; + + 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", 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)); + IPCALC_MSG(bb_error_msg_and_die("bad IP address: %s", argv[0]), + exit(EXIT_FAILURE)); } ipaddr = a.s_addr; - if (argc - optind == 2) { -#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 (argc == 2) { + if (ENABLE_FEATURE_IPCALC_FANCY && have_netmask) { + IPCALC_MSG(bb_error_msg_and_die("Use prefix or netmask, not both"), + exit(EXIT_FAILURE)); + } -#endif - netmask = inet_aton(argv[optind + 1], &a); + netmask = inet_aton(argv[1], &a); if (netmask == 0) { - IPCALC_MSG(bb_error_msg_and_die("bad netmask: %s", argv[optind + 1]), - exit(EXIT_FAILURE)); - } + IPCALC_MSG(bb_error_msg_and_die("bad netmask: %s", argv[1]), + exit(EXIT_FAILURE)); + } netmask = a.s_addr; } else { -#ifdef CONFIG_FEATURE_IPCALC_FANCY - if (!have_netmask) -#endif - /* JHC - If the netmask wasn't provided then calculate it */ - netmask = get_netmask(ipaddr); + /* JHC - If the netmask wasn't provided then calculate it */ + if (!ENABLE_FEATURE_IPCALC_FANCY || !have_netmask) + netmask = get_netmask(ipaddr); } if (mode & NETMASK) { @@ -188,37 +180,28 @@ int ipcalc_main(int argc, char **argv) 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(bb_herror_msg_and_die( - "cannot find hostname for %s", argv[optind]),); - exit(EXIT_FAILURE); - } - for (x = 0; hostinfo->h_name[x]; x++) { - hostinfo->h_name[x] = tolower(hostinfo->h_name[x]); + if (ENABLE_FEATURE_IPCALC_FANCY) { + if (mode & NETPREFIX) { + printf("PREFIX=%i\n", get_prefix(netmask)); } - printf("HOSTNAME=%s\n", hostinfo->h_name); + if (mode & HOSTNAME) { + struct hostent *hostinfo; + int x; + + hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET); + if (!hostinfo) { + IPCALC_MSG(bb_herror_msg_and_die( + "cannot find hostname for %s", argv[0]),); + exit(EXIT_FAILURE); + } + for (x = 0; hostinfo->h_name[x]; x++) { + hostinfo->h_name[x] = tolower(hostinfo->h_name[x]); + } + + printf("HOSTNAME=%s\n", hostinfo->h_name); + } } -#endif return EXIT_SUCCESS; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/