Merge branch 'busybox' into merge

author: Ron Yorston <rmy@pobox.com> 2019-08-16 09:42:39 +0100
committer: Ron Yorston <rmy@pobox.com> 2019-08-16 09:45:21 +0100
commit: 517cf74f6265ec4308b790b637b3f9778cbdc6e0 (patch)
tree: be9337069b60ca1bb03565d8575bacfc71181003 /networking
parent: ae65dc37bcc9b1d9cef0b111131c79dc4ba1bf51 (diff)
parent: ac78f2ac96b3efd6551a08e7dc609efa1fb69481 (diff)
download: busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.gz
busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.bz2
busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.zip
52 files changed, 452 insertions, 362 deletions
diff --git a/networking/arp.c b/networking/arp.c
index 71bfe3cbf..6519f8156 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -116,7 +116,7 @@ static int arp_del(char **args)
        /* Resolve the host name. */
        host = *args;
        if (ap->input(host, &sa) < 0) {
-                bb_herror_msg_and_die("%s", host);
+                bb_simple_herror_msg_and_die(host);
        }
        /* If a host has more than one address, use the correct one! */
@@ -149,7 +149,7 @@ static int arp_del(char **args)
 #ifdef HAVE_ATF_DONTPUB
                        req.arp_flags |= ATF_DONTPUB;
 #else
-                        bb_error_msg("feature ATF_DONTPUB is not supported");
+                        bb_simple_error_msg("feature ATF_DONTPUB is not supported");
 #endif
                        args++;
                        break;
@@ -157,7 +157,7 @@ static int arp_del(char **args)
 #ifdef HAVE_ATF_MAGIC
                        req.arp_flags |= ATF_MAGIC;
 #else
-                        bb_error_msg("feature ATF_MAGIC is not supported");
+                        bb_simple_error_msg("feature ATF_MAGIC is not supported");
 #endif
                        args++;
                        break;
@@ -173,7 +173,7 @@ static int arp_del(char **args)
                        if (strcmp(*args, "255.255.255.255") != 0) {
                                host = *args;
                                if (ap->input(host, &sa) < 0) {
-                                        bb_herror_msg_and_die("%s", host);
+                                        bb_simple_herror_msg_and_die(host);
                                }
                                memcpy(&req.arp_netmask, &sa, sizeof(struct sockaddr));
                                req.arp_flags |= ATF_NETMASK;
@@ -195,7 +195,7 @@ static int arp_del(char **args)
        /* Call the kernel. */
        if (flags & 2) {
                if (option_mask32 & ARP_OPT_v)
-                        bb_error_msg("SIOCDARP(nopub)");
+                        bb_simple_error_msg("SIOCDARP(nopub)");
                err = ioctl(sockfd, SIOCDARP, &req);
                if (err < 0) {
                        if (errno == ENXIO) {
@@ -204,20 +204,20 @@ static int arp_del(char **args)
                                printf("No ARP entry for %s\n", host);
                                return -1;
                        }
-                        bb_perror_msg_and_die("SIOCDARP(priv)");
+                        bb_simple_perror_msg_and_die("SIOCDARP(priv)");
                }
        }
        if ((flags & 1) && err) {
 nopub:
                req.arp_flags |= ATF_PUBL;
                if (option_mask32 & ARP_OPT_v)
-                        bb_error_msg("SIOCDARP(pub)");
+                        bb_simple_error_msg("SIOCDARP(pub)");
                if (ioctl(sockfd, SIOCDARP, &req) < 0) {
                        if (errno == ENXIO) {
                                printf("No ARP entry for %s\n", host);
                                return -1;
                        }
-                        bb_perror_msg_and_die("SIOCDARP(pub)");
+                        bb_simple_perror_msg_and_die("SIOCDARP(pub)");
                }
        }
        return 0;
@@ -233,7 +233,7 @@ static void arp_getdevhw(char *ifname, struct sockaddr *sa)
        ioctl_or_perror_and_die(sockfd, SIOCGIFHWADDR, &ifr,
                                        "can't get HW-Address for '%s'", ifname);
        if (hw_set && (ifr.ifr_hwaddr.sa_family != hw->type)) {
-                bb_error_msg_and_die("protocol type mismatch");
+                bb_simple_error_msg_and_die("protocol type mismatch");
        }
        memcpy(sa, &(ifr.ifr_hwaddr), sizeof(struct sockaddr));
@@ -261,20 +261,20 @@ static int arp_set(char **args)
        host = *args++;
        if (ap->input(host, &sa) < 0) {
-                bb_herror_msg_and_die("%s", host);
+                bb_simple_herror_msg_and_die(host);
        }
        /* If a host has more than one address, use the correct one! */
        memcpy(&req.arp_pa, &sa, sizeof(struct sockaddr));
        /* Fetch the hardware address. */
        if (*args == NULL) {
-                bb_error_msg_and_die("need hardware address");
+                bb_simple_error_msg_and_die("need hardware address");
        }
        if (option_mask32 & ARP_OPT_D) {
                arp_getdevhw(*args++, &req.arp_ha);
        } else {
                if (hw->input(*args++, &req.arp_ha) < 0) {
-                        bb_error_msg_and_die("invalid hardware address");
+                        bb_simple_error_msg_and_die("invalid hardware address");
                }
        }
@@ -302,7 +302,7 @@ static int arp_set(char **args)
 #ifdef HAVE_ATF_DONTPUB
                        flags |= ATF_DONTPUB;
 #else
-                        bb_error_msg("feature ATF_DONTPUB is not supported");
+                        bb_simple_error_msg("feature ATF_DONTPUB is not supported");
 #endif
                        args++;
                        break;
@@ -310,7 +310,7 @@ static int arp_set(char **args)
 #ifdef HAVE_ATF_MAGIC
                        flags |= ATF_MAGIC;
 #else
-                        bb_error_msg("feature ATF_MAGIC is not supported");
+                        bb_simple_error_msg("feature ATF_MAGIC is not supported");
 #endif
                        args++;
                        break;
@@ -326,7 +326,7 @@ static int arp_set(char **args)
                        if (strcmp(*args, "255.255.255.255") != 0) {
                                host = *args;
                                if (ap->input(host, &sa) < 0) {
-                                        bb_herror_msg_and_die("%s", host);
+                                        bb_simple_herror_msg_and_die(host);
                                }
                                memcpy(&req.arp_netmask, &sa, sizeof(struct sockaddr));
                                flags |= ATF_NETMASK;
@@ -346,7 +346,7 @@ static int arp_set(char **args)
        /* Call the kernel. */
        if (option_mask32 & ARP_OPT_v)
-                bb_error_msg("SIOCSARP()");
+                bb_simple_error_msg("SIOCSARP()");
        xioctl(sockfd, SIOCSARP, &req);
        return 0;
 }
@@ -422,7 +422,7 @@ static int arp_show(char *name)
        if (name != NULL) {
                /* Resolve the host name. */
                if (ap->input(name, &sa) < 0) {
-                        bb_herror_msg_and_die("%s", name);
+                        bb_simple_herror_msg_and_die(name);
                }
                host = xstrdup(ap->sprint(&sa, 1));
        }
@@ -530,7 +530,7 @@ int arp_main(int argc UNUSED_PARAM, char **argv)
        /* Now see what we have to do here... */
        if (opts & (ARP_OPT_d | ARP_OPT_s)) {
                if (argv[0] == NULL)
-                        bb_error_msg_and_die("need host name");
+                        bb_simple_error_msg_and_die("need host name");
                if (opts & ARP_OPT_s)
                        return arp_set(argv);
                return arp_del(argv);
diff --git a/networking/arping.c b/networking/arping.c
index 901578b68..2a256aaa0 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -375,7 +375,7 @@ int arping_main(int argc UNUSED_PARAM, char **argv)
                        xconnect(probe_fd, (struct sockaddr *) &G.probe_saddr, sizeof(G.probe_saddr));
                        bb_getsockname(probe_fd, (struct sockaddr *) &G.probe_saddr, sizeof(G.probe_saddr));
                        if (G.probe_saddr.sin_family != AF_INET)
-                                bb_error_msg_and_die("no IP address configured");
+                                bb_simple_error_msg_and_die("no IP address configured");
                        src = G.probe_saddr.sin_addr;
                }
                close(probe_fd);
@@ -430,7 +430,7 @@ int arping_main(int argc UNUSED_PARAM, char **argv)
                /* Don't allow SIGALRMs while we process the reply */
                sigprocmask(SIG_BLOCK, &G.sset, NULL);
                if (cc < 0) {
-                        bb_perror_msg("recvfrom");
+                        bb_simple_perror_msg("recvfrom");
                        continue;
                }
                recv_pack(G.packet, cc, &from);
diff --git a/networking/brctl.c b/networking/brctl.c
index f44ad9c8d..586ca9b0c 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -107,6 +107,7 @@ static unsigned str_to_jiffies(const char *time_str)
 #define filedata bb_common_bufsiz1
+#if ENABLE_FEATURE_BRCTL_SHOW
 static int read_file(const char *name)
 {
        int n = open_read_close(name, filedata, COMMON_BUFSIZE - 1);
@@ -176,7 +177,9 @@ static int show_bridge(const char *name, int need_hdr)
                bb_putchar('\n');
        return 0;
 }
+#endif
+#if ENABLE_FEATURE_BRCTL_FANCY
 static void write_uint(const char *name, const char *leaf, unsigned val)
 {
        char pathbuf[IFNAMSIZ + sizeof("/bridge/bridge_id") + 32];
@@ -193,6 +196,7 @@ static void write_uint(const char *name, const char *leaf, unsigned val)
                bb_simple_perror_msg_and_die(name);
        close(fd);
 }
+#endif
 int brctl_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int brctl_main(int argc UNUSED_PARAM, char **argv)
diff --git a/networking/dnsd.c b/networking/dnsd.c
index f2c6bddc6..0ff0290fb 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -395,11 +395,11 @@ static int process_packet(struct dns_entry *conf_data,
        head = (struct dns_head *)buf;
        if (head->nquer == 0) {
-                bb_error_msg("packet has 0 queries, ignored");
+                bb_simple_error_msg("packet has 0 queries, ignored");
                return 0; /* don't reply */
        }
        if (head->flags & htons(0x8000)) { /* QR bit */
-                bb_error_msg("response packet, ignored");
+                bb_simple_error_msg("response packet, ignored");
                return 0; /* don't reply */
        }
        /* QR = 1 "response", RCODE = 4 "Not Implemented" */
@@ -474,7 +474,7 @@ static int process_packet(struct dns_entry *conf_data,
         * RCODE = 0 "success"
         */
        if (OPT_verbose)
-                bb_info_msg("returning positive reply");
+                bb_simple_info_msg("returning positive reply");
        outr_flags = htons(0x8000 | 0x0400 | 0);
        /* we have one answer */
        head->nansw = htons(1);
@@ -557,7 +557,7 @@ int dnsd_main(int argc UNUSED_PARAM, char **argv)
                        continue;
                }
                if (OPT_verbose)
-                        bb_info_msg("got UDP packet");
+                        bb_simple_info_msg("got UDP packet");
                buf[r] = '\0'; /* paranoia */
                r = process_packet(conf_data, conf_ttl, buf);
                if (r <= 0)
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index acaac16f8..f45d43609 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -182,7 +182,7 @@ static int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd)
                byte_cnt = sscanf(ethoptarg, "%u.%u.%u.%u",
                                  &passwd[0], &passwd[1], &passwd[2], &passwd[3]);
        if (byte_cnt < 4) {
-                bb_error_msg("can't read Wake-On-LAN pass");
+                bb_simple_error_msg("can't read Wake-On-LAN pass");
                return 0;
        }
 // TODO: check invalid numbers >255??
@@ -266,7 +266,7 @@ int ether_wake_main(int argc UNUSED_PARAM, char **argv)
        /* This is necessary for broadcasts to work */
        if (flags /* & 1 OPT_BROADCAST */) {
                if (setsockopt_broadcast(s) != 0)
-                        bb_perror_msg("SO_BROADCAST");
+                        bb_simple_perror_msg("SO_BROADCAST");
        }
 #if defined(PF_PACKET)
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index bff90538f..7b6b89057 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -220,7 +220,7 @@ int ftp_receive(const char *local_path, char *server_path)
                struct stat sbuf;
                /* lstat would be wrong here! */
                if (stat(local_path, &sbuf) < 0) {
-                        bb_perror_msg_and_die("stat");
+                        bb_simple_perror_msg_and_die("stat");
                }
                if (sbuf.st_size > 0) {
                        beg_range = sbuf.st_size;
diff --git a/networking/hostname.c b/networking/hostname.c
index 248d8b65a..f96daed95 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -61,7 +61,7 @@ static void do_sethostname(char *s, int isfile)
        } else if (sethostname(s, strlen(s))) {
 //              if (errno == EPERM)
 //                      bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-                bb_perror_msg_and_die("sethostname");
+                bb_simple_perror_msg_and_die("sethostname");
        }
 }
diff --git a/networking/httpd.c b/networking/httpd.c
index 3f1e02ec8..1757e09c9 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1025,7 +1025,7 @@ static void log_and_exit(void)
        */
        if (verbose > 2)
-                bb_error_msg("closed");
+                bb_simple_error_msg("closed");
        _exit(xfunc_error_retval);
 }
@@ -1220,7 +1220,7 @@ static void send_headers(unsigned responseNum)
        }
        if (full_write(STDOUT_FILENO, iobuf, len) != len) {
                if (verbose > 1)
-                        bb_perror_msg("error");
+                        bb_simple_perror_msg("error");
                log_and_exit();
        }
 }
@@ -1726,8 +1726,10 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
                        ".jpg.jpeg\0" "image/jpeg\0"
                        ".gif\0"      "image/gif\0"
                        ".png\0"      "image/png\0"
+                        ".svg\0"      "image/svg+xml\0"
                        /* .css line must be after .c line */
                        ".css\0"      "text/css\0"
+                        ".js\0"       "application/javascript\0"
                        ".wav\0"      "audio/wav\0"
                        ".avi\0"      "video/x-msvideo\0"
                        ".qt.mov\0"   "video/quicktime\0"
@@ -1836,7 +1838,7 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
        if (count < 0) {
 IF_FEATURE_USE_SENDFILE(fin:)
                if (verbose > 1)
-                        bb_perror_msg("error");
+                        bb_simple_perror_msg("error");
        }
        log_and_exit();
 }
@@ -2147,7 +2149,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
                if (rmt_ip_str)
                        applet_name = rmt_ip_str;
                if (verbose > 2)
-                        bb_error_msg("connected");
+                        bb_simple_error_msg("connected");
        }
        if_ip_denied_send_HTTP_FORBIDDEN_and_exit(remote_ip);
