Merge branch 'busybox' into merge

8 files changed, 201 insertions, 71 deletions

diff --git a/networking/inetd.c b/networking/inetd.c
index 6843845fb..ca1a97268 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -246,7 +246,11 @@
 #if ENABLE_FEATURE_INETD_RPC
 # if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
 #  warning "You probably need to build uClibc with UCLIBC_HAS_RPC for NFS support"
-   /* not #error, since user may be using e.g. libtirpc instead */
+   /* not #error, since user may be using e.g. libtirpc instead.
+    * This might work:
+    * CONFIG_EXTRA_CFLAGS="-I/usr/include/tirpc"
+    * CONFIG_EXTRA_LDLIBS="tirpc"
+    */
 # endif
 # include <rpc/rpc.h>
 # include <rpc/pmap_clnt.h>
diff --git a/networking/ip.c b/networking/ip.c
index 0bc0edc57..accf90759 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -155,11 +155,61 @@
 //usage:
 //--------------123456789.123456789.123456789.123456789.123456789.123456789.123456789.123....79
 //usage:#define iplink_trivial_usage
-//usage:       "set IFACE [up|down] [arp on|off] | show [IFACE]"
-//usage:#define iplink_full_usage "\n\n"
-//usage:       "iplink set IFACE [up|down] [arp on|off] [multicast on|off] [promisc on|off]\n"
-//usage:       "        [mtu NUM] [name NAME] [qlen NUM] [address MAC]\n"
+//usage:       /*Usage:iplink*/"set IFACE [up|down] [arp on|off] [multicast on|off]\n"
+//usage:       "        [promisc on|off] [mtu NUM] [name NAME] [qlen NUM] [address MAC]\n"
+//usage:       "        [master IFACE | nomaster]\n"
+// * short help shows only "set" command, long help continues (with just one "\n")
+// * and shows all other commands:
+//usage:#define iplink_full_usage "\n"
+//usage:       "iplink add [link IFACE] IFACE [address MAC] type TYPE [ARGS]\n"
+//usage:       "iplink delete IFACE type TYPE [ARGS]\n"
+//usage:       "        TYPE ARGS := vlan VLANARGS | vrf table NUM\n"
+//usage:       "        VLANARGS := id VLANID [protocol 802.1q|802.1ad] [reorder_hdr on|off]\n"
+//usage:       "                [gvrp on|off] [mvrp on|off] [loose_binding on|off]\n"
 //usage:       "iplink show [IFACE]"
+//upstream man ip-link:
+//=====================
+//ip link add [link DEV] [ name ] NAME
+//                   [ txqueuelen PACKETS ]
+//                   [ address LLADDR ]
+//                   [ broadcast LLADDR ]
+//                   [ mtu MTU ] [index IDX ]
+//                   [ numtxqueues QUEUE_COUNT ]
+//                   [ numrxqueues QUEUE_COUNT ]
+//                   type TYPE [ ARGS ]
+//       ip link delete { DEVICE | dev DEVICE | group DEVGROUP } type TYPE [ ARGS ]
+//       ip link set { DEVICE | dev DEVICE | group DEVGROUP } [ { up | down } ]
+//                      [ arp { on | off } ]
+//                      [ dynamic { on | off } ]
+//                      [ multicast { on | off } ]
+//                      [ allmulticast { on | off } ]
+//                      [ promisc { on | off } ]
+//                      [ trailers { on | off } ]
+//                      [ txqueuelen PACKETS ]
+//                      [ name NEWNAME ]
+//                      [ address LLADDR ]
+//                      [ broadcast LLADDR ]
+//                      [ mtu MTU ]
+//                      [ netns { PID | NAME } ]
+//                      [ link-netnsid ID ]
+//            [ alias NAME ]
+//                      [ vf NUM [ mac LLADDR ]
+//                 [ vlan VLANID [ qos VLAN-QOS ] ]
+//                 [ rate TXRATE ]
+//                 [ spoofchk { on | off} ]
+//                 [ query_rss { on | off} ]
+//                 [ state { auto | enable | disable} ] ]
+//                 [ trust { on | off} ] ]
+//            [ master DEVICE ]
+//            [ nomaster ]
+//            [ addrgenmode { eui64 | none | stable_secret | random } ]
+//                      [ protodown { on | off } ]
+//       ip link show [ DEVICE | group GROUP ] [up] [master DEV] [type TYPE]
+//       ip link help [ TYPE ]
+//TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | macvtap |
+//          bridge | bond | ipoib | ip6tnl | ipip | sit | vxlan |
+//          gre | gretap | ip6gre | ip6gretap | vti | nlmon |
+//          bond_slave | ipvlan | geneve | bridge_slave | vrf }
 //usage:
 //--------------123456789.123456789.123456789.123456789.123456789.123456789.123456789.123....79
 //usage:#define iproute_trivial_usage
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index f38fba055..2aa8b683b 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -128,6 +128,31 @@ static void set_mtu(char *dev, int mtu)
 }
 
 /* Exits on error */
