busybox/networking/ipcalc.c
Denys Vlasenko 036585a911 getopt32: remove applet_long_options
FEATURE_GETOPT_LONG made dependent on LONG_OPTS.

The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS	FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS	FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS		FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS	FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS	FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS	FEATURE_RUNCON_LONG_OPTIONS

They either had a small number of long options, or their long options are
essential.

Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.

To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
	#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
                /* We try to use --gid, not -g, because "standard" addgroup
                 * has no short option -g, it has only long --gid.
                 */
                argv[1] = (char*)"--gid";
	#else
                /* Breaks if system in fact does NOT use busybox addgroup */
                argv[1] = (char*)"-g";
	#endif

xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.

hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime

Shorten help texts by omitting long option when short opt alternative exists.

Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.

function                                             old     new   delta
getopt32                                            1350      22   -1328
vgetopt32                                              -    1318   +1318
getopt32long                                           -      24     +24
tftpd_main                                           562     567      +5
scan_recursive                                       376     380      +4
collect_cpu                                          545     546      +1
date_main                                           1096    1095      -1
hostname_main                                        262     259      -3
uname_main                                           259     255      -4
setpriv_main                                         362     358      -4
rmdir_main                                           191     187      -4
mv_main                                              562     558      -4
ipcalc_main                                          548     544      -4
ifenslave_main                                       641     637      -4
gzip_main                                            192     188      -4
gunzip_main                                           77      73      -4
fsfreeze_main                                         81      77      -4
flock_main                                           318     314      -4
deluser_main                                         337     333      -4
cp_main                                              374     370      -4
chown_main                                           175     171      -4
applet_long_options                                    4       -      -4
xargs_main                                           894     889      -5
wget_main                                           2540    2535      -5
udhcpc_main                                         2767    2762      -5
touch_main                                           436     431      -5
tar_main                                            1014    1009      -5
start_stop_daemon_main                              1033    1028      -5
sed_main                                             682     677      -5
script_main                                         1082    1077      -5
run_parts_main                                       330     325      -5
rtcwake_main                                         459     454      -5
od_main                                             2169    2164      -5
nl_main                                              201     196      -5
modprobe_main                                        773     768      -5
mkdir_main                                           160     155      -5
ls_main                                              568     563      -5
install_main                                         773     768      -5
hwclock_main                                         411     406      -5
getopt_main                                          622     617      -5
fstrim_main                                          256     251      -5
env_main                                             198     193      -5
dumpleases_main                                      635     630      -5
dpkg_main                                           3991    3986      -5
diff_main                                           1355    1350      -5
cryptpw_main                                         233     228      -5
cpio_main                                            593     588      -5
conspy_main                                         1135    1130      -5
chpasswd_main                                        313     308      -5
adduser_main                                         887     882      -5
addgroup_main                                        416     411      -5
ftpgetput_main                                       351     345      -6
get_terminal_width_height                            242     234      -8
expand_main                                          690     680     -10
static.expand_longopts                                18       -     -18
static.unexpand_longopts                              27       -     -27
mkdir_longopts                                        28       -     -28
env_longopts                                          30       -     -30
static.ifenslave_longopts                             34       -     -34
mv_longopts                                           46       -     -46
static.rmdir_longopts                                 48       -     -48
packed_usage                                       31739   31687     -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840)      Total: -488 bytes
   text	   data	    bss	    dec	    hex	filename
 915681	    485	   6880	 923046	  e15a6	busybox_old
 915428	    485	   6876	 922789	  e14a5	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 17:09:40 +02:00

228 lines
6.1 KiB
C
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