@@ -2744,7 +2746,7 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
                if (opt & OPT_SETUID) {
                        if (ugid.gid != (gid_t)-1) {
                                if (setgroups(1, &ugid.gid) == -1)
-                                        bb_perror_msg_and_die("setgroups");
+                                        bb_simple_perror_msg_and_die("setgroups");
                                xsetgid(ugid.gid);
                        }
                        xsetuid(ugid.uid);
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 5c47abc16..b566d91a9 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -361,7 +361,7 @@ int ifconfig_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_IFCONFIG_STATUS
                return display_interfaces(argv[0] ? argv[0] : show_all_param);
 #else
-                bb_error_msg_and_die("no support for status display");
+                bb_simple_error_msg_and_die("no support for status display");
 #endif
        }
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 1426709cb..fa18edd57 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -365,7 +365,7 @@ static void up_iface(void)
        if (!(ifrequest.ifr_flags & IFF_UP)) {
                ifrequest.ifr_flags |= IFF_UP;
                /* Let user know we mess up with interface */
-                bb_info_msg("upping interface");
+                bb_simple_info_msg("upping interface");
                if (network_ioctl(SIOCSIFFLAGS, &ifrequest, "setting interface flags") < 0) {
                        if (errno != ENODEV && errno != EADDRNOTAVAIL)
                                xfunc_die();
@@ -461,7 +461,7 @@ static smallint detect_link(void)
                else if (option_mask32 & FLAG_IGNORE_FAIL_POSITIVE)
                        status = IFSTATUS_UP;
                else if (G.api_mode[0] == 'a')
-                        bb_error_msg("can't detect link status");
+                        bb_simple_error_msg("can't detect link status");
        }
        if (status != G.iface_last_status) {
@@ -493,14 +493,14 @@ static NOINLINE int check_existence_through_netlink(void)
                                goto ret;
                        if (errno == EINTR)
                                continue;
-                        bb_perror_msg("netlink: recv");
+                        bb_simple_perror_msg("netlink: recv");
                        return -1;
                }
                mhdr = (struct nlmsghdr*)replybuf;
                while (bytes > 0) {
                        if (!NLMSG_OK(mhdr, bytes)) {
-                                bb_error_msg("netlink packet too small or truncated");
+                                bb_simple_error_msg("netlink packet too small or truncated");
                                return -1;
                        }
@@ -509,7 +509,7 @@ static NOINLINE int check_existence_through_netlink(void)
                                int attr_len;
                                if (mhdr->nlmsg_len < NLMSG_LENGTH(sizeof(struct ifinfomsg))) {
-                                        bb_error_msg("netlink packet too small or truncated");
+                                        bb_simple_error_msg("netlink packet too small or truncated");
                                        return -1;
                                }
@@ -591,7 +591,7 @@ int ifplugd_main(int argc UNUSED_PARAM, char **argv)
        }
        if (pid_from_pidfile > 0 && kill(pid_from_pidfile, 0) == 0)
-                bb_error_msg_and_die("daemon already running");
+                bb_simple_error_msg_and_die("daemon already running");
 #endif
        api_mode_found = strchr(api_modes, G.api_mode[0]);
@@ -604,15 +604,7 @@ int ifplugd_main(int argc UNUSED_PARAM, char **argv)
        xmove_fd(xsocket(AF_INET, SOCK_DGRAM, 0), ioctl_fd);
        if (opts & FLAG_MONITOR) {
-                struct sockaddr_nl addr;
+                int fd = create_and_bind_to_netlink(NETLINK_ROUTE, RTMGRP_LINK, 0);
-                int fd = xsocket(PF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE);
-                memset(&addr, 0, sizeof(addr));
-                addr.nl_family = AF_NETLINK;
-                addr.nl_groups = RTMGRP_LINK;
-                addr.nl_pid = getpid();
-                xbind(fd, (struct sockaddr*)&addr, sizeof(addr));
                xmove_fd(fd, netlink_fd);
        }
@@ -698,7 +690,7 @@ int ifplugd_main(int argc UNUSED_PARAM, char **argv)
                ) {
                        if (errno == EINTR)
                                continue;
-                        bb_perror_msg("poll");
+                        bb_simple_perror_msg("poll");
                        goto exiting;
                }
@@ -771,5 +763,5 @@ int ifplugd_main(int argc UNUSED_PARAM, char **argv)
 exiting:
        remove_pidfile(pidfile_name);
-        bb_error_msg_and_die("exiting");
+        bb_simple_error_msg_and_die("exiting");
 }
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 5327b0979..60ceb5a1f 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -665,7 +665,7 @@ static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
                if (executable_exists(ext_dhcp_clients[i].name))
                        return execute(ext_dhcp_clients[i].startcmd, ifd, exec);
        }
-        bb_error_msg("no dhcp clients found");
+        bb_simple_error_msg("no dhcp clients found");
        return 0;
 }
 # elif ENABLE_UDHCPC
@@ -707,7 +707,7 @@ static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
        }
        if (!result)
-                bb_error_msg("warning: no dhcp clients found and stopped");
+                bb_simple_error_msg("warning: no dhcp clients found and stopped");
        /* Sleep a bit, otherwise static_down tries to bring down interface too soon,
           and it may come back up because udhcpc is still shutting down */
diff --git a/networking/inetd.c b/networking/inetd.c
index da6551174..3cd2b11f0 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -504,7 +504,7 @@ static void register_rpc(servtab_t *sep)
        if (bb_getsockname(sep->se_fd, (struct sockaddr *) &ir_sin, sizeof(ir_sin)) < 0) {
 //TODO: verify that such failure is even possible in Linux kernel
-                bb_perror_msg("getsockname");
+                bb_simple_perror_msg("getsockname");
                return;
        }
@@ -544,7 +544,7 @@ static void bump_nofile(void)
        }
        if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
-                bb_perror_msg("setrlimit");
+                bb_simple_perror_msg("setrlimit");
                return;
        }
@@ -599,7 +599,7 @@ static void prepare_socket_fd(servtab_t *sep)
        fd = socket(sep->se_family, sep->se_socktype, 0);
        if (fd < 0) {
-                bb_perror_msg("socket");
+                bb_simple_perror_msg("socket");
                return;
        }
        setsockopt_reuseaddr(fd);
@@ -815,7 +815,7 @@ static NOINLINE servtab_t *parse_one_line(void)
                        n = bb_strtou(p, &p, 10);
                        if (n > INT_MAX) {
 bad_ver_spec:
-                                bb_error_msg("bad rpc version");
+                                bb_simple_error_msg("bad rpc version");
                                goto parse_err;
                        }
                        sep->se_rpcver_lo = sep->se_rpcver_hi = n;
@@ -829,7 +829,7 @@ static NOINLINE servtab_t *parse_one_line(void)
                        if (*p != '\0')
                                goto bad_ver_spec;
 #else
-                        bb_error_msg("no support for rpc services");
+                        bb_simple_error_msg("no support for rpc services");
                        goto parse_err;
 #endif
                }
@@ -1235,7 +1235,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
        if (argv[0])
                config_filename = argv[0];
        if (config_filename == NULL)
-                bb_error_msg_and_die("non-root must specify config file");
+                bb_simple_error_msg_and_die("non-root must specify config file");
        if (!(opt & 2))
                bb_daemonize_or_rexec(0, argv - optind);
        else
@@ -1304,7 +1304,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
                ready_fd_cnt = select(maxsock + 1, &readable, NULL, NULL, NULL);
                if (ready_fd_cnt < 0) {
                        if (errno != EINTR) {
-                                bb_perror_msg("select");
+                                bb_simple_perror_msg("select");
                                sleep(1);
                        }
                        continue;
@@ -1405,7 +1405,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
                                        pid = vfork();
                                if (pid < 0) { /* fork error */
-                                        bb_perror_msg("vfork"+1);
+                                        bb_simple_perror_msg("vfork"+1);
                                        sleep(1);
                                        restore_sigmask(&omask);
                                        maybe_close(new_udp_fd);
@@ -1488,7 +1488,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
                        }
                        if (real_uid != 0 && real_uid != pwd->pw_uid) {
                                /* a user running private inetd */
-                                bb_error_msg("non-root must run services as himself");
+                                bb_simple_error_msg("non-root must run services as himself");
                                goto do_exit1;
                        }
                        if (pwd->pw_uid != real_uid) {
@@ -1502,7 +1502,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
                        }
                        if (rlim_ofile.rlim_cur != rlim_ofile_cur)
                                if (setrlimit(RLIMIT_NOFILE, &rlim_ofile) < 0)
-                                        bb_perror_msg("setrlimit");
+                                        bb_simple_perror_msg("setrlimit");
                        /* closelog(); - WRONG. we are after vfork,
                         * this may confuse syslog() internal state.
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 67f768836..09b146872 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -183,7 +183,7 @@ int ipcalc_main(int argc UNUSED_PARAM, char **argv)
        if (argv[1]) {
                if (ENABLE_FEATURE_IPCALC_FANCY && have_netmask) {
-                        bb_error_msg_and_die("use prefix or netmask, not both");
+                        bb_simple_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]);
diff --git a/networking/isrv.c b/networking/isrv.c
index 97f5c6d4e..0e3f10f9a 100644
--- a/networking/isrv.c
+++ b/networking/isrv.c
@@ -185,7 +185,7 @@ static void handle_accept(isrv_state_t *state, int fd)
                /* Most probably someone gave us wrong fd type
                 * (for example, non-socket). Don't want
                 * to loop forever. */
-                bb_perror_msg_and_die("accept");
+                bb_simple_perror_msg_and_die("accept");
        }
        DPRINTF("new_peer(%d)", newfd);
@@ -311,7 +311,7 @@ void isrv_run(
                if (n < 0) {
                        if (errno != EINTR)
-                                bb_perror_msg("select");
+                                bb_simple_perror_msg("select");
                        continue;
                }
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 7b7e0154b..86cf3beea 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -119,7 +119,7 @@ static NOINLINE int print_linkinfo(const struct nlmsghdr *n)
        //memset(tb, 0, sizeof(tb)); - parse_rtattr does this
        parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len);
        if (tb[IFLA_IFNAME] == NULL) {
-                bb_error_msg("nil ifname");
+                bb_simple_error_msg("nil ifname");
                return -1;
        }
        if (G_filter.label
@@ -205,7 +205,7 @@ static NOINLINE int print_linkinfo(const struct nlmsghdr *n)
 static int flush_update(void)
 {
        if (rtnl_send_check(G_filter.rth, G_filter.flushb, G_filter.flushp) < 0) {
-                bb_perror_msg("can't send flush request");
+                bb_simple_perror_msg("can't send flush request");
                return -1;
        }
        G_filter.flushp = 0;
@@ -439,7 +439,7 @@ int FAST_FUNC ipaddr_list_or_flush(char **argv, int flush)
                        bb_error_msg_and_die(bb_msg_requires_arg, "flush");
                }
                if (G_filter.family == AF_PACKET) {
-                        bb_error_msg_and_die("can't flush link addresses");
+                        bb_simple_error_msg_and_die("can't flush link addresses");
                }
        }
@@ -700,7 +700,7 @@ static int ipaddr_modify(int cmd, int flags, char **argv)
        if (!d) {
                /* There was no "dev IFACE", but we need that */
-                bb_error_msg_and_die("need \"dev IFACE\"");
+                bb_simple_error_msg_and_die("need \"dev IFACE\"");
        }
        if (l && !is_prefixed_with(l, d)) {
                bb_error_msg_and_die("\"dev\" (%s) must match \"label\" (%s)", d, l);
@@ -717,7 +717,7 @@ static int ipaddr_modify(int cmd, int flags, char **argv)
                inet_prefix brd;
                int i;
                if (req.ifa.ifa_family != AF_INET) {
-                        bb_error_msg_and_die("broadcast can be set only for IPv4 addresses");
+                        bb_simple_error_msg_and_die("broadcast can be set only for IPv4 addresses");
                }
                brd = peer;
                if (brd.bitlen <= 30) {
diff --git a/networking/libiproute/ipneigh.c b/networking/libiproute/ipneigh.c
index 984dd4bdd..b9b4f4b31 100644
--- a/networking/libiproute/ipneigh.c
+++ b/networking/libiproute/ipneigh.c
@@ -49,7 +49,7 @@ typedef struct filter_t filter_t;
 static int flush_update(void)
 {
        if (rtnl_send_check(G_filter.rth, G_filter.flushb, G_filter.flushp) < 0) {
-                bb_perror_msg("can't send flush request");
+                bb_simple_perror_msg("can't send flush request");
                return -1;
        }
        G_filter.flushp = 0;
@@ -305,7 +305,7 @@ static int FAST_FUNC ipneigh_list_or_flush(char **argv, int flush)
                        xrtnl_wilddump_request(&rth, G_filter.family, RTM_GETNEIGH);
                        G_filter.flushed = 0;
                        if (xrtnl_dump_filter(&rth, print_neigh, NULL) < 0) {
-                                bb_perror_msg_and_die("flush terminated");
+                                bb_simple_perror_msg_and_die("flush terminated");
                        }
                        if (G_filter.flushed == 0) {
                                if (round == 0)
@@ -325,11 +325,11 @@ static int FAST_FUNC ipneigh_list_or_flush(char **argv, int flush)
        ndm.ndm_family = G_filter.family;
        if (rtnl_dump_request(&rth, RTM_GETNEIGH, &ndm, sizeof(struct ndmsg)) < 0) {
-                bb_perror_msg_and_die("can't send dump request");
+                bb_simple_perror_msg_and_die("can't send dump request");
        }
        if (xrtnl_dump_filter(&rth, print_neigh, NULL) < 0) {
-                bb_error_msg_and_die("dump terminated");
+                bb_simple_error_msg_and_die("dump terminated");
        }
        return 0;
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index b11078ed5..5a972f8b2 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -57,7 +57,7 @@ typedef struct filter_t filter_t;
 static int flush_update(void)
 {
        if (rtnl_send_check(G_filter.rth, G_filter.flushb, G_filter.flushp) < 0) {
-                bb_perror_msg("can't send flush request");
+                bb_simple_perror_msg("can't send flush request");
                return -1;
        }
        G_filter.flushp = 0;
@@ -756,7 +756,7 @@ static void iproute_flush_cache(void)
        }
        if (write(flush_fd, "-1", 2) < 2) {
-                bb_perror_msg("can't flush routing cache");
+                bb_simple_perror_msg("can't flush routing cache");
                return;
        }
        close(flush_fd);
@@ -948,7 +948,7 @@ static int iproute_list_or_flush(char **argv, int flush)
        if (G_filter.tb != -1) {
                xrtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE);
        } else if (rtnl_rtcache_request(&rth, do_ipv6) < 0) {
-                bb_perror_msg_and_die("can't send dump request");
+                bb_simple_perror_msg_and_die("can't send dump request");
        }
        xrtnl_dump_filter(&rth, print_route, NULL);
@@ -1041,7 +1041,7 @@ static int iproute_get(char **argv)
        }
        if (req.r.rtm_dst_len == 0) {
-                bb_error_msg_and_die("need at least destination address");
+                bb_simple_error_msg_and_die("need at least destination address");
        }
        xrtnl_open(&rth);
@@ -1077,7 +1077,7 @@ static int iproute_get(char **argv)
                print_route(NULL, &req.n, NULL);
                if (req.n.nlmsg_type != RTM_NEWROUTE) {
-                        bb_error_msg_and_die("not a route?");
+                        bb_simple_error_msg_and_die("not a route?");
                }
                len -= NLMSG_LENGTH(sizeof(*r));
                if (len < 0) {
@@ -1091,7 +1091,7 @@ static int iproute_get(char **argv)
                        tb[RTA_PREFSRC]->rta_type = RTA_SRC;
                        r->rtm_src_len = 8*RTA_PAYLOAD(tb[RTA_PREFSRC]);
                } else if (!tb[RTA_SRC]) {
-                        bb_error_msg_and_die("can't connect the route");
+                        bb_simple_error_msg_and_die("can't connect the route");
                }
                if (!odev && tb[RTA_OIF]) {
                        tb[RTA_OIF]->rta_type = 0;
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index 4002feb78..c9fa632f3 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -338,7 +338,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p)
        if (p->iph.protocol == IPPROTO_IPIP || p->iph.protocol == IPPROTO_IPV6) {
                if ((p->i_flags & GRE_KEY) || (p->o_flags & GRE_KEY)) {
-                        bb_error_msg_and_die("keys are not allowed with ipip and sit");
+                        bb_simple_error_msg_and_die("keys are not allowed with ipip and sit");
                }
        }
@@ -355,7 +355,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p)
                p->o_flags |= GRE_KEY;
        }
        if (IN_MULTICAST(ntohl(p->iph.daddr)) && !p->iph.saddr) {
-                bb_error_msg_and_die("broadcast tunnel requires a source address");
+                bb_simple_error_msg_and_die("broadcast tunnel requires a source address");
        }
 }
@@ -367,7 +367,7 @@ static int do_add(int cmd, char **argv)
        parse_args(argv, cmd, &p);
        if (p.iph.ttl && p.iph.frag_off == 0) {
-                bb_error_msg_and_die("ttl != 0 and noptmudisc are incompatible");
+                bb_simple_error_msg_and_die("ttl != 0 and noptmudisc are incompatible");
        }
        switch (p.iph.protocol) {
@@ -378,7 +378,7 @@ static int do_add(int cmd, char **argv)
        case IPPROTO_IPV6:
                return do_add_ioctl(cmd, "sit0", &p);
        default:
-                bb_error_msg_and_die("can't determine tunnel mode (ipip, gre or sit)");
+                bb_simple_error_msg_and_die("can't determine tunnel mode (ipip, gre or sit)");
        }
 }