+static void set_master(char *dev, int master)
+{
+        struct rtnl_handle rth;
+        struct {
+                struct nlmsghdr  n;
+                struct ifinfomsg i;
+                char             buf[1024];
+        } req;
+
+        memset(&req, 0, sizeof(req));
+
+        req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
+        req.n.nlmsg_flags = NLM_F_REQUEST;
+        req.n.nlmsg_type = RTM_NEWLINK;
+        req.i.ifi_family = preferred_family;
+
+        xrtnl_open(&rth);
+        req.i.ifi_index = xll_name_to_index(dev);
+        //printf("master %i for %i\n", master, req.i.ifi_index);
+        addattr_l(&req.n, sizeof(req), IFLA_MASTER, &master, 4);
+        if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
+                xfunc_die();
+}
+
+/* Exits on error */
 static int get_address(char *dev, int *htype)
 {
         struct ifreq ifr;
@@ -200,6 +225,7 @@ static int do_set(char **argv)
         uint32_t flags = 0;
         int qlen = -1;
         int mtu = -1;
+        int master = -1;
         char *newaddr = NULL;
         char *newbrd = NULL;
         struct ifreq ifr0, ifr1;
@@ -209,9 +235,11 @@ static int do_set(char **argv)
         static const char keywords[] ALIGN1 =
                 "up\0""down\0""name\0""mtu\0""qlen\0""multicast\0"
                 "arp\0""promisc\0""address\0"
+                "master\0""nomaster\0"
                 "dev\0" /* must be last */;
         enum { ARG_up = 0, ARG_down, ARG_name, ARG_mtu, ARG_qlen, ARG_multicast,
                 ARG_arp, ARG_promisc, ARG_addr,
+                ARG_master, ARG_nomaster,
                 ARG_dev };
         enum { PARM_on = 0, PARM_off };
         smalluint key;
@@ -243,6 +271,11 @@ static int do_set(char **argv)
                 } else if (key == ARG_addr) {
                         NEXT_ARG();
                         newaddr = *argv;
+                } else if (key == ARG_master) {
+                        NEXT_ARG();
+                        master = xll_name_to_index(*argv);
+                } else if (key == ARG_nomaster) {
+                        master = 0;
                 } else if (key >= ARG_dev) {
                         /* ^^^^^^ ">=" here results in "dev IFACE" treated as default */
                         if (key == ARG_dev) {
@@ -427,6 +460,9 @@ static int do_set(char **argv)
         if (mtu != -1) {
                 set_mtu(dev, mtu);
         }
+        if (master != -1) {
+                set_master(dev, master);
+        }
         if (mask)
                 do_chflags(dev, flags, mask);
         return 0;
@@ -525,6 +561,24 @@ static void vlan_parse_opt(char **argv, struct nlmsghdr *n, unsigned int size)
                 addattr_l(n, size, IFLA_VLAN_FLAGS, &flags, sizeof(flags));
 }
 
+static void vrf_parse_opt(char **argv, struct nlmsghdr *n, unsigned int size)
+{
+/* IFLA_VRF_TABLE is an enum, not a define -
+ * can't test "defined(IFLA_VRF_TABLE)".
+ */
+#if !defined(IFLA_VRF_MAX)
+# define IFLA_VRF_TABLE 1
+#endif
+        uint32_t table;
+
+        if (strcmp(*argv, "table") != 0)
+                invarg_1_to_2(*argv, "type vrf");
+
+        NEXT_ARG();
+        table = get_u32(*argv, "table");
+        addattr_l(n, size, IFLA_VRF_TABLE, &table, sizeof(table));
+}
+
 #ifndef NLMSG_TAIL
 #define NLMSG_TAIL(nmsg) \
         ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
@@ -563,6 +617,8 @@ static int do_add_or_delete(char **argv, const unsigned rtm)
         if (rtm == RTM_NEWLINK)
                 req.n.nlmsg_flags |= NLM_F_CREATE|NLM_F_EXCL;
 
+        /* NB: update iplink_full_usage if you extend this code */
+
         while (*argv) {
                 arg = index_in_substrings(keywords, *argv);
                 if (arg == ARG_type) {
@@ -582,7 +638,7 @@ static int do_add_or_delete(char **argv, const unsigned rtm)
                 } else if (arg == ARG_address) {
                         NEXT_ARG();
                         address_str = *argv;
-                        dbg("address_str:'%s'", name_str);
+                        dbg("address_str:'%s'", address_str);
                 } else {
                         if (arg == ARG_dev) {
                                 if (dev_str)
@@ -609,6 +665,8 @@ static int do_add_or_delete(char **argv, const unsigned rtm)
 
                         if (strcmp(type_str, "vlan") == 0)
                                 vlan_parse_opt(argv, &req.n, sizeof(req));
+                        else if (strcmp(type_str, "vrf") == 0)
+                                vrf_parse_opt(argv, &req.n, sizeof(req));
 
                         data->rta_len = (void *)NLMSG_TAIL(&req.n) - (void *)data;
                 }
@@ -651,6 +709,8 @@ int FAST_FUNC do_iplink(char **argv)
 {
         static const char keywords[] ALIGN1 =
                 "add\0""delete\0""set\0""show\0""lst\0""list\0";
+
+        xfunc_error_retval = 2; //TODO: move up to "ip"? Is it the common rule for all "ip" tools?
         if (*argv) {
                 int key = index_in_substrings(keywords, *argv);
                 if (key < 0) /* invalid argument */
diff --git a/networking/ping.c b/networking/ping.c
index d1d59d545..8f85d3ec2 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -74,6 +74,7 @@
 //usage:        )
 //usage:     "\n        -c CNT          Send only CNT pings"
 //usage:     "\n        -s SIZE         Send SIZE data bytes in packets (default 56)"
+//usage:     "\n        -A              Ping as soon as reply is recevied"
 //usage:     "\n        -t TTL          Set TTL"
 //usage:     "\n        -I IFACE/IP     Source interface or IP address"
 //usage:     "\n        -W SEC          Seconds to wait for the first response (default 10)"
@@ -90,6 +91,7 @@
 //usage:       "Send ICMP ECHO_REQUEST packets to network hosts\n"
 //usage:     "\n        -c CNT          Send only CNT pings"
 //usage:     "\n        -s SIZE         Send SIZE data bytes in packets (default 56)"
+//usage:     "\n        -A              Ping as soon as reply is recevied"
 //usage:     "\n        -I IFACE/IP     Source interface or IP address"
 //usage:     "\n        -q              Quiet, only display output at start"
 //usage:     "\n                        and when finished"
@@ -348,20 +350,21 @@ static int common_ping_main(sa_family_t af, char **argv)
 /* Full(er) version */
 
 /* -c NUM, -t NUM, -w NUM, -W NUM */
-#define OPT_STRING "qvc:+s:t:+w:+W:+I:np:4"IF_PING6("6")
+#define OPT_STRING "qvAc:+s:t:+w:+W:+I:np:4"IF_PING6("6")
 enum {
         OPT_QUIET = 1 << 0,
         OPT_VERBOSE = 1 << 1,
-        OPT_c = 1 << 2,
-        OPT_s = 1 << 3,
-        OPT_t = 1 << 4,
-        OPT_w = 1 << 5,
-        OPT_W = 1 << 6,
-        OPT_I = 1 << 7,
-        /*OPT_n = 1 << 8, - ignored */
-        OPT_p = 1 << 9,
-        OPT_IPV4 = 1 << 10,
-        OPT_IPV6 = (1 << 11) * ENABLE_PING6,
+        OPT_A = 1 << 2,
+        OPT_c = 1 << 3,
+        OPT_s = 1 << 4,
+        OPT_t = 1 << 5,
+        OPT_w = 1 << 6,
+        OPT_W = 1 << 7,
+        OPT_I = 1 << 8,
+        /*OPT_n = 1 << 9, - ignored */
+        OPT_p = 1 << 10,
+        OPT_IPV4 = 1 << 11,
+        OPT_IPV6 = (1 << 12) * ENABLE_PING6,
 };
 
 
@@ -377,9 +380,9 @@ struct globals {
         uint8_t pattern;
         unsigned tmin, tmax; /* in us */
         unsigned long long tsum; /* in us, sum of all times */
-        unsigned deadline;
+        unsigned cur_us; /* low word only, we don't need more */
+        unsigned deadline_us;
         unsigned timeout;
-        unsigned total_secs;
         unsigned sizeof_rcv_packet;
         char *rcv_packet; /* [datalen + MAXIPLEN + MAXICMPLEN] */
         void *snd_packet; /* [datalen + ipv4/ipv6_const] */
@@ -405,9 +408,7 @@ struct globals {
 #define tmin         (G.tmin        )
 #define tmax         (G.tmax        )
 #define tsum         (G.tsum        )
-#define deadline     (G.deadline    )
 #define timeout      (G.timeout     )
-#define total_secs   (G.total_secs  )
 #define hostname     (G.hostname    )
 #define dotted       (G.dotted      )
 #define pingaddr     (G.pingaddr    )
@@ -455,7 +456,7 @@ static void print_stats_and_exit(int junk UNUSED_PARAM)
                         tmax / 1000, tmax % 1000);
         }
         /* if condition is true, exit with 1 -- 'failure' */
-        exit(nrecv == 0 || (deadline && nrecv < pingcount));
+        exit(nrecv == 0 || (G.deadline_us && nrecv < pingcount));
 }
 
 static void sendping_tail(void (*sp)(int), int size_pkt)
@@ -467,22 +468,23 @@ static void sendping_tail(void (*sp)(int), int size_pkt)
 
         size_pkt += datalen;
 
+        if (G.deadline_us) {
+                unsigned n = G.cur_us - G.deadline_us;
+                if ((int)n >= 0)
+                        print_stats_and_exit(0);
+        }
+
         /* sizeof(pingaddr) can be larger than real sa size, but I think
          * 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);
 
-        if (pingcount == 0 || deadline || G.ntransmitted < pingcount) {
+        if (pingcount == 0 || G.ntransmitted < pingcount) {
                 /* Didn't send all pings yet - schedule next in 1s */
                 signal(SIGALRM, sp);
-                if (deadline) {
-                        total_secs += PINGINTERVAL;
-                        if (total_secs >= deadline)
-                                signal(SIGALRM, print_stats_and_exit);
-                }
                 alarm(PINGINTERVAL);
-        } else { /* -c NN, and all NN are sent (and no deadline) */
+        } else { /* -c NN, and all NN are sent */
                 /* Wait for the last ping to come back.
                  * -W timeout: wait for a response in seconds.
                  * Affects only timeout in absence of any responses,
@@ -516,7 +518,7 @@ static void sendping4(int junk UNUSED_PARAM)
          */
         /*if (datalen >= 4)*/
                 /* No hton: we'll read it back on the same machine */
-                *(uint32_t*)&pkt->icmp_dun = monotonic_us();
+                *(uint32_t*)&pkt->icmp_dun = G.cur_us = monotonic_us();
 
         pkt->icmp_cksum = inet_cksum((uint16_t *) pkt, datalen + ICMP_MINLEN);
 
@@ -535,7 +537,7 @@ static void sendping6(int junk UNUSED_PARAM)
         pkt->icmp6_id = myid;
 
         /*if (datalen >= 4)*/
-                *(bb__aliased_uint32_t*)(&pkt->icmp6_data8[4]) = monotonic_us();
+                *(bb__aliased_uint32_t*)(&pkt->icmp6_data8[4]) = G.cur_us = monotonic_us();
 
         //TODO? pkt->icmp_cksum = inet_cksum(...);
 
@@ -632,7 +634,7 @@ static void unpack_tail(int sz, uint32_t *tp,
         puts(dupmsg);
         fflush_all();
 }
-static void unpack4(char *buf, int sz, struct sockaddr_in *from)
+static int unpack4(char *buf, int sz, struct sockaddr_in *from)
 {
         struct icmp *icmppkt;
         struct iphdr *iphdr;
@@ -640,7 +642,7 @@ static void unpack4(char *buf, int sz, struct sockaddr_in *from)
 
         /* discard if too short */
         if (sz < (datalen + ICMP_MINLEN))
-                return;
+                return 0;
 
         /* check IP header */
         iphdr = (struct iphdr *) buf;
@@ -648,7 +650,7 @@ static void unpack4(char *buf, int sz, struct sockaddr_in *from)
         sz -= hlen;
         icmppkt = (struct icmp *) (buf + hlen);
         if (icmppkt->icmp_id != myid)
-                return;                         /* not our ping */
+                return 0;                               /* not our ping */
 
         if (icmppkt->icmp_type == ICMP_ECHOREPLY) {
                 uint16_t recv_seq = ntohs(icmppkt->icmp_seq);
@@ -659,25 +661,28 @@ static void unpack4(char *buf, int sz, struct sockaddr_in *from)
                 unpack_tail(sz, tp,
                         inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr),
                         recv_seq, iphdr->ttl);
-        } else if (icmppkt->icmp_type != ICMP_ECHO) {
+                return 1;
+        }
+        if (icmppkt->icmp_type != ICMP_ECHO) {
                 bb_error_msg("warning: got ICMP %d (%s)",
                                 icmppkt->icmp_type,
                                 icmp_type_name(icmppkt->icmp_type));
         }
+        return 0;
 }
 #if ENABLE_PING6
-static void unpack6(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit)
+static int unpack6(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit)
 {
         struct icmp6_hdr *icmppkt;
         char buf[INET6_ADDRSTRLEN];
 
         /* discard if too short */
         if (sz < (datalen + sizeof(struct icmp6_hdr)))
-                return;
+                return 0;
 
         icmppkt = (struct icmp6_hdr *) packet;
         if (icmppkt->icmp6_id != myid)
-                return;                         /* not our ping */
+                return 0;                               /* not our ping */
 
         if (icmppkt->icmp6_type == ICMP6_ECHO_REPLY) {
                 uint16_t recv_seq = ntohs(icmppkt->icmp6_seq);
@@ -689,11 +694,14 @@ static void unpack6(char *packet, int sz, struct sockaddr_in6 *from, int hoplimi
                         inet_ntop(AF_INET6, &from->sin6_addr,
                                         buf, sizeof(buf)),
                         recv_seq, hoplimit);
-        } else if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST) {
+                return 1;
+        }
+        if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST) {
                 bb_error_msg("warning: got ICMP %d (%s)",
                                 icmppkt->icmp6_type,
                                 icmp6_type_name(icmppkt->icmp6_type));
         }
+        return 0;
 }
 #endif
 
@@ -726,6 +734,7 @@ static void ping4(len_and_sockaddr *lsa)
         signal(SIGINT, print_stats_and_exit);
 
         /* start the ping's going ... */
+ send_ping:
         sendping4(0);
 
         /* listen for replies */
@@ -741,9 +750,12 @@ static void ping4(len_and_sockaddr *lsa)
                                 bb_perror_msg("recvfrom");
                         continue;
                 }