/* vi: set sw=4 ts=4: */
/*
* Mini ipcalc implementation for busybox
*
* By Jordan Crouse <jordan@cosmicpenguin.net>
* Stephan Linz <linz@li-pro.net>
*
* 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 source tree.
*/
//config:config IPCALC
//config: bool "ipcalc (4.3 kb)"
//config: default y
//config: help
//config: ipcalc takes an IP address and netmask and calculates the
//config: resulting broadcast, network, and host range.
//config:
//config:config FEATURE_IPCALC_LONG_OPTIONS
//config: bool "Enable long options"
//config: default y
//config: depends on IPCALC && LONG_OPTS
//config:
//config:config FEATURE_IPCALC_FANCY
//config: bool "Fancy IPCALC, more options, adds 1 kbyte"
//config: default y
//config: depends on IPCALC
//config: help
//config: Adds the options hostname, prefix and silent to the output of
//config: "ipcalc".
//applet:IF_IPCALC(APPLET_NOEXEC(ipcalc, ipcalc, BB_DIR_BIN, BB_SUID_DROP, ipcalc))
//kbuild:lib-$(CONFIG_IPCALC) += ipcalc.o
//usage:#define ipcalc_trivial_usage
//usage: "[OPTIONS] ADDRESS"
//usage: IF_FEATURE_IPCALC_FANCY("[/PREFIX]") " [NETMASK]"
//usage:#define ipcalc_full_usage "\n\n"
//usage: "Calculate and display network settings from IP address\n"
//usage: "\n -b Broadcast address"
//usage: "\n -n Network address"
//usage: "\n -m Default netmask for IP"
//usage: IF_FEATURE_IPCALC_FANCY(
//usage: "\n -p Prefix for IP/NETMASK"
//usage: "\n -h Resolved host name"
//usage: "\n -s No error messages"
//usage: )
#include "libbb.h"
/* After libbb.h, because on some systems it needs other includes */
#include <arpa/inet.h>
#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)
{
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;
}
#if ENABLE_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 ret;
}
#else
int get_prefix(unsigned long netmask);
#endif
#define NETMASK 0x01
#define BROADCAST 0x02
#define NETWORK 0x04
#define NETPREFIX 0x08
#define HOSTNAME 0x10
#define SILENT 0x20
#if ENABLE_FEATURE_IPCALC_LONG_OPTIONS
static const char ipcalc_longopts[] ALIGN1 =
"netmask\0" No_argument "m" // netmask from IP (assuming complete class A, B, or C network)
"broadcast\0" No_argument "b" // broadcast from IP [netmask]
"network\0" No_argument "n" // network from IP [netmask]
# if ENABLE_FEATURE_IPCALC_FANCY
"prefix\0" No_argument "p" // prefix from IP[/prefix] [netmask]
"hostname\0" No_argument "h" // hostname from IP
"silent\0" No_argument "s" // dont ever display error messages
# endif
;
# define GETOPT32 getopt32long
# define LONGOPTS ,ipcalc_longopts
#else
# define GETOPT32 getopt32
# define LONGOPTS
#endif
int ipcalc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int ipcalc_main(int argc UNUSED_PARAM, char **argv)
{
unsigned opt;
bool have_netmask = 0;
struct in_addr s_netmask, s_broadcast, s_network, s_ipaddr;
/* struct in_addr { in_addr_t s_addr; } and in_addr_t
* (which in turn is just a typedef to uint32_t)
* are essentially the same type. A few macros for less verbosity: */
#define netmask (s_netmask.s_addr)
#define broadcast (s_broadcast.s_addr)
#define network (s_network.s_addr)
#define ipaddr (s_ipaddr.s_addr)
char *ipstr;
opt_complementary = "-1:?2"; /* minimum 1 arg, maximum 2 args */
opt = GETOPT32(argv, "mbn" IF_FEATURE_IPCALC_FANCY("phs") LONGOPTS);
argv += optind;
if (opt & SILENT)
logmode = LOGMODE_NONE; /* suppress error_msg() output */
opt &= ~SILENT;
if (!(opt & (BROADCAST | NETWORK | NETPREFIX))) {
/* if no options at all or
* (no broadcast,network,prefix) and (two args)... */
if (!opt || argv[1])
bb_show_usage();
}
ipstr = argv[0];
if (ENABLE_FEATURE_IPCALC_FANCY) {
unsigned long netprefix = 0;
char *prefixstr;
prefixstr = ipstr;
while (*prefixstr) {
if (*prefixstr == '/') {
*prefixstr++ = '\0';
if (*prefixstr) {
unsigned msk;
netprefix = xatoul_range(prefixstr, 0, 32);
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++;
}
}
if (inet_aton(ipstr, &s_ipaddr) == 0) {
bb_error_msg_and_die("bad IP address: %s", argv[0]);
}
if (argv[1]) {
if (ENABLE_FEATURE_IPCALC_FANCY && have_netmask) {
bb_error_msg_and_die("use prefix or netmask, not both");
}
if (inet_aton(argv[1], &s_netmask) == 0) {
bb_error_msg_and_die("bad netmask: %s", argv[1]);
}
} else {
/* JHC - If the netmask wasn't provided then calculate it */
if (!ENABLE_FEATURE_IPCALC_FANCY || !have_netmask)
netmask = get_netmask(ipaddr);
}
if (opt & NETMASK) {
printf("NETMASK=%s\n", inet_ntoa(s_netmask));
}
if (opt & BROADCAST) {
broadcast = (ipaddr & netmask) | ~netmask;
printf("BROADCAST=%s\n", inet_ntoa(s_broadcast));
}
if (opt & NETWORK) {
network = ipaddr & netmask;
printf("NETWORK=%s\n", inet_ntoa(s_network));
}
if (ENABLE_FEATURE_IPCALC_FANCY) {
if (opt & NETPREFIX) {
printf("PREFIX=%i\n", get_prefix(netmask));
}
if (opt & HOSTNAME) {
struct hostent *hostinfo;
hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET);
if (!hostinfo) {
bb_herror_msg_and_die("can't find hostname for %s", argv[0]);
}
str_tolower(hostinfo->h_name);
printf("HOSTNAME=%s\n", hostinfo->h_name);
}
}
return EXIT_SUCCESS;
}