@@ -485,7 +485,7 @@ static void do_tunnels_list(struct ip_tunnel_parm *p)
                if (ptr == NULL ||
                    (*ptr++ = 0, sscanf(buf, "%s", name) != 1)
                ) {
-                        bb_error_msg("wrong format of /proc/net/dev");
+                        bb_simple_error_msg("wrong format of /proc/net/dev");
                        return;
                }
                if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu",
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
index b0d4166ac..7e3473a1c 100644
--- a/networking/libiproute/libnetlink.c
+++ b/networking/libiproute/libnetlink.c
@@ -79,7 +79,7 @@ int FAST_FUNC rtnl_send_check(struct rtnl_handle *rth, const void *buf, int len)
                if (h->nlmsg_type == NLMSG_ERROR) {
                        struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
                        if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr)))
-                                bb_error_msg("ERROR truncated");
+                                bb_simple_error_msg("ERROR truncated");
                        else
                                errno = -err->error;
                        return -1;
@@ -149,11 +149,11 @@ static int rtnl_dump_filter(struct rtnl_handle *rth,
                if (status < 0) {
                        if (errno == EINTR)
                                continue;
-                        bb_perror_msg("OVERRUN");
+                        bb_simple_perror_msg("OVERRUN");
                        continue;
                }
                if (status == 0) {
-                        bb_error_msg("EOF on netlink");
+                        bb_simple_error_msg("EOF on netlink");
                        goto ret;
                }
                if (msg.msg_namelen != sizeof(nladdr)) {
@@ -184,10 +184,10 @@ static int rtnl_dump_filter(struct rtnl_handle *rth,
                        if (h->nlmsg_type == NLMSG_ERROR) {
                                struct nlmsgerr *l_err = (struct nlmsgerr*)NLMSG_DATA(h);
                                if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) {
-                                        bb_error_msg("ERROR truncated");
+                                        bb_simple_error_msg("ERROR truncated");
                                } else {
                                        errno = -l_err->error;
-                                        bb_perror_msg("RTNETLINK answers");
+                                        bb_simple_perror_msg("RTNETLINK answers");
                                }
                                goto ret;
                        }
@@ -201,7 +201,7 @@ static int rtnl_dump_filter(struct rtnl_handle *rth,
                        h = NLMSG_NEXT(h, status);
                }
                if (msg.msg_flags & MSG_TRUNC) {
-                        bb_error_msg("message truncated");
+                        bb_simple_error_msg("message truncated");
                        continue;
                }
                if (status) {
@@ -221,7 +221,7 @@ int FAST_FUNC xrtnl_dump_filter(struct rtnl_handle *rth,
 {
        int ret = rtnl_dump_filter(rth, filter, arg1/*, NULL, NULL*/);
        if (ret < 0)
-                bb_error_msg_and_die("dump terminated");
+                bb_simple_error_msg_and_die("dump terminated");
        return ret;
 }
@@ -266,7 +266,7 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
        status = sendmsg(rtnl->fd, &msg, 0);
        if (status < 0) {
-                bb_perror_msg("can't talk to rtnetlink");
+                bb_simple_perror_msg("can't talk to rtnetlink");
                goto ret;
        }
@@ -280,11 +280,11 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
                        if (errno == EINTR) {
                                continue;
                        }
-                        bb_perror_msg("OVERRUN");
+                        bb_simple_perror_msg("OVERRUN");
                        continue;
                }
                if (status == 0) {
-                        bb_error_msg("EOF on netlink");
+                        bb_simple_error_msg("EOF on netlink");
                        goto ret;
                }
                if (msg.msg_namelen != sizeof(nladdr)) {
@@ -297,7 +297,7 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
                        if (l < 0 || len > status) {
                                if (msg.msg_flags & MSG_TRUNC) {
-                                        bb_error_msg("truncated message");
+                                        bb_simple_error_msg("truncated message");
                                        goto ret;
                                }
                                bb_error_msg_and_die("malformed message: len=%d!", len);
@@ -320,7 +320,7 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
                        if (h->nlmsg_type == NLMSG_ERROR) {
                                struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
                                if (l < (int)sizeof(struct nlmsgerr)) {
-                                        bb_error_msg("ERROR truncated");
+                                        bb_simple_error_msg("ERROR truncated");
                                } else {
                                        errno = - err->error;
                                        if (errno == 0) {
@@ -329,7 +329,7 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
                                                }
                                                goto ret_0;
                                        }
-                                        bb_perror_msg("RTNETLINK answers");
+                                        bb_simple_perror_msg("RTNETLINK answers");
                                }
                                goto ret;
                        }
@@ -338,13 +338,13 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
                                goto ret_0;
                        }
-                        bb_error_msg("unexpected reply!");
+                        bb_simple_error_msg("unexpected reply!");
                        status -= NLMSG_ALIGN(len);
                        h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len));
                }
                if (msg.msg_flags & MSG_TRUNC) {
-                        bb_error_msg("message truncated");
+                        bb_simple_error_msg("message truncated");
                        continue;
                }
                if (status) {
diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c
index bf053a54b..4ce230356 100644
--- a/networking/libiproute/utils.c
+++ b/networking/libiproute/utils.c
@@ -230,7 +230,7 @@ uint32_t FAST_FUNC get_addr32(char *name)
 char** FAST_FUNC next_arg(char **argv)
 {
        if (!*++argv)
-                bb_error_msg_and_die("command line is not complete, try \"help\"");
+                bb_simple_error_msg_and_die("command line is not complete, try \"help\"");
        return argv;
 }
diff --git a/networking/nbd-client.c b/networking/nbd-client.c
index 0dc8d0c43..3db3b46f9 100644
--- a/networking/nbd-client.c
+++ b/networking/nbd-client.c
@@ -179,7 +179,7 @@ int nbdclient_main(int argc, char **argv)
                if (memcmp(&nbd_header.magic1, "NBDMAGIC",
                                sizeof(nbd_header.magic1)) != 0
                ) {
-                        bb_error_msg_and_die("login failed");
+                        bb_simple_error_msg_and_die("login failed");
                }
                if (memcmp(&nbd_header.magic2,
                                "\x00\x00\x42\x02\x81\x86\x12\x53",
@@ -189,7 +189,7 @@ int nbdclient_main(int argc, char **argv)
                } else if (memcmp(&nbd_header.magic2, "IHAVEOPT", 8) == 0) {
                        proto_new = 1;
                } else {
-                        bb_error_msg_and_die("login failed");
+                        bb_simple_error_msg_and_die("login failed");
                }
                if (!proto_new) {
@@ -240,17 +240,17 @@ int nbdclient_main(int argc, char **argv)
                }
                if (ioctl(nbd, BLKROSET, &ro) < 0) {
-                        bb_perror_msg_and_die("BLKROSET");
+                        bb_simple_perror_msg_and_die("BLKROSET");
                }
                if (timeout) {
                        if (ioctl(nbd, NBD_SET_TIMEOUT, (unsigned long) timeout)) {
-                                bb_perror_msg_and_die("NBD_SET_TIMEOUT");
+                                bb_simple_perror_msg_and_die("NBD_SET_TIMEOUT");
                        }
                }
                if (ioctl(nbd, NBD_SET_SOCK, sock)) {
-                        bb_perror_msg_and_die("NBD_SET_SOCK");
+                        bb_simple_perror_msg_and_die("NBD_SET_SOCK");
                }
                //if (swap) mlockall(MCL_CURRENT|MCL_FUTURE);
diff --git a/networking/nc.c b/networking/nc.c
index 3e122b787..3dce6a528 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -113,7 +113,7 @@
 #if ENABLE_NC_EXTRA
 static void timeout(int signum UNUSED_PARAM)
 {
-        bb_error_msg_and_die("timed out");
+        bb_simple_error_msg_and_die("timed out");
 }
 #endif
@@ -215,7 +215,7 @@ int nc_main(int argc, char **argv)
 IF_NC_EXTRA(accept_again:)
                        cfd = accept(sfd, NULL, 0);
                        if (cfd < 0)
-                                bb_perror_msg_and_die("accept");
+                                bb_simple_perror_msg_and_die("accept");
                        if (!execparam)
                                close(sfd);
                } else {
@@ -267,7 +267,7 @@ int nc_main(int argc, char **argv)
                testfds = readfds;
                if (select(cfd + 1, &testfds, NULL, NULL, NULL) < 0)
-                        bb_perror_msg_and_die("select");
+                        bb_simple_perror_msg_and_die("select");
                fd = STDIN_FILENO;
                while (1) {
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 42c84de45..034e03d21 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -198,8 +198,8 @@ enum {
 #define Debug(...) do { } while (0)
 #endif
-#define holler_error(...)  do { if (o_verbose) bb_error_msg(__VA_ARGS__); } while (0)
+#define holler_error(msg)  do { if (o_verbose) bb_simple_error_msg(msg); } while (0)
-#define holler_perror(...) do { if (o_verbose) bb_perror_msg(__VA_ARGS__); } while (0)
+#define holler_perror(msg) do { if (o_verbose) bb_simple_perror_msg(msg); } while (0)
 /* catch: no-brainer interrupt handler */
 static void catch(int sig)
@@ -361,10 +361,10 @@ static void dolisten(int is_persistent, char **proggie)
                        rr = recv_from_to(netfd, NULL, 0, MSG_PEEK, /*was bigbuf_net, BIGSIZ*/
                                &remend.u.sa, &ouraddr->u.sa, ouraddr->len);
                        if (rr < 0)
-                                bb_perror_msg_and_die("recvfrom");
+                                bb_simple_perror_msg_and_die("recvfrom");
                        unarm();
                } else
-                        bb_error_msg_and_die("timeout");
+                        bb_simple_error_msg_and_die("timeout");
 /* Now we learned *to which IP* peer has connected, and we want to anchor
 our socket on it, so that our outbound packets will have correct local IP.
 Unfortunately, bind() on already bound socket will fail now (EINVAL):
@@ -382,7 +382,7 @@ create new one, and bind() it. TODO */
                        remend.len = LSA_SIZEOF_SA;
                        rr = accept(netfd, &remend.u.sa, &remend.len);
                        if (rr < 0)
-                                bb_perror_msg_and_die("accept");
+                                bb_simple_perror_msg_and_die("accept");
                        if (themaddr) {
                                int sv_port, port, r;
@@ -409,7 +409,7 @@ create new one, and bind() it. TODO */
                        }
                        unarm();
                } else
-                        bb_error_msg_and_die("timeout");
+                        bb_simple_error_msg_and_die("timeout");
                if (is_persistent && proggie) {
                        /* -l -k -e PROG */
@@ -494,7 +494,7 @@ static int udptest(void)
        rr = write(netfd, bigbuf_in, 1);
        if (rr != 1)
-                bb_perror_msg("udptest first write");
+                bb_simple_perror_msg("udptest first write");
        if (o_wait)
                sleep(o_wait); // can be interrupted! while (t) nanosleep(&t)?
@@ -644,7 +644,7 @@ static int readwrite(void)
                        if (rr <= 0) {
                                if (rr < 0 && o_verbose > 1) {
                                        /* nc 1.10 doesn't do this */
-                                        bb_perror_msg("net read");
+                                        bb_simple_perror_msg("net read");
                                }
                                pfds[1].fd = -1;                   /* don't poll for netfd anymore */
                                fds_open--;
@@ -869,7 +869,7 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
                /* apparently UDP can listen ON "port 0",
                 but that's not useful */
                if (!o_lport)
-                        bb_error_msg_and_die("UDP listen needs nonzero -p port");
+                        bb_simple_error_msg_and_die("UDP listen needs nonzero -p port");
        }
 #endif
diff --git a/networking/netstat.c b/networking/netstat.c
index f6bcd44ba..29b891cdc 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -343,9 +343,9 @@ static void prg_cache_load(void)
                return;
        if (prg_cache_loaded == 1)
-                bb_error_msg("can't scan /proc - are you root?");
+                bb_simple_error_msg("can't scan /proc - are you root?");
        else
-                bb_error_msg("showing only processes with your user ID");
+                bb_simple_error_msg("showing only processes with your user ID");
 }
 #else
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 24e09d4f0..8adde14b8 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -549,7 +549,7 @@ static int send_queries(struct ns *ns)
                recvlen = read(pfd.fd, reply, sizeof(reply));
                if (recvlen < 0) {
-                        bb_perror_msg("read");
+                        bb_simple_perror_msg("read");
 next:
                        tcur = monotonic_ms();
                        continue;
diff --git a/networking/ntpd.c b/networking/ntpd.c
index cd6da2b38..48dc1c379 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -905,7 +905,7 @@ do_sendto(int fd,
                ret = send_to_from(fd, msg, len, MSG_DONTWAIT, to, from, addrlen);
        }
        if (ret != len) {
-                bb_perror_msg("send failed");
+                bb_simple_perror_msg("send failed");
                return -1;
        }
        return 0;
@@ -1121,7 +1121,7 @@ step_time(double offset)
        dtime = tvc.tv_sec + (1.0e-6 * tvc.tv_usec) + offset;
        d_to_tv(dtime, &tvn);
        if (settimeofday(&tvn, NULL) == -1)
-                bb_perror_msg_and_die("settimeofday");
+                bb_simple_perror_msg_and_die("settimeofday");
        VERB2 {
                tval = tvc.tv_sec;
@@ -1494,7 +1494,7 @@ select_and_cluster(void)
                /* Starting from 1 is ok here */
                for (i = 1; i < num_survivors; i++) {
                        if (G.last_update_peer == survivor[i].p) {
-                                VERB5 bb_error_msg("keeping old synced peer");
+                                VERB5 bb_simple_error_msg("keeping old synced peer");
                                p = G.last_update_peer;
                                goto keep_old;
                        }
@@ -1702,7 +1702,7 @@ update_local_clock(peer_t *p)
 #else
                        set_new_values(STATE_SYNC, offset, recv_time);
 #endif
-                        VERB4 bb_error_msg("transitioning to FREQ, datapoint ignored");
+                        VERB4 bb_simple_error_msg("transitioning to FREQ, datapoint ignored");
                        return 0; /* "leave poll interval as is" */
 #if 0 /* this is dead code for now */
@@ -1796,7 +1796,7 @@ update_local_clock(peer_t *p)
        VERB4 {
                memset(&tmx, 0, sizeof(tmx));
                if (adjtimex(&tmx) < 0)
-                        bb_perror_msg_and_die("adjtimex");
+                        bb_simple_perror_msg_and_die("adjtimex");
                bb_error_msg("p adjtimex freq:%ld offset:%+ld status:0x%x tc:%ld",
                                tmx.freq, tmx.offset, tmx.status, tmx.constant);
        }
@@ -1906,7 +1906,7 @@ update_local_clock(peer_t *p)
        //tmx.maxerror = (uint32_t)((sys_rootdelay / 2 + sys_rootdisp) * 1e6);
        rc = adjtimex(&tmx);
        if (rc < 0)
-                bb_perror_msg_and_die("adjtimex");
+                bb_simple_perror_msg_and_die("adjtimex");
        /* NB: here kernel returns constant == G.poll_exp, not == G.poll_exp - 4.
         * Not sure why. Perhaps it is normal.
         */
@@ -2018,7 +2018,7 @@ recv_and_process_peer_pkt(peer_t *p)
 #if ENABLE_FEATURE_NTP_AUTH
        if (size != NTP_MSGSIZE_NOAUTH && size != NTP_MSGSIZE_MD5_AUTH && size != NTP_MSGSIZE_SHA1_AUTH) {
-                bb_error_msg("malformed packet received from %s", p->p_dotted);
+                bb_error_msg("malformed packet received from %s: size %u", p->p_dotted, (int)size);
                return;
        }
        if (p->key_entry && hashes_differ(p, &msg)) {
@@ -2027,7 +2027,7 @@ recv_and_process_peer_pkt(peer_t *p)
        }
 #else
        if (size != NTP_MSGSIZE_NOAUTH && size != NTP_MSGSIZE_MD5_AUTH) {
-                bb_error_msg("malformed packet received from %s", p->p_dotted);
+                bb_error_msg("malformed packet received from %s: size %u", p->p_dotted, (int)size);
                return;
        }
 #endif
@@ -2238,6 +2238,13 @@ recv_and_process_client_pkt(void /*int fd*/)
        from = xzalloc(to->len);
        size = recv_from_to(G_listen_fd, &msg, sizeof(msg), MSG_DONTWAIT, from, &to->u.sa, to->len);
+        /* "ntpq -p" (4.2.8p13) sends a 12-byte NTPv2 request:
+         * m_status is 0x16: leap:0 version:2 mode:6(reserved1)
+         *  https://docs.ntpsec.org/latest/mode6.html
+         * We don't support this.
+         */
 #if ENABLE_FEATURE_NTP_AUTH
        if (size != NTP_MSGSIZE_NOAUTH && size != NTP_MSGSIZE_MD5_AUTH && size != NTP_MSGSIZE_SHA1_AUTH)
 #else
@@ -2248,7 +2255,7 @@ recv_and_process_client_pkt(void /*int fd*/)
                if (size < 0) {
                        if (errno == EAGAIN)
                                goto bail;
-                        bb_perror_msg_and_die("recv");
+                        bb_simple_perror_msg_and_die("recv");
                }
                addr = xmalloc_sockaddr2dotted_noport(from);
                bb_error_msg("malformed packet received from %s: size %u", addr, (int)size);
@@ -2415,7 +2422,7 @@ static NOINLINE void ntp_init(char **argv)
        srand(getpid());
        if (getuid())
-                bb_error_msg_and_die(bb_msg_you_must_be_root);
+                bb_simple_error_msg_and_die(bb_msg_you_must_be_root);
        /* Set some globals */
        G.discipline_jitter = G_precision_sec;
@@ -2436,7 +2443,8 @@ static NOINLINE void ntp_init(char **argv)
                        "d" /* compat */
                        "46aAbgL" /* compat, ignored */
                                "\0"
-                                "dd:wn"  /* -d: counter; -p: list; -w implies -n */
+                                "=0"      /* should have no arguments */
+                                ":dd:wn"  /* -d: counter; -p: list; -w implies -n */
                                IF_FEATURE_NTPD_SERVER(":Il") /* -I implies -l */
                        IF_FEATURE_NTP_AUTH(, &key_file_path)
                        , &peers, &G.script_name
@@ -2490,7 +2498,7 @@ static NOINLINE void ntp_init(char **argv)
                                /* supports 'sha' and 'sha1' formats */
                                hash_type = HASH_SHA1;
                        else
-                                bb_error_msg_and_die("only MD5 and SHA1 keys supported");
+                                bb_simple_error_msg_and_die("only MD5 and SHA1 keys supported");
 /* man ntp.keys:
 *  MD5    The key is 1 to 16 printable characters terminated by an EOL,
 *         whitespace, or a # (which is the "start of comment" character).
@@ -2673,7 +2681,7 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
                                if (p->p_fd == -1) {
                                        /* Time to send new req */
                                        if (--cnt == 0) {
-                                                VERB4 bb_error_msg("disabling burst mode");
+                                                VERB4 bb_simple_error_msg("disabling burst mode");
                                                G.polladj_count = 0;
                                                G.poll_exp = MINPOLL;
                                        }
diff --git a/networking/ping.c b/networking/ping.c
index b534c74c7..a47342fee 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -184,8 +184,8 @@ create_icmp_socket(void)
                sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */
        if (sock < 0) {
                if (errno == EPERM)
-                        bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+                        bb_simple_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-                bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
+                bb_simple_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
        }
        xmove_fd(sock, pingsock);
@@ -235,7 +235,7 @@ static void ping4(len_and_sockaddr *lsa)
 #endif
                if (c < 0) {
                        if (errno != EINTR)
-                                bb_perror_msg("recvfrom");
+                                bb_simple_perror_msg("recvfrom");
                        continue;
                }
                if (c >= 76) {                  /* ip + icmp */
@@ -280,7 +280,7 @@ static void ping6(len_and_sockaddr *lsa)
 #endif
                if (c < 0) {
                        if (errno != EINTR)
-                                bb_perror_msg("recvfrom");
+                                bb_simple_perror_msg("recvfrom");
                        continue;
                }
                if (c >= ICMP_MINLEN) { /* icmp6_hdr */
@@ -482,7 +482,7 @@ static void sendping_tail(void (*sp)(int), int size_pkt)
         * it doesn't matter */
        sz = xsendto(pingsock, G.snd_packet, size_pkt, &pingaddr.sa, sizeof(pingaddr));
        if (sz != size_pkt)
-                bb_error_msg_and_die(bb_msg_write_error);
+                bb_simple_error_msg_and_die(bb_msg_write_error);
        if (pingcount == 0 || G.ntransmitted < pingcount) {
                /* Didn't send all pings yet - schedule next in -i SEC interval */
@@ -723,7 +723,7 @@ static void ping4(len_and_sockaddr *lsa)
        if (source_lsa) {
                if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF,
                                &source_lsa->u.sa, source_lsa->len))
-                        bb_error_msg_and_die("can't set multicast source interface");
+                        bb_simple_error_msg_and_die("can't set multicast source interface");
                xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
        }
@@ -757,7 +757,7 @@ static void ping4(len_and_sockaddr *lsa)
                                (struct sockaddr *) &from, &fromlen);
                if (c < 0) {
                        if (errno != EINTR)
-                                bb_perror_msg("recvfrom");
+                                bb_simple_perror_msg("recvfrom");
                        continue;
                }
                c = unpack4(G.rcv_packet, c, &from);
@@ -838,7 +838,7 @@ static void ping6(len_and_sockaddr *lsa)
                c = recvmsg(pingsock, &msg, 0);
                if (c < 0) {
                        if (errno != EINTR)
-                                bb_perror_msg("recvfrom");
+                                bb_simple_perror_msg("recvfrom");
                        continue;
                }
                for (mp = CMSG_FIRSTHDR(&msg); mp; mp = CMSG_NXTHDR(&msg, mp)) {
diff --git a/networking/route.c b/networking/route.c
index ac1d94c28..a5d8d7cb9 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -336,7 +336,7 @@ static NOINLINE void INET_setroute(int action, char **args)
                }
                mask = ((struct sockaddr_in *) &rt->rt_dst)->sin_addr.s_addr;
                if (mask & ~(uint32_t)mask_in_addr(*rt)) {
-                        bb_error_msg_and_die("netmask and route address conflict");
+                        bb_simple_error_msg_and_die("netmask and route address conflict");
                }
        }
@@ -532,7 +532,7 @@ void FAST_FUNC bb_displayroutes(int noresolve, int netstatfmt)
                        if ((r < 0) && feof(fp)) { /* EOF with no (nonspace) chars read. */
                                break;
                        }
-                        bb_perror_msg_and_die(bb_msg_read_error);
+                        bb_simple_perror_msg_and_die(bb_msg_read_error);
                }
                if (!(flgs & RTF_UP)) { /* Skip interfaces that are down. */
@@ -598,7 +598,7 @@ static void INET6_displayroutes(void)
                                break;
                        }
 ERROR:
-                        bb_perror_msg_and_die(bb_msg_read_error);
+                        bb_simple_perror_msg_and_die(bb_msg_read_error);
                }
                /* Do the addr6x shift-and-insert changes to ':'-delimit addresses.
diff --git a/networking/slattach.c b/networking/slattach.c
index c6feca248..659822a91 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -56,7 +56,7 @@ static int tcsetattr_serial_or_warn(struct termios *state)
        ret = tcsetattr(serial_fd, TCSANOW, state);
        if (ret != 0) {
-                bb_perror_msg("tcsetattr");
+                bb_simple_perror_msg("tcsetattr");
                return 1; /* used as exitcode */
        }
        return ret; /* 0 */
@@ -159,7 +159,7 @@ int slattach_main(int argc UNUSED_PARAM, char **argv)
        /* Save current tty state */
        if (tcgetattr(serial_fd, &G.saved_state) != 0)
-                bb_perror_msg_and_die("tcgetattr");
+                bb_simple_perror_msg_and_die("tcgetattr");
        /* Save line discipline */
        xioctl(serial_fd, TIOCGETD, &G.saved_disc);
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index a0af64981..8c4afabf6 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -325,7 +325,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
        client = 0;
        if ((getuid() == 0) && !(opts & OPT_u)) {
                xfunc_error_retval = 100;
-                bb_error_msg_and_die(bb_msg_you_must_be_root);
+                bb_simple_error_msg_and_die(bb_msg_you_must_be_root);
        }
        if (opts & OPT_u)
                if (!uidgid_get(&sslugid, ssluser, 1)) {
@@ -419,7 +419,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
        sig_block(SIGCHLD);
        if (conn < 0) {
                if (errno != EINTR)
-                        bb_perror_msg(tcp ? "accept" : "recv");
+                        bb_simple_perror_msg(tcp ? "accept" : "recv");
                goto again2;
        }
        xmove_fd(tcp ? conn : sock, 0);
@@ -484,7 +484,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
        pid = vfork();
        if (pid == -1) {
-                bb_perror_msg("vfork");
+                bb_simple_perror_msg("vfork");
                goto again;
        }
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 6abecbde2..29f805de7 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -495,7 +495,7 @@ make_new_session(
                free(ts);
                close(fd);
                /* sock will be closed by caller */
-                bb_perror_msg("vfork");
+                bb_simple_perror_msg("vfork");
                return NULL;
        }
        if (pid > 0) {
diff --git a/networking/tftp.c b/networking/tftp.c
index 5ebd22105..04bfe844f 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -31,6 +31,11 @@
 //config:       default y
 //config:       depends on TFTP
 //config:
+//config:config FEATURE_TFTP_HPA_COMPAT
+//config:       bool "tftp-hpa compat (support -c get/put FILE)"
+//config:       default y
+//config:       depends on TFTP
+//config:
 //config:config TFTPD
 //config:       bool "tftpd (10 kb)"
 //config:       default y
@@ -101,9 +106,10 @@
 //usage:        IF_FEATURE_TFTP_BLOCKSIZE(
 //usage:     "\n        -b SIZE Transfer blocks of SIZE octets"
 //usage:        )
+///////:     "\n        -m STR  Accepted and ignored ('-m binary' compat with tftp-hpa 5.2)"
 //usage:
 //usage:#define tftpd_trivial_usage
-//usage:       "[-cr] [-u USER] [DIR]"
+//usage:       "[-crl] [-u USER] [DIR]"
 //usage:#define tftpd_full_usage "\n\n"
 //usage:       "Transfer a file on tftp client's request\n"
 //usage:       "\n"
@@ -447,7 +453,7 @@ static int tftp_protocol(
                /* fill in packet if the filename fits into xbuf */
                len = strlen(remote_file) + 1;
                if (2 + len + sizeof("octet") >= io_bufsize) {
-                        bb_error_msg("remote filename is too long");
+                        bb_simple_error_msg("remote filename is too long");
                        goto ret;
                }
                strcpy(cp, remote_file);
@@ -462,7 +468,7 @@ static int tftp_protocol(
                /* Need to add option to pkt */
                if ((&xbuf[io_bufsize - 1] - cp) < sizeof("blksize NNNNN tsize ") + sizeof(off_t)*3) {
-                        bb_error_msg("remote filename is too long");
+                        bb_simple_error_msg("remote filename is too long");
                        goto ret;
                }
                expect_OACK = 1;
@@ -563,7 +569,7 @@ static int tftp_protocol(
                        retries--;
                        if (retries == 0) {
                                tftp_progress_done();
-                                bb_error_msg("timeout");
+                                bb_simple_error_msg("timeout");
                                goto ret; /* no err packet sent */
                        }
@@ -668,7 +674,7 @@ static int tftp_protocol(
                         * must be ignored by the client and server
                         * as if it were never requested." */
                        if (blksize != TFTP_BLKSIZE_DEFAULT)
-                                bb_error_msg("falling back to blocksize "TFTP_BLKSIZE_DEFAULT_STR);
+                                bb_simple_error_msg("falling back to blocksize "TFTP_BLKSIZE_DEFAULT_STR);
                        blksize = TFTP_BLKSIZE_DEFAULT;
                        io_bufsize = TFTP_BLKSIZE_DEFAULT + 4;
                }
@@ -733,7 +739,7 @@ static int tftp_protocol(
        strcpy(G_error_pkt_str, bb_msg_read_error);
 send_err_pkt:
        if (G_error_pkt_str[0])
-                bb_error_msg("%s", G_error_pkt_str);
+                bb_simple_error_msg(G_error_pkt_str);
        G.error_pkt[1] = TFTP_ERROR;
        xsendto(socket_fd, G.error_pkt, 4 + 1 + strlen(G_error_pkt_str),
                        &peer_lsa->u.sa, peer_lsa->len);
@@ -759,15 +765,54 @@ int tftp_main(int argc UNUSED_PARAM, char **argv)
        INIT_G();
+        if (ENABLE_FEATURE_TFTP_HPA_COMPAT) {
+                /* As of 2019, common tftp client in Linux distros
+                 * is one maintained by H. Peter Anvin:
+                 * I've seen "tftp-hpa 5.2" version.
+                 * Make the following command work:
+                 *  "tftp HOST [PORT] -m binary -c get/put FILE"
+                 * by mangling it into "....... -g/-p -r FILE"
+                 * and accepting and ignoring -m STR option.
+                 */
+                unsigned i = 1;
+                while (argv[i]) {
+                        /* Accept not only -c, but also
+                         * -lc, -cl, -llcclcllcc etc:
+                         * "-l Literal mode (do not recognize HOST:FILE)"
+                         * since we do not recognize that syntax anyway,
+                         * might as well allow the option.
+                         */
+                        if (argv[i][0] == '-' && strchr(argv[i], 'c')
+                         /*&& argv[i][1+strspn(argv[i]+1, "lc")] == '\0'*/
+                        ) {
+                                if (!argv[++i])
+                                        break;
+                                if (strcmp(argv[i], "get") == 0) {
+                                        argv[i-1] = (char*)"-g";
+                                        argv[i] = (char*)"-r";
+                                        break;
+                                }
+                                if (strcmp(argv[i], "put") == 0) {
+                                        argv[i-1] = (char*)"-p";
+                                        argv[i] = (char*)"-r";
+                                        break;
+                                }
+                        }
+                        i++;
+                }
+        }
        IF_GETPUT(opt =) getopt32(argv, "^"
                        IF_FEATURE_TFTP_GET("g") IF_FEATURE_TFTP_PUT("p")
                        "l:r:" IF_FEATURE_TFTP_BLOCKSIZE("b:")
+                        IF_FEATURE_TFTP_HPA_COMPAT("m:")
                        "\0"
                        /* -p or -g is mandatory, and they are mutually exclusive */
                        IF_FEATURE_TFTP_GET("g:") IF_FEATURE_TFTP_PUT("p:")
                        IF_GETPUT("g--p:p--g:"),
                        &local_file, &remote_file
                        IF_FEATURE_TFTP_BLOCKSIZE(, &blksize_str)
+                        IF_FEATURE_TFTP_HPA_COMPAT(, NULL)
        );
        argv += optind;
@@ -897,6 +942,7 @@ int tftpd_main(int argc UNUSED_PARAM, char **argv)
        mode = local_file + strlen(local_file) + 1;
        /* RFC 1350 says mode string is case independent */
        if (mode >= G.block_buf + result || strcasecmp(mode, "octet") != 0) {
+                error_msg = "mode is not 'octet'";
                goto err;
        }
 # if ENABLE_FEATURE_TFTP_BLOCKSIZE
@@ -944,7 +990,8 @@ int tftpd_main(int argc UNUSED_PARAM, char **argv)
        /* tftp_protocol() will create new one, bound to particular local IP */
        result = tftp_protocol(
                our_lsa, peer_lsa,
-                local_file IF_TFTP(, NULL /*remote_file*/)
+                local_file
+                IF_TFTP(, NULL /*remote_file*/)
                IF_FEATURE_TFTP_BLOCKSIZE(, want_transfer_size)
                IF_FEATURE_TFTP_BLOCKSIZE(, blksize)
        );
diff --git a/networking/tls.c b/networking/tls.c
index d1a0204ed..9e81afbad 100644
--- a/networking/tls.c
+++ b/networking/tls.c
@@ -452,7 +452,7 @@ static void hmac_begin(hmac_precomputed_t *pre, uint8_t *key, unsigned key_size,
        // than INSIZE bytes will first hash the key using H and then use the
        // resultant OUTSIZE byte string as the actual key to HMAC."
        if (key_size > SHA_INSIZE) {
-                bb_error_msg_and_die("HMAC key>64"); //does not happen (yet?)
+                bb_simple_error_msg_and_die("HMAC key>64"); //does not happen (yet?)
 //              md5sha_ctx_t ctx;
 //              begin(&ctx);
 //              md5sha_hash(&ctx, key, key_size);
@@ -1138,7 +1138,7 @@ static int tls_xread_record(tls_state_t *tls, const char *expected)
                }
        }
        if (sz < 0)
-                bb_error_msg_and_die("encrypted data too short");
+                bb_simple_error_msg_and_die("encrypted data too short");
        //dump_hex("<< %s\n", tls->inbuf, RECHDR_LEN + sz);
@@ -1417,7 +1417,7 @@ static void find_key_in_der_cert(tls_state_t *tls, uint8_t *der, int len)
                        dbg("ECDSA key\n");
                        //UNUSED: tls->flags |= GOT_CERT_ECDSA_KEY_ALG;
                } else
-                        bb_error_msg_and_die("not RSA or ECDSA cert");
+                        bb_simple_error_msg_and_die("not RSA or ECDSA cert");
        }
        if (tls->flags & GOT_CERT_RSA_KEY_ALG) {
@@ -1888,7 +1888,7 @@ static void process_server_key(tls_state_t *tls, int len)
        /* So far we only support curve_x25519 */
        move_from_unaligned32(t32, keybuf);
        if (t32 != htonl(0x03001d20))
-                bb_error_msg_and_die("elliptic curve is not x25519");
+                bb_simple_error_msg_and_die("elliptic curve is not x25519");
        memcpy(tls->hsd->ecc_pub_key32, keybuf + 4, 32);
        tls->flags |= GOT_EC_KEY;
@@ -1935,7 +1935,7 @@ static void send_client_key_exchange(tls_state_t *tls)
        if (!(tls->flags & NEED_EC_KEY)) {
                /* RSA */
                if (!(tls->flags & GOT_CERT_RSA_KEY_ALG))
-                        bb_error_msg("server cert is not RSA");
+                        bb_simple_error_msg("server cert is not RSA");
                tls_get_random(rsa_premaster, sizeof(rsa_premaster));
                if (TLS_DEBUG_FIXED_SECRETS)
@@ -1965,7 +1965,7 @@ static void send_client_key_exchange(tls_state_t *tls)
                uint8_t privkey[CURVE25519_KEYSIZE]; //[32]
                if (!(tls->flags & GOT_EC_KEY))
-                        bb_error_msg("server did not provide EC key");
+                        bb_simple_error_msg("server did not provide EC key");
                /* Generate random private key, see RFC 7748 */
                tls_get_random(privkey, sizeof(privkey));
@@ -2328,7 +2328,7 @@ void FAST_FUNC tls_run_copy_loop(tls_state_t *tls, unsigned flags)
                int nread;
                if (safe_poll(pfds, 2, -1) < 0)
-                        bb_perror_msg_and_die("poll");
+                        bb_simple_perror_msg_and_die("poll");
                if (pfds[0].revents) {
                        void *buf;
diff --git a/networking/tls.h b/networking/tls.h
index 494ed78c4..d4ac1bef8 100644
--- a/networking/tls.h
+++ b/networking/tls.h
@@ -90,7 +90,7 @@ void xorbuf_aligned_AES_BLOCK_SIZE(void* buf, const void* mask) FAST_FUNC;
 #define matrixCryptoGetPrngData(buf, len, userPtr) (tls_get_random(buf, len), PS_SUCCESS)
 #define psFree(p, pool)    free(p)
-#define psTraceCrypto(...) bb_error_msg_and_die(__VA_ARGS__)
+#define psTraceCrypto(msg) bb_simple_error_msg_and_die(msg)
 /* Secure zerofill */
 #define memset_s(A,B,C,D) memset((A),(C),(D))
diff --git a/networking/traceroute.c b/networking/traceroute.c
index bdf451186..0435d6ba6 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -875,7 +875,7 @@ common_traceroute_main(int op, char **argv)
                 * probe (e.g., on a multi-homed host).
                 */
                if (getuid() != 0)
-                        bb_error_msg_and_die(bb_msg_you_must_be_root);
+                        bb_simple_error_msg_and_die(bb_msg_you_must_be_root);
        }
        if (op & OPT_WAITTIME)
                waittime = xatou_range(waittime_str, 1, 24 * 60 * 60);
@@ -1003,7 +1003,7 @@ common_traceroute_main(int op, char **argv)
                if (af == AF_INET)
                        if (setsockopt(sndsock, IPPROTO_IP, IP_MULTICAST_IF,
                                        &source_lsa->u.sa, source_lsa->len))
-                                bb_error_msg_and_die("can't set multicast source interface");
+                                bb_simple_error_msg_and_die("can't set multicast source interface");
 //TODO: we can query source port we bound to,
 // and check it in replies... if we care enough
                xbind(sndsock, &source_lsa->u.sa, source_lsa->len);
@@ -1025,7 +1025,7 @@ common_traceroute_main(int op, char **argv)
                /* read IP and port */
                source_lsa = get_sock_lsa(probe_fd);
                if (source_lsa == NULL)
-                        bb_error_msg_and_die("can't get probe addr");
+                        bb_simple_error_msg_and_die("can't get probe addr");
                close(probe_fd);
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index f16fc0a4f..8ef24748e 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -116,7 +116,7 @@ config FEATURE_UDHCP_PORT
 config UDHCP_DEBUG
        int "Maximum verbosity level (0..9)"
-        default 9
+        default 2
        range 0 9
        depends on UDHCPD || UDHCPC || UDHCPC6 || DHCPRELAY
        help
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index 215d023ce..a395e838d 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -53,12 +53,12 @@ int FAST_FUNC arpping(uint32_t test_nip,
        s = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_ARP));
        if (s == -1) {
-                bb_perror_msg(bb_msg_can_not_create_raw_socket);
+                bb_simple_perror_msg(bb_msg_can_not_create_raw_socket);
                return -1;
        }
        if (setsockopt_broadcast(s) == -1) {
-                bb_perror_msg("can't enable bcast on raw socket");
+                bb_simple_perror_msg("can't enable bcast on raw socket");
                goto ret;
        }
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 62ad248ce..4a452cdb9 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -240,7 +240,7 @@ uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code)
        while (1) {
                if (rem <= 0) {
 complain:
-                        bb_error_msg("bad packet, malformed option field");
+                        bb_simple_error_msg("bad packet, malformed option field");
                        return NULL;
                }
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index bba3d6037..60255eefa 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -267,26 +267,45 @@ struct option_set *udhcp_find_option(struct option_set *opt_list, uint8_t code)
 # define IF_UDHCP_VERBOSE(...) __VA_ARGS__
 extern unsigned dhcp_verbose;
 # define log1(...) do { if (dhcp_verbose >= 1) bb_info_msg(__VA_ARGS__); } while (0)
+# define log1s(msg) do { if (dhcp_verbose >= 1) bb_simple_info_msg(msg); } while (0)
 # if CONFIG_UDHCP_DEBUG >= 2
 void udhcp_dump_packet(struct dhcp_packet *packet) FAST_FUNC;
 #  define log2(...) do { if (dhcp_verbose >= 2) bb_info_msg(__VA_ARGS__); } while (0)
+#  define log2s(msg) do { if (dhcp_verbose >= 2) bb_simple_info_msg(msg); } while (0)
 # else
 #  define udhcp_dump_packet(...) ((void)0)
 #  define log2(...) ((void)0)
+#  define log2s(msg) ((void)0)
 # endif
 # if CONFIG_UDHCP_DEBUG >= 3
 #  define log3(...) do { if (dhcp_verbose >= 3) bb_info_msg(__VA_ARGS__); } while (0)
+#  define log3s(msg) do { if (dhcp_verbose >= 3) bb_simple_info_msg(msg); } while (0)
 # else
 #  define log3(...) ((void)0)
+#  define log3s(msg) ((void)0)
 # endif
 #else
 # define IF_UDHCP_VERBOSE(...)
 # define udhcp_dump_packet(...) ((void)0)
 # define log1(...) ((void)0)
+# define log1s(msg) ((void)0)
 # define log2(...) ((void)0)
+# define log2s(msg) ((void)0)
 # define log3(...) ((void)0)
+# define log3s(msg) ((void)0)
 #endif
+#if defined(__mips__)
+/*
+ * The 'simple' message functions have a negative impact on the size of the
+ * DHCP code when compiled for MIPS, so don't use them in this case.
+ */
+#define bb_simple_info_msg bb_info_msg
+#define bb_simple_error_msg bb_error_msg
+#define bb_simple_perror_msg_and_die bb_perror_msg_and_die
+#undef log1s
+#define log1s log1
+#endif
 /*** Other shared functions ***/
diff --git a/networking/udhcp/d6_common.h b/networking/udhcp/d6_common.h
index dee2558e2..688f5d6c7 100644
--- a/networking/udhcp/d6_common.h
+++ b/networking/udhcp/d6_common.h
@@ -34,7 +34,7 @@ struct d6_packet {
                uint8_t d6_msg_type;
                uint32_t d6_xid32;
        } d6_u;
-        uint8_t d6_options[576 - sizeof(struct iphdr) - sizeof(struct udphdr) - 4
+        uint8_t d6_options[576 - sizeof(struct ip6_hdr) - sizeof(struct udphdr) - 4
                        + CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS];
 } PACKED;
 #define d6_msg_type d6_u.d6_msg_type
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 15e9f3924..9d8e17c51 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -235,7 +235,7 @@ static char *string_option_to_env(const uint8_t *option,
 found:
        val_len = (option[2] << 8) | option[3];
        if (val_len + &option[D6_OPT_DATA] > option_end) {
-                bb_error_msg("option data exceeds option length");
+                bb_simple_error_msg("option data exceeds option length");
                return NULL;
        }
        return xasprintf("%s=%.*s", name, val_len, (char*)option + 4);
@@ -643,7 +643,7 @@ static NOINLINE int send_d6_discover(uint32_t xid, struct in6_addr *requested_ip
                client6_data.ia_na = xzalloc(len);
                client6_data.ia_na->code = D6_OPT_IA_NA;
                client6_data.ia_na->len = len - 4;
-                *(uint32_t*)client6_data.ia_na->data = rand(); /* IAID */
+                *(bb__aliased_uint32_t*)client6_data.ia_na->data = rand(); /* IAID */
                if (requested_ipv6) {
                        struct d6_option *iaaddr = (void*)(client6_data.ia_na->data + 4+4+4);
                        iaaddr->code = D6_OPT_IAADDR;
@@ -661,7 +661,7 @@ static NOINLINE int send_d6_discover(uint32_t xid, struct in6_addr *requested_ip
                client6_data.ia_pd = xzalloc(len);
                client6_data.ia_pd->code = D6_OPT_IA_PD;
                client6_data.ia_pd->len = len - 4;
-                *(uint32_t*)client6_data.ia_pd->data = rand(); /* IAID */
+                *(bb__aliased_uint32_t*)client6_data.ia_pd->data = rand(); /* IAID */
                opt_ptr = mempcpy(opt_ptr, client6_data.ia_pd, len);
        }
@@ -848,19 +848,19 @@ static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6, struct d6_pac
        bytes = safe_read(fd, &packet, sizeof(packet));
        if (bytes < 0) {
-                log1("packet read error, ignoring");
+                log1s("packet read error, ignoring");
                /* NB: possible down interface, etc. Caller should pause. */
                return bytes; /* returns -1 */
        }
        if (bytes < (int) (sizeof(packet.ip6) + sizeof(packet.udp))) {
-                log1("packet is too short, ignoring");
+                log1s("packet is too short, ignoring");
                return -2;
        }
        if (bytes < sizeof(packet.ip6) + ntohs(packet.ip6.ip6_plen)) {
                /* packet is bigger than sizeof(packet), we did partial read */
-                log1("oversized packet, ignoring");
+                log1s("oversized packet, ignoring");
                return -2;
        }
@@ -874,7 +874,7 @@ static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6, struct d6_pac
        /* || bytes > (int) sizeof(packet) - can't happen */
         || packet.udp.len != packet.ip6.ip6_plen
        ) {
-                log1("unrelated/bogus packet, ignoring");
+                log1s("unrelated/bogus packet, ignoring");
                return -2;
        }
@@ -981,7 +981,7 @@ static int d6_raw_socket(int ifindex)
        log2("opening raw socket on ifindex %d", ifindex);
        fd = xsocket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IPV6));
-        log2("got raw socket fd %d", fd);
+        log3("got raw socket fd %d", fd);
        memset(&sock, 0, sizeof(sock)); /* let's be deterministic */
        sock.sll_family = AF_PACKET;
@@ -1003,7 +1003,7 @@ static int d6_raw_socket(int ifindex)
        }
 #endif
-        log1("created raw socket");
+        log1s("created raw socket");
        return fd;
 }
@@ -1031,7 +1031,7 @@ static void change_listen_mode(int new_mode)
 /* Called only on SIGUSR1 */
 static void perform_renew(void)
 {
-        bb_info_msg("performing DHCP renew");
+        bb_simple_info_msg("performing DHCP renew");
        switch (client_data.state) {
        case BOUND:
                change_listen_mode(LISTEN_KERNEL);
@@ -1059,10 +1059,10 @@ static void perform_d6_release(struct in6_addr *server_ipv6, struct in6_addr *ou
         || client_data.state == REBINDING
         || client_data.state == RENEW_REQUESTED
        ) {
-                bb_info_msg("unicasting a release");
+                bb_simple_info_msg("unicasting a release");
                send_d6_release(server_ipv6, our_cur_ipv6); /* unicast */
        }
-        bb_info_msg("entering released state");
+        bb_simple_info_msg("entering released state");
 /*
 * We can be here on: SIGUSR2,
 * or on exit (SIGTERM) and -R "release on quit" is specified.
@@ -1174,6 +1174,10 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
        client_data.script = CONFIG_UDHCPC_DEFAULT_SCRIPT;
        client_data.sockfd = -1;
+        /* Make sure fd 0,1,2 are open */
+        /* Set up the signal pipe on fds 3,4 - must be before openlog() */
+        udhcp_sp_setup();
        /* Parse command line */
        opt = getopt32long(argv, "^"
                /* O,x: list; -T,-t,-A take numeric param */
@@ -1268,14 +1272,10 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                logmode |= LOGMODE_SYSLOG;
        }
-        /* Make sure fd 0,1,2 are open */
-        bb_sanitize_stdio();
        /* Create pidfile */
        write_pidfile(client_data.pidfile);
        /* Goes to stdout (unless NOMMU) and possibly syslog */
-        bb_info_msg("started, v"BB_VER);
+        bb_simple_info_msg("started, v"BB_VER);
-        /* Set up the signal pipe */
-        udhcp_sp_setup();
        client_data.state = INIT_SELECTING;
        d6_run_script_no_option("deconfig");
@@ -1321,7 +1321,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                        continue;
                                }
                                /* Else: an error occured, panic! */
-                                bb_perror_msg_and_die("poll");
+                                bb_simple_perror_msg_and_die("poll");
                        }
                }
@@ -1362,7 +1362,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                d6_run_script_no_option("leasefail");
 #if BB_MMU /* -b is not supported on NOMMU */
                                if (opt & OPT_b) { /* background if no lease */
-                                        bb_info_msg("no lease, forking to background");
+                                        bb_simple_info_msg("no lease, forking to background");
                                        client_background();
                                        /* do not background again! */
                                        opt = ((opt & ~(OPT_b|OPT_n)) | OPT_f);
@@ -1375,7 +1375,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                } else
 #endif
                                if (opt & OPT_n) { /* abort if no lease */
-                                        bb_info_msg("no lease, failing");
+                                        bb_simple_info_msg("no lease, failing");
                                        retval = 1;
                                        goto ret;
                                }
@@ -1403,7 +1403,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                client_data.state = RENEWING;
                                client_data.first_secs = 0; /* make secs field count from 0 */
                                change_listen_mode(LISTEN_KERNEL);
-                                log1("entering renew state");
+                                log1s("entering renew state");
                                /* fall right through */
                        case RENEW_REQUESTED: /* manual (SIGUSR1) renew */
                        case_RENEW_REQUESTED:
@@ -1423,7 +1423,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                        continue;
                                }
                                /* Timed out, enter rebinding state */
-                                log1("entering rebinding state");
+                                log1s("entering rebinding state");
                                client_data.state = REBINDING;
                                /* fall right through */
                        case REBINDING:
@@ -1438,7 +1438,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                        continue;
                                }
                                /* Timed out, enter init state */
-                                bb_info_msg("lease lost, entering init state");
+                                bb_simple_info_msg("lease lost, entering init state");
                                d6_run_script_no_option("deconfig");
                                client_data.state = INIT_SELECTING;
                                client_data.first_secs = 0; /* make secs field count from 0 */
@@ -1560,7 +1560,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                }
                                option = d6_copy_option(packet.d6_options, packet_end, D6_OPT_SERVERID);
                                if (!option) {
-                                        bb_info_msg("no server ID, ignoring packet");
+                                        bb_simple_info_msg("no server ID, ignoring packet");
                                        continue;
                                        /* still selecting - this server looks bad */
                                }