-                unpack4(G.rcv_packet, c, &from);
+                c = unpack4(G.rcv_packet, c, &from);
                 if (pingcount && G.nreceived >= pingcount)
                         break;
+                if (c && (option_mask32 & OPT_A)) {
+                        goto send_ping;
+                }
         }
 }
 #if ENABLE_PING6
@@ -794,10 +806,6 @@ static void ping6(len_and_sockaddr *lsa)
 
         signal(SIGINT, print_stats_and_exit);
 
-        /* start the ping's going ... */
-        sendping6(0);
-
-        /* listen for replies */
         msg.msg_name = &from;
         msg.msg_namelen = sizeof(from);
         msg.msg_iov = &iov;
@@ -805,12 +813,18 @@ static void ping6(len_and_sockaddr *lsa)
         msg.msg_control = control_buf;
         iov.iov_base = G.rcv_packet;
         iov.iov_len = G.sizeof_rcv_packet;
+
+        /* start the ping's going ... */
+ send_ping:
+        sendping6(0);
+
+        /* listen for replies */
         while (1) {
                 int c;
                 struct cmsghdr *mp;
                 int hoplimit = -1;
-                msg.msg_controllen = sizeof(control_buf);
 
+                msg.msg_controllen = sizeof(control_buf);
                 c = recvmsg(pingsock, &msg, 0);
                 if (c < 0) {
                         if (errno != EINTR)
@@ -827,9 +841,12 @@ static void ping6(len_and_sockaddr *lsa)
                                 move_from_unaligned_int(hoplimit, CMSG_DATA(mp));
                         }
                 }