diff --git a/networking/udhcp/d6_packet.c b/networking/udhcp/d6_packet.c
index 01d1c930b..446497e15 100644
--- a/networking/udhcp/d6_packet.c
+++ b/networking/udhcp/d6_packet.c
@@ -35,12 +35,12 @@ int FAST_FUNC d6_recv_kernel_packet(struct in6_addr *peer_ipv6
        memset(packet, 0, sizeof(*packet));
        bytes = safe_read(fd, packet, sizeof(*packet));
        if (bytes < 0) {
-                log1("packet read error, ignoring");
+                log1s("packet read error, ignoring");
                return bytes; /* returns -1 */
        }
        if (bytes < offsetof(struct d6_packet, d6_options)) {
-                bb_info_msg("packet with bad magic, ignoring");
+                bb_simple_info_msg("packet with bad magic, ignoring");
                return -2;
        }
        log1("received %s", "a packet");
diff --git a/networking/udhcp/d6_socket.c b/networking/udhcp/d6_socket.c
index 25e622d6f..8ddee5a8e 100644
--- a/networking/udhcp/d6_socket.c
+++ b/networking/udhcp/d6_socket.c
@@ -115,7 +115,7 @@ int FAST_FUNC d6_listen_socket(int port, const char *inf)
        setsockopt_reuseaddr(fd);
        if (setsockopt_broadcast(fd) == -1)
-                bb_perror_msg_and_die("SO_BROADCAST");
+                bb_simple_perror_msg_and_die("SO_BROADCAST");
        /* NB: bug 1032 says this doesn't work on ethernet aliases (ethN:M) */
        if (setsockopt_bindtodevice(fd, inf))
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index cb85fa9e3..656295ff7 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -449,15 +449,16 @@ static char **fill_envp(struct dhcp_packet *packet)
        memset(found_opts, 0, sizeof(found_opts));
-        /* We need 6 elements for:
+        /* We need 7 elements for:
         * "interface=IFACE"
         * "ip=N.N.N.N" from packet->yiaddr
+         * "giaddr=IP" from packet->gateway_nip (unless 0)
         * "siaddr=IP" from packet->siaddr_nip (unless 0)
         * "boot_file=FILE" from packet->file (unless overloaded)
         * "sname=SERVER_HOSTNAME" from packet->sname (unless overloaded)
         * terminating NULL
         */
-        envc = 6;
+        envc = 7;
        /* +1 element for each option, +2 for subnet option: */
        if (packet) {
                /* note: do not search for "pad" (0) and "end" (255) options */
@@ -493,9 +494,7 @@ static char **fill_envp(struct dhcp_packet *packet)
         * uint16_t flags;  // only one flag so far: bcast. Never set by server
         * uint32_t ciaddr; // client IP (usually == yiaddr. can it be different
         *                  // if during renew server wants to give us different IP?)
-         * uint32_t gateway_nip; // relay agent IP address
         * uint8_t chaddr[16]; // link-layer client hardware address (MAC)
-         * TODO: export gateway_nip as $giaddr?
         */
        /* Most important one: yiaddr as $ip */
        *curr = xmalloc(sizeof("ip=255.255.255.255"));
@@ -507,6 +506,12 @@ static char **fill_envp(struct dhcp_packet *packet)
                sprint_nip(*curr, "siaddr=", (uint8_t *) &packet->siaddr_nip);
                putenv(*curr++);
        }
+        if (packet->gateway_nip) {
+                /* IP address of DHCP relay agent */
+                *curr = xmalloc(sizeof("giaddr=255.255.255.255"));
+                sprint_nip(*curr, "giaddr=", (uint8_t *) &packet->gateway_nip);
+                putenv(*curr++);
+        }
        if (!(overload & FILE_FIELD) && packet->file[0]) {
                /* watch out for invalid packets */
                *curr = xasprintf("boot_file=%."DHCP_PKT_FILE_LEN_STR"s", packet->file);
@@ -901,7 +906,7 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
                if (bytes < 0) {
                        if (errno == EINTR)
                                continue;
-                        log1("packet read error, ignoring");
+                        log1s("packet read error, ignoring");
                        /* NB: possible down interface, etc. Caller should pause. */
                        return bytes; /* returns -1 */
                }
@@ -909,13 +914,13 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
        }
        if (bytes < (int) (sizeof(packet.ip) + sizeof(packet.udp))) {
-                log1("packet is too short, ignoring");
+                log1s("packet is too short, ignoring");
                return -2;
        }
        if (bytes < ntohs(packet.ip.tot_len)) {
                /* packet is bigger than sizeof(packet), we did partial read */
-                log1("oversized packet, ignoring");
+                log1s("oversized packet, ignoring");
                return -2;
        }
@@ -930,7 +935,7 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
        /* || bytes > (int) sizeof(packet) - can't happen */
         || ntohs(packet.udp.len) != (uint16_t)(bytes - sizeof(packet.ip))
        ) {
-                log1("unrelated/bogus packet, ignoring");
+                log1s("unrelated/bogus packet, ignoring");
                return -2;
        }
@@ -938,7 +943,7 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
        check = packet.ip.check;
        packet.ip.check = 0;
        if (check != inet_cksum((uint16_t *)&packet.ip, sizeof(packet.ip))) {
-                log1("bad IP header checksum, ignoring");
+                log1s("bad IP header checksum, ignoring");
                return -2;
        }
@@ -963,13 +968,13 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
        check = packet.udp.check;
        packet.udp.check = 0;
        if (check && check != inet_cksum((uint16_t *)&packet, bytes)) {
-                log1("packet with bad UDP checksum received, ignoring");
+                log1s("packet with bad UDP checksum received, ignoring");
                return -2;
        }
 skip_udp_sum_check:
        if (packet.data.cookie != htonl(DHCP_MAGIC)) {
-                bb_info_msg("packet with bad magic, ignoring");
+                bb_simple_info_msg("packet with bad magic, ignoring");
                return -2;
        }
@@ -1017,7 +1022,7 @@ static int udhcp_raw_socket(int ifindex)
         * SOCK_DGRAM: remove link-layer headers on input (SOCK_RAW keeps them)
         * ETH_P_IP: want to receive only packets with IPv4 eth type
         */
-        log2("got raw socket fd");
+        log3("got raw socket fd %d", fd);
        memset(&sock, 0, sizeof(sock)); /* let's be deterministic */
        sock.sll_family = AF_PACKET;