-                unpack6(G.rcv_packet, c, &from, hoplimit);
+                c = unpack6(G.rcv_packet, c, &from, hoplimit);
                 if (pingcount && G.nreceived >= pingcount)
                         break;
+                if (c && (option_mask32 & OPT_A)) {
+                        goto send_ping;
+                }
         }
 }
 #endif
@@ -875,7 +892,7 @@ static int common_ping_main(int opt, char **argv)
                         OPT_STRING
                         /* exactly one arg; -v and -q don't mix */
                         "\0" "=1:q--v:v--q",
-                        &pingcount, &str_s, &opt_ttl, &deadline, &timeout, &str_I, &str_p
+                        &pingcount, &str_s, &opt_ttl, &G.deadline_us, &timeout, &str_I, &str_p
         );
         if (opt & OPT_s)
                 datalen = xatou16(str_s); // -s
@@ -889,6 +906,10 @@ static int common_ping_main(int opt, char **argv)
         }
         if (opt & OPT_p)
                 G.pattern = xstrtou_range(str_p, 16, 0, 255);
+        if (G.deadline_us) {
+                unsigned d = G.deadline_us < INT_MAX/1000000 ? G.deadline_us : INT_MAX/1000000;
+                G.deadline_us = 1 | ((d * 1000000) + monotonic_us());
+        }
 
         myid = (uint16_t) getpid();
         hostname = argv[optind];