@@ -1084,10 +1089,10 @@ static int udhcp_raw_socket(int ifindex)
        if (setsockopt_1(fd, SOL_PACKET, PACKET_AUXDATA) != 0) {
                if (errno != ENOPROTOOPT)
-                        log1("can't set PACKET_AUXDATA on raw socket");
+                        log1s("can't set PACKET_AUXDATA on raw socket");
        }
-        log1("created raw socket");
+        log1s("created raw socket");
        return fd;
 }
@@ -1115,7 +1120,7 @@ static void change_listen_mode(int new_mode)
 /* Called only on SIGUSR1 */
 static void perform_renew(void)
 {
-        bb_info_msg("performing DHCP renew");
+        bb_simple_info_msg("performing DHCP renew");
        switch (client_data.state) {
        case BOUND:
                change_listen_mode(LISTEN_KERNEL);
@@ -1153,7 +1158,7 @@ static void perform_release(uint32_t server_addr, uint32_t requested_ip)
                                inet_ntoa(temp_addr), buffer);
                send_release(server_addr, requested_ip); /* unicast */
        }
-        bb_info_msg("entering released state");
+        bb_simple_info_msg("entering released state");
 /*
 * We can be here on: SIGUSR2,
 * or on exit (SIGTERM) and -R "release on quit" is specified.
@@ -1271,6 +1276,10 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
        client_data.sockfd = -1;
        str_V = "udhcp "BB_VER;
+        /* Make sure fd 0,1,2 are open */
+        /* Set up the signal pipe on fds 3,4 - must be before openlog() */
+        udhcp_sp_setup();
        /* Parse command line */
        opt = getopt32long(argv, "^"
                /* O,x: list; -T,-t,-A take numeric param */
@@ -1294,7 +1303,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
        );
        if (opt & (OPT_h|OPT_H)) {
                //msg added 2011-11
-                bb_error_msg("option -h NAME is deprecated, use -x hostname:NAME");
+                bb_simple_error_msg("option -h NAME is deprecated, use -x hostname:NAME");
                client_data.hostname = alloc_dhcp_option(DHCP_HOST_NAME, str_h, 0);
        }
        if (opt & OPT_F) {
@@ -1385,14 +1394,10 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                logmode |= LOGMODE_SYSLOG;
        }
-        /* Make sure fd 0,1,2 are open */
-        bb_sanitize_stdio();
        /* Create pidfile */
        write_pidfile(client_data.pidfile);
        /* Goes to stdout (unless NOMMU) and possibly syslog */
-        bb_info_msg("started, v"BB_VER);
+        bb_simple_info_msg("started, v"BB_VER);
-        /* Set up the signal pipe */
-        udhcp_sp_setup();
        /* We want random_xid to be random... */
        srand(monotonic_us());
@@ -1439,7 +1444,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                        continue;
                                }
                                /* Else: an error occurred, panic! */
-                                bb_perror_msg_and_die("poll");
+                                bb_simple_perror_msg_and_die("poll");
                        }
                }
@@ -1480,7 +1485,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                udhcp_run_script(NULL, "leasefail");
 #if BB_MMU /* -b is not supported on NOMMU */
                                if (opt & OPT_b) { /* background if no lease */
-                                        bb_info_msg("no lease, forking to background");
+                                        bb_simple_info_msg("no lease, forking to background");
                                        client_background();
                                        /* do not background again! */
                                        opt = ((opt & ~(OPT_b|OPT_n)) | OPT_f);
@@ -1493,7 +1498,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                } else
 #endif
                                if (opt & OPT_n) { /* abort if no lease */
-                                        bb_info_msg("no lease, failing");
+                                        bb_simple_info_msg("no lease, failing");
                                        retval = 1;
                                        goto ret;
                                }
@@ -1521,7 +1526,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                client_data.state = RENEWING;
                                client_data.first_secs = 0; /* make secs field count from 0 */
                                change_listen_mode(LISTEN_KERNEL);
-                                log1("entering renew state");
+                                log1s("entering renew state");
                                /* fall right through */
                        case RENEW_REQUESTED: /* manual (SIGUSR1) renew */
                        case_RENEW_REQUESTED:
@@ -1554,7 +1559,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                         */
                                }
                                /* Timed out or error, enter rebinding state */
-                                log1("entering rebinding state");
+                                log1s("entering rebinding state");
                                client_data.state = REBINDING;
                                /* fall right through */
                        case REBINDING:
@@ -1569,7 +1574,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                        continue;
                                }
                                /* Timed out, enter init state */
-                                bb_info_msg("lease lost, entering init state");
+                                bb_simple_info_msg("lease lost, entering init state");
                                udhcp_run_script(NULL, "deconfig");
                                client_data.state = INIT_SELECTING;
                                client_data.first_secs = 0; /* make secs field count from 0 */
@@ -1655,13 +1660,13 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                 || memcmp(packet.chaddr, client_data.client_mac, 6) != 0
                ) {
 //FIXME: need to also check that last 10 bytes are zero
-                        log1("chaddr does not match, ignoring packet"); // log2?
+                        log1("chaddr does not match%s", ", ignoring packet"); // log2?
                        continue;
                }
                message = udhcp_get_option(&packet, DHCP_MESSAGE_TYPE);
                if (message == NULL) {
-                        bb_info_msg("no message type option, ignoring packet");
+                        bb_info_msg("no message type option%s", ", ignoring packet");
                        continue;
                }
@@ -1698,7 +1703,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                server_addr = 0;
                                temp = udhcp_get_option32(&packet, DHCP_SERVER_ID);
                                if (!temp) {
-                                        bb_info_msg("no server ID, using 0.0.0.0");
+                                        bb_simple_info_msg("no server ID, using 0.0.0.0");
                                } else {
                                        /* it IS unaligned sometimes, don't "optimize" */
                                        move_from_unaligned32(server_addr, temp);
@@ -1725,7 +1730,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                temp = udhcp_get_option32(&packet, DHCP_LEASE_TIME);
                                if (!temp) {
-                                        bb_info_msg("no lease time with ACK, using 1 hour lease");
+                                        bb_simple_info_msg("no lease time with ACK, using 1 hour lease");
                                        lease_seconds = 60 * 60;
                                } else {
                                        /* it IS unaligned sometimes, don't "optimize" */
@@ -1758,7 +1763,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                                        client_data.interface,
                                                        arpping_ms)
                                        ) {
-                                                bb_info_msg("offered address is in use "
+                                                bb_simple_info_msg("offered address is in use "
                                                        "(got ARP reply), declining");
                                                send_decline(/*xid,*/ server_addr, packet.yiaddr);
@@ -1822,7 +1827,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                        if (!temp) {
 non_matching_svid:
                                                log1("received DHCP NAK with wrong"
-                                                        " server ID, ignoring packet");
+                                                        " server ID%s", ", ignoring packet");
                                                continue;
                                        }
                                        move_from_unaligned32(svid, temp);
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 058f86bca..3e08ec011 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -37,6 +37,8 @@
 //usage:        IF_FEATURE_UDHCP_PORT(
 //usage:     "\n        -P N    Use port N (default 67)"
 //usage:        )
+//usage:     "\nSignals:"
+//usage:     "\n        USR1    Update lease file"
 #include <netinet/ether.h>
 #include <syslog.h>
@@ -46,7 +48,7 @@
 /* globals */
 #define g_leases ((struct dyn_lease*)ptr_to_globals)
-/* struct server_config_t server_config is in bb_common_bufsiz1 */
+/* struct server_data_t server_data is in bb_common_bufsiz1 */
 struct static_lease {
        struct static_lease *next;
@@ -100,7 +102,7 @@ static void add_static_lease(struct static_lease **st_lease_pp,
 /* Find static lease IP by mac */
 static uint32_t get_static_nip_by_mac(void *mac)
 {
-        struct static_lease *st_lease = server_config.static_leases;
+        struct static_lease *st_lease = server_data.static_leases;
        while (st_lease) {
                if (memcmp(st_lease->mac, mac, 6) == 0)
@@ -113,7 +115,7 @@ static uint32_t get_static_nip_by_mac(void *mac)
 static int is_nip_reserved_as_static(uint32_t nip)
 {
-        struct static_lease *st_lease = server_config.static_leases;
+        struct static_lease *st_lease = server_data.static_leases;
        while (st_lease) {
                if (st_lease->nip == nip)
@@ -133,7 +135,7 @@ static struct dyn_lease *oldest_expired_lease(void)
        /* Unexpired leases have g_leases[i].expires >= current time
         * and therefore can't ever match */
-        for (i = 0; i < server_config.max_leases; i++) {
+        for (i = 0; i < server_data.max_leases; i++) {
                if (g_leases[i].expires == 0 /* empty entry */
                 || g_leases[i].expires < oldest_time
                ) {
@@ -151,7 +153,7 @@ static void clear_leases(const uint8_t *chaddr, uint32_t yiaddr)
 {
        unsigned i;
-        for (i = 0; i < server_config.max_leases; i++) {
+        for (i = 0; i < server_data.max_leases; i++) {
                if ((chaddr && memcmp(g_leases[i].lease_mac, chaddr, 6) == 0)
                 || (yiaddr && g_leases[i].lease_nip == yiaddr)
                ) {
@@ -216,7 +218,7 @@ static struct dyn_lease *find_lease_by_mac(const uint8_t *mac)
 {
        unsigned i;
-        for (i = 0; i < server_config.max_leases; i++)
+        for (i = 0; i < server_data.max_leases; i++)
                if (memcmp(g_leases[i].lease_mac, mac, 6) == 0)
                        return &g_leases[i];
@@ -228,7 +230,7 @@ static struct dyn_lease *find_lease_by_nip(uint32_t nip)
 {
        unsigned i;
-        for (i = 0; i < server_config.max_leases; i++)
+        for (i = 0; i < server_data.max_leases; i++)
                if (g_leases[i].lease_nip == nip)
                        return &g_leases[i];
@@ -242,17 +244,17 @@ static int nobody_responds_to_arp(uint32_t nip, const uint8_t *safe_mac, unsigne
        int r;
        r = arpping(nip, safe_mac,
-                        server_config.server_nip,
+                        server_data.server_nip,
-                        server_config.server_mac,
+                        server_data.server_mac,
-                        server_config.interface,
+                        server_data.interface,
                        arpping_ms);
        if (r)
                return r;
        temp.s_addr = nip;
        bb_info_msg("%s belongs to someone, reserving it for %u seconds",
-                inet_ntoa(temp), (unsigned)server_config.conflict_time);
+                inet_ntoa(temp), (unsigned)server_data.conflict_time);
-        add_lease(NULL, nip, server_config.conflict_time, NULL, 0);
+        add_lease(NULL, nip, server_data.conflict_time, NULL, 0);
        return 0;
 }
@@ -274,12 +276,12 @@ static uint32_t find_free_or_expired_nip(const uint8_t *safe_mac, unsigned arppi
                hash += safe_mac[i] + (hash << 6) + (hash << 16) - hash;
        /* pick a seed based on hwaddr then iterate until we find a free address. */
-        addr = server_config.start_ip
+        addr = server_data.start_ip
-                + (hash % (1 + server_config.end_ip - server_config.start_ip));
+                + (hash % (1 + server_data.end_ip - server_data.start_ip));
        stop = addr;
 #else
-        addr = server_config.start_ip;
+        addr = server_data.start_ip;
-#define stop (server_config.end_ip + 1)
+#define stop (server_data.end_ip + 1)
 #endif
        do {
                uint32_t nip;
@@ -293,7 +295,7 @@ static uint32_t find_free_or_expired_nip(const uint8_t *safe_mac, unsigned arppi
                        goto next_addr;
                nip = htonl(addr);
                /* skip our own address */
-                if (nip == server_config.server_nip)
+                if (nip == server_data.server_nip)
                        goto next_addr;
                /* is this a static lease addr? */
                if (is_nip_reserved_as_static(nip))
@@ -312,8 +314,8 @@ static uint32_t find_free_or_expired_nip(const uint8_t *safe_mac, unsigned arppi
 next_addr:
                addr++;
 #if ENABLE_FEATURE_UDHCPD_BASE_IP_ON_MAC
-                if (addr > server_config.end_ip)
+                if (addr > server_data.end_ip)
-                        addr = server_config.start_ip;
+                        addr = server_data.start_ip;
 #endif
        } while (addr != stop);
@@ -386,7 +388,7 @@ struct config_keyword {
        const char *def;
 };
-#define OFS(field) offsetof(struct server_config_t, field)
+#define OFS(field) offsetof(struct server_data_t, field)
 static const struct config_keyword keywords[] = {
        /* keyword        handler           variable address    default */
@@ -422,17 +424,17 @@ static NOINLINE void read_config(const char *file)
        char *token[2];
        for (i = 0; i < KWS_WITH_DEFAULTS; i++)
-                keywords[i].handler(keywords[i].def, (char*)&server_config + keywords[i].ofs);
+                keywords[i].handler(keywords[i].def, (char*)&server_data + keywords[i].ofs);
        parser = config_open(file);
        while (config_read(parser, token, 2, 2, "# \t", PARSE_NORMAL)) {
                for (k = keywords, i = 0; i < ARRAY_SIZE(keywords); k++, i++) {
                        if (strcasecmp(token[0], k->keyword) == 0) {
-                                if (!k->handler(token[1], (char*)&server_config + k->ofs)) {
+                                if (!k->handler(token[1], (char*)&server_data + k->ofs)) {
                                        bb_error_msg("can't parse line %u in %s",
                                                        parser->lineno, file);
                                        /* reset back to the default value */
-                                        k->handler(k->def, (char*)&server_config + k->ofs);
+                                        k->handler(k->def, (char*)&server_data + k->ofs);
                                }
                                break;
                        }
@@ -440,8 +442,8 @@ static NOINLINE void read_config(const char *file)
        }
        config_close(parser);
-        server_config.start_ip = ntohl(server_config.start_ip);
+        server_data.start_ip = ntohl(server_data.start_ip);
-        server_config.end_ip = ntohl(server_config.end_ip);
+        server_data.end_ip = ntohl(server_data.end_ip);
 }
 static void write_leases(void)
@@ -451,7 +453,7 @@ static void write_leases(void)
        leasetime_t curr;
        int64_t written_at;
-        fd = open_or_warn(server_config.lease_file, O_WRONLY|O_CREAT|O_TRUNC);
+        fd = open_or_warn(server_data.lease_file, O_WRONLY|O_CREAT|O_TRUNC);
        if (fd < 0)
                return;
@@ -460,7 +462,7 @@ static void write_leases(void)
        written_at = SWAP_BE64(written_at);
        full_write(fd, &written_at, sizeof(written_at));
-        for (i = 0; i < server_config.max_leases; i++) {
+        for (i = 0; i < server_data.max_leases; i++) {
                leasetime_t tmp_time;
                if (g_leases[i].lease_nip == 0)
@@ -483,10 +485,10 @@ static void write_leases(void)
        }
        close(fd);
-        if (server_config.notify_file) {
+        if (server_data.notify_file) {
                char *argv[3];
-                argv[0] = server_config.notify_file;
+                argv[0] = server_data.notify_file;
-                argv[1] = server_config.lease_file;
+                argv[1] = server_data.lease_file;
                argv[2] = NULL;
                spawn_and_wait(argv);
        }
@@ -517,7 +519,7 @@ static NOINLINE void read_leases(const char *file)
        while (full_read(fd, &lease, sizeof(lease)) == sizeof(lease)) {
                uint32_t y = ntohl(lease.lease_nip);
-                if (y >= server_config.start_ip && y <= server_config.end_ip) {
+                if (y >= server_data.start_ip && y <= server_data.end_ip) {
                        signed_leasetime_t expires = ntohl(lease.expires) - (signed_leasetime_t)time_passed;
                        uint32_t static_nip;
@@ -580,28 +582,28 @@ static void send_packet_to_client(struct dhcp_packet *dhcp_pkt, int force_broadc
         || (dhcp_pkt->flags & htons(BROADCAST_FLAG))
         || dhcp_pkt->ciaddr == 0
        ) {
-                log1("broadcasting packet to client");
+                log1s("broadcasting packet to client");
                ciaddr = INADDR_BROADCAST;
                chaddr = MAC_BCAST_ADDR;
        } else {
-                log1("unicasting packet to client ciaddr");
+                log1s("unicasting packet to client ciaddr");
                ciaddr = dhcp_pkt->ciaddr;
                chaddr = dhcp_pkt->chaddr;
        }
        udhcp_send_raw_packet(dhcp_pkt,
-                /*src*/ server_config.server_nip, SERVER_PORT,
+                /*src*/ server_data.server_nip, SERVER_PORT,
                /*dst*/ ciaddr, CLIENT_PORT, chaddr,
-                server_config.ifindex);
+                server_data.ifindex);
 }
 /* Send a packet to gateway_nip using the kernel ip stack */
 static void send_packet_to_relay(struct dhcp_packet *dhcp_pkt)
 {
-        log1("forwarding packet to relay");
+        log1s("forwarding packet to relay");
        udhcp_send_kernel_packet(dhcp_pkt,
-                        server_config.server_nip, SERVER_PORT,
+                        server_data.server_nip, SERVER_PORT,
                        dhcp_pkt->gateway_nip, SERVER_PORT);
 }
@@ -633,7 +635,7 @@ static void init_packet(struct dhcp_packet *packet, struct dhcp_packet *oldpacke
        packet->flags = oldpacket->flags;
        packet->gateway_nip = oldpacket->gateway_nip;
        packet->ciaddr = oldpacket->ciaddr;
-        udhcp_add_simple_option(packet, DHCP_SERVER_ID, server_config.server_nip);
+        udhcp_add_simple_option(packet, DHCP_SERVER_ID, server_data.server_nip);
 }
 /* Fill options field, siaddr_nip, and sname and boot_file fields.
@@ -646,7 +648,7 @@ static void add_server_options(struct dhcp_packet *packet)
        client_hostname_opt = NULL;
        if (packet->yiaddr) { /* if we aren't from send_inform()... */
-                struct static_lease *st_lease = server_config.static_leases;
+                struct static_lease *st_lease = server_data.static_leases;
                while (st_lease) {
                        if (st_lease->nip == packet->yiaddr) {
                                if (st_lease->opt[0] != 0)
@@ -657,7 +659,7 @@ static void add_server_options(struct dhcp_packet *packet)
                }
        }
-        config_opts = server_config.options;
+        config_opts = server_data.options;
        while (config_opts) {
                if (config_opts->data[OPT_CODE] != DHCP_LEASE_TIME) {
                        /* ^^^^
@@ -684,25 +686,25 @@ static void add_server_options(struct dhcp_packet *packet)
        if (client_hostname_opt)
                udhcp_add_binary_option(packet, client_hostname_opt);
-        packet->siaddr_nip = server_config.siaddr_nip;
+        packet->siaddr_nip = server_data.siaddr_nip;
-        if (server_config.sname)
+        if (server_data.sname)
-                strncpy((char*)packet->sname, server_config.sname, sizeof(packet->sname) - 1);
+                strncpy((char*)packet->sname, server_data.sname, sizeof(packet->sname) - 1);
-        if (server_config.boot_file)
+        if (server_data.boot_file)
-                strncpy((char*)packet->file, server_config.boot_file, sizeof(packet->file) - 1);
+                strncpy((char*)packet->file, server_data.boot_file, sizeof(packet->file) - 1);
 }
 static uint32_t select_lease_time(struct dhcp_packet *packet)
 {
-        uint32_t lease_time_sec = server_config.max_lease_sec;
+        uint32_t lease_time_sec = server_data.max_lease_sec;
        uint8_t *lease_time_opt = udhcp_get_option32(packet, DHCP_LEASE_TIME);
        if (lease_time_opt) {
                move_from_unaligned32(lease_time_sec, lease_time_opt);
                lease_time_sec = ntohl(lease_time_sec);
-                if (lease_time_sec > server_config.max_lease_sec)
+                if (lease_time_sec > server_data.max_lease_sec)
-                        lease_time_sec = server_config.max_lease_sec;
+                        lease_time_sec = server_data.max_lease_sec;
-                if (lease_time_sec < server_config.min_lease_sec)
+                if (lease_time_sec < server_data.min_lease_sec)
-                        lease_time_sec = server_config.min_lease_sec;
+                        lease_time_sec = server_data.min_lease_sec;
        }
        return lease_time_sec;
 }
@@ -737,8 +739,8 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
                /* Or: if client has requested an IP */
                else if (requested_nip != 0
                 /* and the IP is in the lease range */
-                 && ntohl(requested_nip) >= server_config.start_ip
+                 && ntohl(requested_nip) >= server_data.start_ip
-                 && ntohl(requested_nip) <= server_config.end_ip
+                 && ntohl(requested_nip) <= server_data.end_ip
                 /* and */
                 && (  !(lease = find_lease_by_nip(requested_nip)) /* is not already taken */
                    || is_expired_lease(lease) /* or is taken, but expired */
@@ -752,18 +754,18 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
                }
                if (!packet.yiaddr) {
-                        bb_error_msg("no free IP addresses. OFFER abandoned");
+                        bb_simple_error_msg("no free IP addresses. OFFER abandoned");
                        return;
                }
                /* Reserve the IP for a short time hoping to get DHCPREQUEST soon */
                p_host_name = (const char*) udhcp_get_option(oldpacket, DHCP_HOST_NAME);
                lease = add_lease(packet.chaddr, packet.yiaddr,
-                                server_config.offer_time,
+                                server_data.offer_time,
                                p_host_name,
                                p_host_name ? (unsigned char)p_host_name[OPT_LEN - OPT_DATA] : 0
                );
                if (!lease) {
-                        bb_error_msg("no free IP addresses. OFFER abandoned");
+                        bb_simple_error_msg("no free IP addresses. OFFER abandoned");
                        return;
                }
        }
@@ -863,6 +865,10 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
        IF_FEATURE_UDHCP_PORT(SERVER_PORT = 67;)
        IF_FEATURE_UDHCP_PORT(CLIENT_PORT = 68;)
+        /* Make sure fd 0,1,2 are open */
+        /* Setup the signal pipe on fds 3,4 - must be before openlog() */
+        udhcp_sp_setup();
        opt = getopt32(argv, "^"
                "fSI:va:"IF_FEATURE_UDHCP_PORT("P:")
                "\0"
@@ -886,7 +892,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
        }
        if (opt & 4) { /* -I */
                len_and_sockaddr *lsa = xhost_and_af2sockaddr(str_I, 0, AF_INET);
-                server_config.server_nip = lsa->u.sin.sin_addr.s_addr;
+                server_data.server_nip = lsa->u.sin.sin_addr.s_addr;
                free(lsa);
        }
 #if ENABLE_FEATURE_UDHCP_PORT
@@ -901,52 +907,46 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
         * otherwise NOMMU machines will parse config twice */
        read_config(argv[0] ? argv[0] : DHCPD_CONF_FILE);
        /* prevent poll timeout overflow */
-        if (server_config.auto_time > INT_MAX / 1000)
+        if (server_data.auto_time > INT_MAX / 1000)
-                server_config.auto_time = INT_MAX / 1000;
+                server_data.auto_time = INT_MAX / 1000;
-        /* Make sure fd 0,1,2 are open */
-        bb_sanitize_stdio();
        /* Create pidfile */
-        write_pidfile(server_config.pidfile);
+        write_pidfile(server_data.pidfile);
        /* if (!..) bb_perror_msg("can't create pidfile %s", pidfile); */
-        bb_info_msg("started, v"BB_VER);
+        bb_simple_info_msg("started, v"BB_VER);
-        option = udhcp_find_option(server_config.options, DHCP_LEASE_TIME);
+        option = udhcp_find_option(server_data.options, DHCP_LEASE_TIME);
-        server_config.max_lease_sec = DEFAULT_LEASE_TIME;
+        server_data.max_lease_sec = DEFAULT_LEASE_TIME;
        if (option) {
-                move_from_unaligned32(server_config.max_lease_sec, option->data + OPT_DATA);
+                move_from_unaligned32(server_data.max_lease_sec, option->data + OPT_DATA);
-                server_config.max_lease_sec = ntohl(server_config.max_lease_sec);
+                server_data.max_lease_sec = ntohl(server_data.max_lease_sec);
        }
        /* Sanity check */
-        num_ips = server_config.end_ip - server_config.start_ip + 1;
+        num_ips = server_data.end_ip - server_data.start_ip + 1;
-        if (server_config.max_leases > num_ips) {
+        if (server_data.max_leases > num_ips) {
                bb_error_msg("max_leases=%u is too big, setting to %u",
-                        (unsigned)server_config.max_leases, num_ips);
+                        (unsigned)server_data.max_leases, num_ips);
-                server_config.max_leases = num_ips;
+                server_data.max_leases = num_ips;
        }
        /* this sets g_leases */
-        SET_PTR_TO_GLOBALS(xzalloc(server_config.max_leases * sizeof(g_leases[0])));
+        SET_PTR_TO_GLOBALS(xzalloc(server_data.max_leases * sizeof(g_leases[0])));
-        read_leases(server_config.lease_file);
+        read_leases(server_data.lease_file);
-        if (udhcp_read_interface(server_config.interface,
+        if (udhcp_read_interface(server_data.interface,
-                        &server_config.ifindex,
+                        &server_data.ifindex,
-                        (server_config.server_nip == 0 ? &server_config.server_nip : NULL),
+                        (server_data.server_nip == 0 ? &server_data.server_nip : NULL),
-                        server_config.server_mac)
+                        server_data.server_mac)
        ) {
                retval = 1;
                goto ret;
        }
-        /* Setup the signal pipe */
-        udhcp_sp_setup();
 continue_with_autotime:
-        timeout_end = monotonic_sec() + server_config.auto_time;
+        timeout_end = monotonic_sec() + server_data.auto_time;
        while (1) { /* loop until universe collapses */
                struct pollfd pfds[2];
                struct dhcp_packet packet;
@@ -960,14 +960,14 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                if (server_socket < 0) {
                        server_socket = udhcp_listen_socket(/*INADDR_ANY,*/ SERVER_PORT,
-                                        server_config.interface);
+                                        server_data.interface);
                }
                udhcp_sp_fd_set(pfds, server_socket);
 new_tv:
                tv = -1;
-                if (server_config.auto_time) {
+                if (server_data.auto_time) {
                        tv = timeout_end - monotonic_sec();
                        if (tv <= 0) {
 write_leases:
@@ -985,7 +985,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                        if (errno == EINTR)
                                goto new_tv;
                        /* < 0 and not EINTR: should not happen */
-                        bb_perror_msg_and_die("poll");
+                        bb_simple_perror_msg_and_die("poll");
                }
                if (pfds[0].revents) switch (udhcp_sp_read()) {
@@ -1019,16 +1019,16 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                        continue;
                }
                if (packet.hlen != 6) {
-                        bb_info_msg("MAC length != 6, ignoring packet");
+                        bb_info_msg("MAC length != 6%s", ", ignoring packet");
                        continue;
                }
                if (packet.op != BOOTREQUEST) {
-                        bb_info_msg("not a REQUEST, ignoring packet");
+                        bb_info_msg("not a REQUEST%s", ", ignoring packet");
                        continue;
                }
                state = udhcp_get_option(&packet, DHCP_MESSAGE_TYPE);
                if (state == NULL || state[0] < DHCP_MINTYPE || state[0] > DHCP_MAXTYPE) {
-                        bb_info_msg("no or bad message type option, ignoring packet");
+                        bb_info_msg("no or bad message type option%s", ", ignoring packet");
                        continue;
                }
@@ -1037,9 +1037,9 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                if (server_id_opt) {
                        uint32_t server_id_network_order;
                        move_from_unaligned32(server_id_network_order, server_id_opt);
-                        if (server_id_network_order != server_config.server_nip) {
+                        if (server_id_network_order != server_data.server_nip) {
                                /* client talks to somebody else */
-                                log1("server ID doesn't match, ignoring");
+                                log1("server ID doesn't match%s", ", ignoring");
                                continue;
                        }
                }
@@ -1162,7 +1162,7 @@ o DHCPREQUEST generated during REBINDING state:
                        if (!requested_ip_opt) {
                                requested_nip = packet.ciaddr;
                                if (requested_nip == 0) {
-                                        log1("no requested IP and no ciaddr, ignoring");
+                                        log1("no requested IP and no ciaddr%s", ", ignoring");
                                        break;
                                }
                        }
@@ -1204,7 +1204,7 @@ o DHCPREQUEST generated during REBINDING state:
                         && requested_nip == lease->lease_nip
                        ) {
                                memset(lease->lease_mac, 0, sizeof(lease->lease_mac));
-                                lease->expires = time(NULL) + server_config.decline_time;
+                                lease->expires = time(NULL) + server_data.decline_time;
                        }
                        break;
@@ -1235,7 +1235,7 @@ o DHCPREQUEST generated during REBINDING state:
 ret0:
        retval = 0;
 ret:
-        /*if (server_config.pidfile) - server_config.pidfile is never NULL */
+        /*if (server_data.pidfile) - server_data.pidfile is never NULL */
-                remove_pidfile(server_config.pidfile);
+                remove_pidfile(server_data.pidfile);
        return retval;
 }
diff --git a/networking/udhcp/dhcpd.h b/networking/udhcp/dhcpd.h
index ba11d77e8..b42849bbb 100644
--- a/networking/udhcp/dhcpd.h
+++ b/networking/udhcp/dhcpd.h
@@ -17,7 +17,7 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 struct static_lease;
-struct server_config_t {
+struct server_data_t {
        char *interface;                /* interface to use */
 //TODO: ifindex, server_nip, server_mac
 // are obtained from interface name.
@@ -53,12 +53,12 @@ struct server_config_t {
        struct static_lease *static_leases; /* List of ip/mac pairs to assign static leases */
 } FIX_ALIASING;
-#define server_config (*(struct server_config_t*)bb_common_bufsiz1)
+#define server_data (*(struct server_data_t*)bb_common_bufsiz1)
 /* client_data sits in 2nd half of bb_common_bufsiz1 */
 #if ENABLE_FEATURE_UDHCP_PORT
-#define SERVER_PORT  (server_config.port)
+#define SERVER_PORT  (server_data.port)
-#define SERVER_PORT6 (server_config.port)
+#define SERVER_PORT6 (server_data.port)
 #else
 #define SERVER_PORT  67
 #define SERVER_PORT6 547
diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index 86dcb1af0..ef9447b4b 100644
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -186,7 +186,7 @@ static int sendto_ip4(int sock, const void *msg, int msg_len, struct sockaddr_in
        err = sendto(sock, msg, msg_len, 0, (struct sockaddr*) to, sizeof(*to));
        err -= msg_len;
        if (err)
-                bb_perror_msg("sendto");
+                bb_simple_perror_msg("sendto");
        return err;
 }
@@ -273,7 +273,7 @@ int dhcprelay_main(int argc UNUSED_PARAM, char **argv)
                bb_show_usage();
        if (argv[3]) {
                if (!inet_aton(argv[3], &server_addr.sin_addr))
-                        bb_perror_msg_and_die("bad server IP");
+                        bb_simple_perror_msg_and_die("bad server IP");
        }
        iface_list = make_iface_list(argv + 1, &num_sockets);
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 64af802a3..6d4375237 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -85,14 +85,14 @@ int FAST_FUNC udhcp_recv_kernel_packet(struct dhcp_packet *packet, int fd)
        memset(packet, 0, sizeof(*packet));
        bytes = safe_read(fd, packet, sizeof(*packet));
        if (bytes < 0) {
-                log1("packet read error, ignoring");
+                log1s("packet read error, ignoring");
                return bytes; /* returns -1 */
        }
        if (bytes < offsetof(struct dhcp_packet, options)
         || packet->cookie != htonl(DHCP_MAGIC)
        ) {
-                bb_info_msg("packet with bad magic, ignoring");
+                bb_simple_info_msg("packet with bad magic, ignoring");
                return -2;
        }
        log1("received %s", "a packet");
diff --git a/networking/udhcp/signalpipe.c b/networking/udhcp/signalpipe.c
index 2ff78f0f2..7df671245 100644
--- a/networking/udhcp/signalpipe.c
+++ b/networking/udhcp/signalpipe.c
@@ -20,15 +20,15 @@
 */
 #include "common.h"
-/* Global variable: we access it from signal handler */
+#define READ_FD  3
-static struct fd_pair signal_pipe;
+#define WRITE_FD 4
 static void signal_handler(int sig)
 {
        int sv = errno;
        unsigned char ch = sig; /* use char, avoid dealing with partial writes */
-        if (write(signal_pipe.wr, &ch, 1) != 1)
+        if (write(WRITE_FD, &ch, 1) != 1)
-                bb_perror_msg("can't send signal");
+                bb_simple_perror_msg("can't send signal");
        errno = sv;
 }
@@ -36,12 +36,25 @@ static void signal_handler(int sig)
 * and installs the signal handler */
 void FAST_FUNC udhcp_sp_setup(void)
 {
+        struct fd_pair signal_pipe;
+        /* All callers also want this, so... */
+        bb_sanitize_stdio();
        /* was socketpair, but it needs AF_UNIX in kernel */
        xpiped_pair(signal_pipe);
-        close_on_exec_on(signal_pipe.rd);
-        close_on_exec_on(signal_pipe.wr);
+        /* usually we get fds 3 and 4, but if we get higher ones... */
-        ndelay_on(signal_pipe.rd);
+        if (signal_pipe.rd != READ_FD)
-        ndelay_on(signal_pipe.wr);
+                xmove_fd(signal_pipe.rd, READ_FD);
+        if (signal_pipe.wr != WRITE_FD)
+                xmove_fd(signal_pipe.wr, WRITE_FD);
+        close_on_exec_on(READ_FD);
+        close_on_exec_on(WRITE_FD);
+        ndelay_on(READ_FD);
+        ndelay_on(WRITE_FD);
        bb_signals(0
                + (1 << SIGUSR1)
                + (1 << SIGUSR2)
@@ -54,7 +67,7 @@ void FAST_FUNC udhcp_sp_setup(void)
 */
 void FAST_FUNC udhcp_sp_fd_set(struct pollfd pfds[2], int extra_fd)
 {
-        pfds[0].fd = signal_pipe.rd;
+        pfds[0].fd = READ_FD;
        pfds[0].events = POLLIN;
        pfds[1].fd = -1;
        if (extra_fd >= 0) {
@@ -74,7 +87,7 @@ int FAST_FUNC udhcp_sp_read(void)
        unsigned char sig;
        /* Can't block here, fd is in nonblocking mode */
-        if (safe_read(signal_pipe.rd, &sig, 1) != 1)
+        if (safe_read(READ_FD, &sig, 1) != 1)
                return 0;
        return sig;
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index 34049c3ee..65a1a8ead 100644
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -87,7 +87,7 @@ int FAST_FUNC udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf)
        setsockopt_reuseaddr(fd);
        if (setsockopt_broadcast(fd) == -1)
-                bb_perror_msg_and_die("SO_BROADCAST");
+                bb_simple_perror_msg_and_die("SO_BROADCAST");
        /* SO_BINDTODEVICE doesn't work on ethernet aliases (ethN:M) */
        colon = strrchr(inf, ':');
diff --git a/networking/wget.c b/networking/wget.c
index 44cec2cb5..5b85cce1f 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -368,7 +368,7 @@ static void alarm_handler(int sig UNUSED_PARAM)
 {
        /* This is theoretically unsafe (uses stdio and malloc in signal handler) */
        if (G.die_if_timed_out)
-                bb_error_msg_and_die("download timed out");
+                bb_simple_error_msg_and_die("download timed out");
 }
 static void set_alarm(void)
 {
@@ -452,7 +452,7 @@ static char fgets_trim_sanitize(FILE *fp, const char *fmt)
        set_alarm();
        if (fgets(G.wget_buf, sizeof(G.wget_buf), fp) == NULL)
-                bb_perror_msg_and_die("error getting response");
+                bb_simple_perror_msg_and_die("error getting response");
        clear_alarm();
        buf_ptr = strchrnul(G.wget_buf, '\n');
@@ -639,7 +639,7 @@ static char *get_sanitized_hdr(FILE *fp)
 static void reset_beg_range_to_zero(void)
 {
-        bb_error_msg("restart failed");
+        bb_simple_error_msg("restart failed");
        G.beg_range = 0;
        xlseek(G.output_fd, 0, SEEK_SET);
        /* Done at the end instead: */
@@ -657,7 +657,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
        if (socketpair(AF_UNIX, SOCK_STREAM, 0, sp) != 0)
                /* Kernel can have AF_UNIX support disabled */
-                bb_perror_msg_and_die("socketpair");
+                bb_simple_perror_msg_and_die("socketpair");
        if (!strchr(host, ':'))
                host = allocated = xasprintf("%s:%u", host, port);
@@ -731,7 +731,7 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
        if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) {
                option_mask32 |= WGET_OPT_NO_CHECK_CERT;
-                bb_error_msg("note: TLS certificate validation not implemented");
+                bb_simple_error_msg("note: TLS certificate validation not implemented");
        }
        servername = xstrdup(host);
@@ -740,7 +740,7 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
        if (socketpair(AF_UNIX, SOCK_STREAM, 0, sp) != 0)
                /* Kernel can have AF_UNIX support disabled */
-                bb_perror_msg_and_die("socketpair");
+                bb_simple_perror_msg_and_die("socketpair");
        fflush_all();
        pid = BB_MMU ? xfork() : xvfork();
@@ -818,7 +818,7 @@ static FILE* prepare_ftp_session(FILE **dfpp, struct host_info *target, len_and_
 #endif
        if (ftpcmd(NULL, NULL, sfp) != 220)
-                bb_error_msg_and_die("%s", G.wget_buf);
+                bb_simple_error_msg_and_die(G.wget_buf);
                /* note: ftpcmd() sanitizes G.wget_buf, ok to print */
        /* Split username:password pair */
@@ -981,7 +981,7 @@ static void NOINLINE retrieve_file_data(FILE *dfp)
                        if (errno != EAGAIN) {
                                if (ferror(dfp)) {
                                        progress_meter(PROGRESS_END);
-                                        bb_perror_msg_and_die(bb_msg_read_error);
+                                        bb_simple_perror_msg_and_die(bb_msg_read_error);
                                }
                                break; /* EOF, not error */
                        }
@@ -994,7 +994,7 @@ static void NOINLINE retrieve_file_data(FILE *dfp)
 # if ENABLE_FEATURE_WGET_TIMEOUT
                                if (second_cnt != 0 && --second_cnt == 0) {
                                        progress_meter(PROGRESS_END);
-                                        bb_error_msg_and_die("download timed out");
+                                        bb_simple_error_msg_and_die("download timed out");
                                }
 # endif
                                /* We used to loop back to poll here,
@@ -1047,7 +1047,7 @@ static void NOINLINE retrieve_file_data(FILE *dfp)
        G.got_clen = 1; /* makes it show 100% even for download of (formerly) unknown size */
        progress_meter(PROGRESS_END);
        if (G.content_len != 0) {
-                bb_perror_msg_and_die("connection closed prematurely");
+                bb_simple_perror_msg_and_die("connection closed prematurely");
                /* GNU wget says "DATE TIME (NN MB/s) - Connection closed at byte NNN. Retrying." */
        }
@@ -1381,7 +1381,7 @@ However, in real world it was observed that some web servers
                        }
                        if (key == KEY_location && status >= 300) {
                                if (--redir_limit == 0)
-                                        bb_error_msg_and_die("too many redirections");
+                                        bb_simple_error_msg_and_die("too many redirections");
                                fclose(sfp);
                                if (str[0] == '/') {
                                        free(redirected_path);
diff --git a/networking/zcip.c b/networking/zcip.c
index f95b6f7fb..134dfb2df 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -276,7 +276,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
                if (inet_aton(l_opt, &net) == 0
                 || (net.s_addr & htonl(IN_CLASSB_NET)) != net.s_addr
                ) {
-                        bb_error_msg_and_die("invalid network address");
+                        bb_simple_error_msg_and_die("invalid network address");
                }
                G.localnet_ip = ntohl(net.s_addr);
        }
@@ -285,7 +285,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
                if (inet_aton(r_opt, &ip) == 0
                 || (ntohl(ip.s_addr) & IN_CLASSB_NET) != G.localnet_ip
                ) {
-                        bb_error_msg_and_die("invalid link address");
+                        bb_simple_error_msg_and_die("invalid link address");
                }
                chosen_nip = ip.s_addr;
        }
@@ -473,7 +473,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
                // Read ARP packet
                if (safe_read(sock_fd, &p, sizeof(p)) < 0) {
-                        bb_perror_msg_and_die(bb_msg_read_error);
+                        bb_simple_perror_msg_and_die(bb_msg_read_error);
                }
                if (p.eth.ether_type != htons(ETHERTYPE_ARP))
author	Ron Yorston <rmy@pobox.com>	2019-08-16 09:42:39 +0100
committer	Ron Yorston <rmy@pobox.com>	2019-08-16 09:45:21 +0100
commit	517cf74f6265ec4308b790b637b3f9778cbdc6e0 (patch)
tree	be9337069b60ca1bb03565d8575bacfc71181003 /networking
parent	ae65dc37bcc9b1d9cef0b111131c79dc4ba1bf51 (diff)
parent	ac78f2ac96b3efd6551a08e7dc609efa1fb69481 (diff)
download	busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.gz busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.bz2 busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.zip