@@ -911,7 +932,7 @@ static int common_ping_main(int opt, char **argv)
 
         dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
         ping(lsa);
-        print_stats_and_exit(EXIT_SUCCESS);
+        print_stats_and_exit(0);
         /*return EXIT_SUCCESS;*/
 }
 #endif /* FEATURE_FANCY_PING */
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index d4c69e0f7..a90e3f80a 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -127,6 +127,7 @@ struct globals {
         unsigned cur_per_host;
         unsigned cnum;
         unsigned cmax;
+        struct hcc *cc;
         char **env_cur;
         char *env_var[1]; /* actually bigger */
 } FIX_ALIASING;
@@ -229,7 +230,7 @@ static void sig_child_handler(int sig UNUSED_PARAM)
 
         while ((pid = wait_any_nohang(&wstat)) > 0) {
                 if (max_per_host)
-                        ipsvd_perhost_remove(pid);
+                        ipsvd_perhost_remove(G.cc, pid);
                 if (cnum)
                         cnum--;
                 if (verbose)
@@ -318,7 +319,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
         sslser = user;
         client = 0;
         if ((getuid() == 0) && !(opts & OPT_u)) {
-                xfunc_exitcode = 100;
+                xfunc_error_retval = 100;
                 bb_error_msg_and_die(bb_msg_you_must_be_root);
         }
         if (opts & OPT_u)
@@ -347,7 +348,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
         signal(SIGPIPE, SIG_IGN);
 
         if (max_per_host)
-                ipsvd_perhost_init(cmax);
+                G.cc = ipsvd_perhost_init(cmax);
 
         local_port = bb_lookup_port(argv[1], tcp ? "tcp" : "udp", 0);
         lsa = xhost2sockaddr(argv[0], local_port);
@@ -422,7 +423,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
                 /* Drop connection immediately if cur_per_host > max_per_host
                  * (minimizing load under SYN flood) */
                 remote_addr = xmalloc_sockaddr2dotted_noport(&remote.u.sa);
-                cur_per_host = ipsvd_perhost_add(remote_addr, max_per_host, &hccp);
+                cur_per_host = ipsvd_perhost_add(G.cc, remote_addr, max_per_host, &hccp);
                 if (cur_per_host > max_per_host) {
                         /* ipsvd_perhost_add detected that max is exceeded
                          * (and did not store ip in connection table) */
diff --git a/networking/tcpudp_perhost.c b/networking/tcpudp_perhost.c
index 105410883..2643f8d16 100644
--- a/networking/tcpudp_perhost.c
+++ b/networking/tcpudp_perhost.c
@@ -10,25 +10,21 @@
 #include "libbb.h"
 #include "tcpudp_perhost.h"
 
-static struct hcc *cc;
-static unsigned cclen;
-
-/* to be optimized */
-
-void ipsvd_perhost_init(unsigned c)
+struct hcc* FAST_FUNC ipsvd_perhost_init(unsigned c)
 {
 //      free(cc);
-        cc = xzalloc(c * sizeof(*cc));
-        cclen = c;
+        struct hcc *cc = xzalloc((c + 1) * sizeof(*cc));
+        cc[c].pid = -1; /* "end" marker */
+        return cc;
 }
 
-unsigned ipsvd_perhost_add(char *ip, unsigned maxconn, struct hcc **hccpp)
+unsigned FAST_FUNC ipsvd_perhost_add(struct hcc *cc, char *ip, unsigned maxconn, struct hcc **hccpp)
 {
         unsigned i;
         unsigned conn = 1;
         int freepos = -1;
 
-        for (i = 0; i < cclen; ++i) {
+        for (i = 0; cc[i].pid >= 0; ++i) {
                 if (!cc[i].ip) {
                         freepos = i;
                         continue;
@@ -46,10 +42,10 @@ unsigned ipsvd_perhost_add(char *ip, unsigned maxconn, struct hcc **hccpp)
         return conn;
 }
 
-void ipsvd_perhost_remove(int pid)
+void FAST_FUNC ipsvd_perhost_remove(struct hcc *cc, int pid)
 {
         unsigned i;
-        for (i = 0; i < cclen; ++i) {
+        for (i = 0; cc[i].pid >= 0; ++i) {
                 if (cc[i].pid == pid) {
                         free(cc[i].ip);
                         cc[i].ip = NULL;
@@ -59,7 +55,7 @@ void ipsvd_perhost_remove(int pid)
         }
 }
 
-//void ipsvd_perhost_free(void)
+//void ipsvd_perhost_free(struct hcc *cc)
 //{
 //      free(cc);
 //}
diff --git a/networking/tcpudp_perhost.h b/networking/tcpudp_perhost.h
index 3e5757678..3b14d9a57 100644
--- a/networking/tcpudp_perhost.h
+++ b/networking/tcpudp_perhost.h
@@ -14,7 +14,7 @@ struct hcc {
         int pid;
 };
 
-void ipsvd_perhost_init(unsigned);
+struct hcc* FAST_FUNC ipsvd_perhost_init(unsigned);
 
 /* Returns number of already opened connects to this ips, including this one.
  * ip should be a malloc'ed ptr.
@@ -22,12 +22,12 @@ void ipsvd_perhost_init(unsigned);
  * and pointer to table entry if stored in *hccpp
  * (useful for storing pid later).
  * Else ip is NOT inserted (you must take care of it - free() etc) */
-unsigned ipsvd_perhost_add(char *ip, unsigned maxconn, struct hcc **hccpp);
+unsigned FAST_FUNC ipsvd_perhost_add(struct hcc *cc, char *ip, unsigned maxconn, struct hcc **hccpp);
 
 /* Finds and frees element with pid */
-void ipsvd_perhost_remove(int pid);
+void FAST_FUNC ipsvd_perhost_remove(struct hcc *cc, int pid);
 
 //unsigned ipsvd_perhost_setpid(int pid);
-//void ipsvd_perhost_free(void);
+//void ipsvd_perhost_free(struct hcc *cc);
 
 POP_SAVED_FUNCTION_VISIBILITY
diff --git a/networking/tls.c b/networking/tls.c
index da7b6058f..99722cfb4 100644
--- a/networking/tls.c
+++ b/networking/tls.c
@@ -806,8 +806,6 @@ static int tls_xread_record(tls_state_t *tls, const char *expected)
                          || xhdr->proto_min != TLS_MIN
                         ) {
                                 sz = total < target ? total : target;
-                                if (sz > 24)
-                                        sz = 24; /* don't flood */
                                 bad_record_die(tls, expected, sz);
                         }
                         dbg("xhdr type:%d ver:%d.%d len:%d\n",