Merge branch 'busybox' into merge

15 files changed, 596 insertions, 202 deletions

diff --git a/networking/brctl.c b/networking/brctl.c
index 586ca9b0c..25640246d 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -53,7 +53,9 @@
 //usage:     "\n        addif BRIDGE IFACE      Add IFACE to BRIDGE"
 //usage:     "\n        delif BRIDGE IFACE      Delete IFACE from BRIDGE"
 //usage:        IF_FEATURE_BRCTL_FANCY(
-//usage:     "\n        stp BRIDGE 1/yes/on|0/no/off    STP on/off"
+//usage:     "\n        showmacs BRIDGE                 List MAC addresses"
+//usage:     "\n        showstp BRIDGE                  Show STP info"
+//usage:     "\n        stp BRIDGE 1/yes/on|0/no/off    Set STP on/off"
 //usage:     "\n        setageing BRIDGE SECONDS        Set ageing time"
 //usage:     "\n        setfd BRIDGE SECONDS            Set bridge forward delay"
 //usage:     "\n        sethello BRIDGE SECONDS         Set hello time"
@@ -63,9 +65,7 @@
 //usage:     "\n        setpathcost BRIDGE IFACE COST   Set path cost"
 //usage:        )
 // Not yet implemented:
-//                      hairpin BRIDGE IFACE on|off     Hairpin on/off
-//                      showmacs BRIDGE                 List mac addrs
-//                      showstp BRIDGE                  Show stp info
+//                      hairpin BRIDGE IFACE on|off     Set hairpin on/off
 
 #include "libbb.h"
 #include "common_bufsiz.h"
@@ -129,7 +129,7 @@ static int show_bridge(const char *name, int need_hdr)
  *bridge name   bridge id               STP enabled     interfaces
  *br0           8000.000000000000       no              eth0
  */
-        char pathbuf[IFNAMSIZ + sizeof("/bridge/bridge_id") + 32];
+        char pathbuf[IFNAMSIZ + sizeof("/bridge/bridge_id") + 8];
         int tabs;
         DIR *ifaces;
         struct dirent *ent;
@@ -146,8 +146,7 @@ static int show_bridge(const char *name, int need_hdr)
 
         if (need_hdr)
                 puts("bridge name\tbridge id\t\tSTP enabled\tinterfaces");
-        printf("%s\t\t", name);
-        printf("%s\t", filedata);
+        printf("%s\t\t%s\t", name, filedata);
 
         strcpy(sfx, "stp_state");
         read_file(pathbuf);
@@ -158,7 +157,8 @@ static int show_bridge(const char *name, int need_hdr)
                 strcpy(filedata, "yes");
         fputs(filedata, stdout);
 
-        strcpy(sfx - (sizeof("bridge/")-1), "brif");
+        /* sfx points past "BR/bridge/", turn it into "BR/brif": */
+        sfx[-4] = 'f'; sfx[-3] = '\0';
         tabs = 0;
         ifaces = opendir(pathbuf);
         if (ifaces) {
@@ -194,7 +194,299 @@ static void write_uint(const char *name, const char *leaf, unsigned val)
         n = sprintf(filedata, "%u\n", val);
         if (write(fd, filedata, n) < 0)
                 bb_simple_perror_msg_and_die(name);
-        close(fd);
+        /* So far all callers exit very soon after calling us.
+         * Do not bother closing fd (unless debugging):
+         */
+        if (ENABLE_FEATURE_CLEAN_UP)
+                close(fd);
+}
+
+struct fdb_entry {
+        uint8_t mac_addr[6];
+        uint8_t port_no;
+        uint8_t is_local;
+        uint32_t ageing_timer_value;
+        uint8_t port_hi;
+        uint8_t pad0;
+        uint16_t unused;
+};
+
+static int compare_fdbs(const void *_f0, const void *_f1)
+{
+        const struct fdb_entry *f0 = _f0;
+        const struct fdb_entry *f1 = _f1;
+
+        return memcmp(f0->mac_addr, f1->mac_addr, 6);
+}
+
+static size_t read_bridge_forward_db(const char *name, struct fdb_entry **_fdb)
+{
+        char pathbuf[IFNAMSIZ + sizeof("/brforward") + 8];
+        struct fdb_entry *fdb;
+        size_t nentries;
+        int fd;
+        ssize_t cc;
+
+#if IFNAMSIZ == 16
+        sprintf(pathbuf, "%.16s/brforward", name);
+#else
+        sprintf(pathbuf, "%.*s/brforward", (int)IFNAMSIZ, name);
+#endif
+        fd = open(pathbuf, O_RDONLY);
+        if (fd < 0)
+                bb_error_msg_and_die("bridge %s does not exist", name);
+
+        fdb = NULL;
+        nentries = 0;
+        for (;;) {
+                fdb = xrealloc_vector(fdb, 4, nentries);
+                cc = full_read(fd, &fdb[nentries], sizeof(*fdb));
+                if (cc == 0) {
+                        break;
+                }
+                if (cc != sizeof(*fdb)) {
+                        bb_perror_msg_and_die("can't read bridge %s forward db", name);
+                }
+                ++nentries;
+        }
+
+        if (ENABLE_FEATURE_CLEAN_UP)
+                close(fd);
+
+        qsort(fdb, nentries, sizeof(*fdb), compare_fdbs);
+
+        *_fdb = fdb;
+        return nentries;
+}
+
+static void show_bridge_macs(const char *name)
+{
+        struct fdb_entry *fdb;
+        size_t nentries;
+        size_t i;
+
+        nentries = read_bridge_forward_db(name, &fdb);
+
+        printf("port no\tmac addr\t\tis local?\tageing timer\n");
+        for (i = 0; i < nentries; ++i) {
+                const struct fdb_entry *f = &fdb[i];
+                unsigned tv_sec = f->ageing_timer_value / 100;
+                unsigned tv_csec = f->ageing_timer_value % 100;
+                printf("%3u\t"
+                        "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\t"
+                        "%s\t\t"
+                        "%4u.%.2u\n",
+                        f->port_no,
+                        f->mac_addr[0], f->mac_addr[1], f->mac_addr[2],
+                        f->mac_addr[3], f->mac_addr[4], f->mac_addr[5],
+                        (f->is_local ? "yes" : "no"),
+                        tv_sec, tv_csec
+                );
+        }
+
+        if (ENABLE_FEATURE_CLEAN_UP)
+                free(fdb);
+}
+
+static void show_bridge_timer(const char *msg)
+{
+        unsigned long long centisec = xstrtoull(filedata, 0);
+        unsigned tv_sec = centisec / 100;
+        unsigned tv_csec = centisec % 100;
+        printf("%s%4u.%.2u", msg, tv_sec, tv_csec);
+}
+
+static const char *show_bridge_state(unsigned state)
+{
+        /* See linux/if_bridge.h, BR_STATE_ constants */
+        static const char state_names[] ALIGN1 =
+                "disabled\0"    //BR_STATE_DISABLED   0
+                "listening\0"   //BR_STATE_LISTENING  1
+                "learning\0"    //BR_STATE_LEARNING   2
+                "forwarding\0"  //BR_STATE_FORWARDING 3
+                "blocking"      //BR_STATE_BLOCKING   4
+        ;
+        if (state < 5)
+                return nth_string(state_names, state);
+        return utoa(state);
+}
+
+static void printf_xstrtou(const char *fmt)
+{
+        printf(fmt, xstrtou(filedata, 0));
+}
+
+static void show_bridge_port(const char *name)
+{
+        char pathbuf[IFNAMSIZ + sizeof("/brport/forward_delay_timer") + 8];
+        char *sfx;
+
+#if IFNAMSIZ == 16
+        sfx = pathbuf + sprintf(pathbuf, "%.16s/brport/", name);
+#else
+        sfx = pathbuf + sprintf(pathbuf, "%.*s/brport/", (int)IFNAMSIZ, name);
+#endif
+
+        strcpy(sfx, "port_no");
+        read_file(pathbuf);
+        printf("%s (%u)\n", name, xstrtou(filedata, 0));
+
+        strcpy(sfx + 5, "id"); // "port_id"
+        read_file(pathbuf);
+        printf_xstrtou(" port id\t\t%.4x");
+
+        strcpy(sfx, "state");
+        read_file(pathbuf);
+        printf("\t\t\tstate\t\t%15s\n", show_bridge_state(xstrtou(filedata, 0)));
+
+        strcpy(sfx, "designated_root");
+        read_file(pathbuf);
+        printf(" designated root\t%s", filedata);
+
+        strcpy(sfx, "path_cost");
+        read_file(pathbuf);
+        printf_xstrtou("\tpath cost\t\t%4u\n");
+
+        strcpy(sfx, "designated_bridge");
+        read_file(pathbuf);
+        printf(" designated bridge\t%s", filedata);
+
+        strcpy(sfx, "message_age_timer");
+        read_file(pathbuf);
+        show_bridge_timer("\tmessage age timer\t");
+
+        strcpy(sfx, "designated_port");
+        read_file(pathbuf);
+        printf_xstrtou("\n designated port\t%.4x");
+
+        strcpy(sfx, "forward_delay_timer");
+        read_file(pathbuf);
+        show_bridge_timer("\t\t\tforward delay timer\t");
+
+        strcpy(sfx, "designated_cost");
+        read_file(pathbuf);
+        printf_xstrtou("\n designated cost\t%4u");
+
+        strcpy(sfx, "hold_timer");
+        read_file(pathbuf);
+        show_bridge_timer("\t\t\thold timer\t\t");
+
+        printf("\n flags\t\t\t");
+
+        strcpy(sfx, "config_pending");
+        read_file(pathbuf);
+        if (!LONE_CHAR(filedata, '0'))
+                printf("CONFIG_PENDING ");
+
+        strcpy(sfx, "change_ack");
+        read_file(pathbuf);
+        if (!LONE_CHAR(filedata, '0'))
+                printf("TOPOLOGY_CHANGE_ACK ");
+
+        strcpy(sfx, "hairpin_mode");
+        read_file(pathbuf);
+        if (!LONE_CHAR(filedata, '0'))
+                printf_xstrtou("\n hairpin mode\t\t%4u");
+
+        printf("\n\n");
+}
+
+static void show_bridge_stp(const char *name)
+{
+        char pathbuf[IFNAMSIZ + sizeof("/bridge/topology_change_timer") + 8];
+        char *sfx;
+
+#if IFNAMSIZ == 16
+        sfx = pathbuf + sprintf(pathbuf, "%.16s/bridge/", name);
+#else
+        sfx = pathbuf + sprintf(pathbuf, "%.*s/bridge/", (int)IFNAMSIZ, name);
+#endif
+
+        strcpy(sfx, "bridge_id");
+        if (read_file(pathbuf) < 0)
+                bb_error_msg_and_die("bridge %s does not exist", name);
+
+        printf("%s\n"
+                " bridge id\t\t%s", name, filedata);
+
+        strcpy(sfx, "root_id");
+        read_file(pathbuf);
+        printf("\n designated root\t%s", filedata);
+
+        strcpy(sfx + 5, "port"); // "root_port"
+        read_file(pathbuf);
+        printf_xstrtou("\n root port\t\t%4u\t\t\t");
+
+        strcpy(sfx + 6, "ath_cost"); // "root_path_cost"
+        read_file(pathbuf);
+        printf_xstrtou("path cost\t\t%4u\n");
+
+        strcpy(sfx, "max_age");
+        read_file(pathbuf);
+        show_bridge_timer(" max age\t\t");
+        show_bridge_timer("\t\t\tbridge max age\t\t");
+
+        strcpy(sfx, "hello_time");
+        read_file(pathbuf);
+        show_bridge_timer("\n hello time\t\t");
+        show_bridge_timer("\t\t\tbridge hello time\t");
+
+        strcpy(sfx, "forward_delay");
+        read_file(pathbuf);
+        show_bridge_timer("\n forward delay\t\t");
+        show_bridge_timer("\t\t\tbridge forward delay\t");
+
+        strcpy(sfx, "ageing_time");
+        read_file(pathbuf);
+        show_bridge_timer("\n ageing time\t\t");
+
+        strcpy(sfx, "hello_timer");
+        read_file(pathbuf);
+        show_bridge_timer("\n hello timer\t\t");
+
+        strcpy(sfx, "tcn_timer");
+        read_file(pathbuf);
+        show_bridge_timer("\t\t\ttcn timer\t\t");
+
+        strcpy(sfx, "topology_change_timer");
+        read_file(pathbuf);
+        show_bridge_timer("\n topology change timer\t");
+
+        strcpy(sfx, "gc_timer");
+        read_file(pathbuf);
+        show_bridge_timer("\t\t\tgc timer\t\t");
+
+        printf("\n flags\t\t\t");
+
+        strcpy(sfx, "topology_change");
+        read_file(pathbuf);
+        if (!LONE_CHAR(filedata, '0'))
+                printf("TOPOLOGY_CHANGE ");
+
+        strcpy(sfx, "topology_change_detected");
+        read_file(pathbuf);
+        if (!LONE_CHAR(filedata, '0'))
+                printf("TOPOLOGY_CHANGE_DETECTED ");
+        printf("\n\n\n");
+
+        /* Show bridge ports */
+        {
+                DIR *ifaces;
+
+                /* sfx points past "BR/bridge/", turn it into "BR/brif": */
+                sfx[-4] = 'f'; sfx[-3] = '\0';
+                ifaces = opendir(pathbuf);
+                if (ifaces) {
+                        struct dirent *ent;
+                        while ((ent = readdir(ifaces)) != NULL) {
+                                if (DOT_OR_DOTDOT(ent->d_name))
+                                        continue; /* . or .. */
+                                show_bridge_port(ent->d_name);
+                        }
+                        if (ENABLE_FEATURE_CLEAN_UP)
+                                closedir(ifaces);
+                }
+        }
 }
 #endif
 
@@ -205,20 +497,26 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
                 "addbr\0" "delbr\0" "addif\0" "delif\0"
         IF_FEATURE_BRCTL_FANCY(
                 "stp\0"
+                "showstp\0"
                 "setageing\0" "setfd\0" "sethello\0" "setmaxage\0"
                 "setpathcost\0" "setportprio\0"
                 "setbridgeprio\0"
+                "showmacs\0"
         )
         IF_FEATURE_BRCTL_SHOW("show\0");
         enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif
                 IF_FEATURE_BRCTL_FANCY(,
                         ARG_stp,
+                        ARG_showstp,
                         ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage,
                         ARG_setpathcost, ARG_setportprio,
-                        ARG_setbridgeprio
+                        ARG_setbridgeprio,
+                        ARG_showmacs
                 )
                 IF_FEATURE_BRCTL_SHOW(, ARG_show)
         };
+        int key;
+        char *br;
 
         argv++;
         if (!*argv) {
@@ -228,185 +526,157 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
 
         xchdir("/sys/class/net");
 
-//      while (*argv)
-        {
-                smallint key;
-                char *br;
-
-                key = index_in_strings(keywords, *argv);
-                if (key == -1) /* no match found in keywords array, bail out. */
-                        bb_error_msg_and_die(bb_msg_invalid_arg_to, *argv, applet_name);
-                argv++;
+        key = index_in_strings(keywords, *argv);
+        if (key == -1) /* no match found in keywords array, bail out. */
+                bb_error_msg_and_die(bb_msg_invalid_arg_to, *argv, applet_name);
+        argv++;
 
 #if ENABLE_FEATURE_BRCTL_SHOW
-                if (key == ARG_show) { /* show [BR]... */
-                        DIR *net;
-                        struct dirent *ent;
-                        int need_hdr = 1;
-                        int exitcode = EXIT_SUCCESS;
-
-                        if (*argv) {
-                                /* "show BR1 BR2 BR3" */
-                                do {
-                                        if (show_bridge(*argv, need_hdr) >= 0) {
-                                                need_hdr = 0;
-                                        } else {
-                                                bb_error_msg("bridge %s does not exist", *argv);
+        if (key == ARG_show) { /* show [BR]... */
+                DIR *net;
+                struct dirent *ent;
+                int need_hdr = 1;
+                int exitcode = EXIT_SUCCESS;
+
+                if (*argv) {
+                        /* "show BR1 BR2 BR3" */
+                        do {
+                                if (show_bridge(*argv, need_hdr) >= 0) {
+                                        need_hdr = 0;
+                                } else {
+                                        bb_error_msg("bridge %s does not exist", *argv);
 //TODO: if device exists, but is not a BR, brctl from bridge-utils 1.6
 //says this instead: "device eth0 is not a bridge"
-                                                exitcode = EXIT_FAILURE;
-                                        }
-                                } while (*++argv != NULL);
-                                return exitcode;
-                        }
-
-                        /* "show" (if no ifaces, shows nothing, not even header) */
-                        net = xopendir(".");
-                        while ((ent = readdir(net)) != NULL) {
-                                if (DOT_OR_DOTDOT(ent->d_name))
-                                        continue; /* . or .. */
-                                if (show_bridge(ent->d_name, need_hdr) >= 0)
-                                        need_hdr = 0;
-                        }
-                        if (ENABLE_FEATURE_CLEAN_UP)
-                                closedir(net);
+                                        exitcode = EXIT_FAILURE;
+                                }
+                        } while (*++argv != NULL);
                         return exitcode;
                 }
+
+                /* "show" (if no ifaces, shows nothing, not even header) */
+                net = xopendir(".");
+                while ((ent = readdir(net)) != NULL) {
+                        if (DOT_OR_DOTDOT(ent->d_name))
+                                continue; /* . or .. */
+                        if (show_bridge(ent->d_name, need_hdr) >= 0)
+                                need_hdr = 0;
+                }
+                if (ENABLE_FEATURE_CLEAN_UP)
+                        closedir(net);
+                return exitcode;
+        }
 #endif
 
-                if (!*argv) /* all but 'show' need at least one argument */
-                        bb_show_usage();
+        if (!*argv) /* All of the below need at least one argument */
+                bb_show_usage();
 
-                br = *argv++;
-
-                if (key == ARG_addbr || key == ARG_delbr) {
-                        /* addbr or delbr */
-                        /* brctl from bridge-utils 1.6 still uses ioctl
-                         * for SIOCBRADDBR / SIOCBRDELBR, not /sys accesses
-                         */
-                        int fd = xsocket(AF_INET, SOCK_STREAM, 0);
-                        ioctl_or_perror_and_die(fd,
-                                key == ARG_addbr ? SIOCBRADDBR : SIOCBRDELBR,
-                                br, "bridge %s", br
-                        );
-                        //close(fd);
-                        //goto done;
-                        /* bridge-utils 1.6 simply ignores trailing args:
-                         * "brctl addbr BR1 ARGS" ignores ARGS
-                         */
-                        if (ENABLE_FEATURE_CLEAN_UP)
-                                close(fd);
-                        return EXIT_SUCCESS;
-                }
+        br = *argv++;
+
+        if (key == ARG_addbr || key == ARG_delbr) {
+                /* brctl from bridge-utils 1.6 still uses ioctl
+                 * for SIOCBRADDBR / SIOCBRDELBR, not /sys accesses
+                 */
+                int fd = xsocket(AF_INET, SOCK_STREAM, 0);
+                ioctl_or_perror_and_die(fd,
+                        key == ARG_addbr ? SIOCBRADDBR : SIOCBRDELBR,
+                        br, "bridge %s", br
+                );
+                //close(fd);
+                //goto done;
+                /* bridge-utils 1.6 simply ignores trailing args:
+                 * "brctl addbr BR1 ARGS" ignores ARGS
+                 */
+                if (ENABLE_FEATURE_CLEAN_UP)
+                        close(fd);
+                return EXIT_SUCCESS;
+        }
 
-                if (!*argv) /* all but 'addbr/delbr' need at least two arguments */
-                        bb_show_usage();
+        if (key == ARG_showmacs) {
+                show_bridge_macs(br);
+                return EXIT_SUCCESS;
+        }
+        if (key == ARG_showstp) {
+                show_bridge_stp(br);
+                return EXIT_SUCCESS;
+        }
 
-#if ENABLE_FEATURE_BRCTL_FANCY
-                if (key == ARG_stp) { /* stp */
-                        static const char no_yes[] ALIGN1 =
-                                "0\0" "off\0" "n\0" "no\0"   /* 0 .. 3 */
-                                "1\0" "on\0"  "y\0" "yes\0"; /* 4 .. 7 */
-                        int onoff = index_in_strings(no_yes, *argv);
-                        if (onoff < 0)
-                                bb_error_msg_and_die(bb_msg_invalid_arg_to, *argv, applet_name);
-                        onoff = (unsigned)onoff / 4;
-                        write_uint(br, "bridge/stp_state", onoff);
-                        //goto done_next_argv;
-                        return EXIT_SUCCESS;
-                }
+        if (!*argv) /* All of the below need at least two arguments */
+                bb_show_usage();
 
-                if ((unsigned)(key - ARG_setageing) < 4) { /* time related ops */
-                        /* setageing BR N: "N*100\n" to /sys/class/net/BR/bridge/ageing_time
-                         * setfd BR N:     "N*100\n" to /sys/class/net/BR/bridge/forward_delay
-                         * sethello BR N:  "N*100\n" to /sys/class/net/BR/bridge/hello_time
-                         * setmaxage BR N: "N*100\n" to /sys/class/net/BR/bridge/max_age
-                         */
-                        write_uint(br,
-                                nth_string(
-                                        "bridge/ageing_time"  "\0" /* ARG_setageing */
-                                        "bridge/forward_delay""\0" /* ARG_setfd     */
-                                        "bridge/hello_time"   "\0" /* ARG_sethello  */
-                                        "bridge/max_age",          /* ARG_setmaxage */
-                                        key - ARG_setageing
-                                ),
-                                str_to_jiffies(*argv)
-                        );
-                        //goto done_next_argv;
-                        return EXIT_SUCCESS;
-                }
+#if ENABLE_FEATURE_BRCTL_FANCY
+        if (key == ARG_stp) {
+                static const char no_yes[] ALIGN1 =
+                        "0\0" "off\0" "n\0" "no\0"   /* 0 .. 3 */
+                        "1\0" "on\0"  "y\0" "yes\0"; /* 4 .. 7 */
+                int onoff = index_in_strings(no_yes, *argv);
+                if (onoff < 0)
+                        bb_error_msg_and_die(bb_msg_invalid_arg_to, *argv, applet_name);
+                onoff = (unsigned)onoff / 4;
+                write_uint(br, "bridge/stp_state", onoff);
+                return EXIT_SUCCESS;
+        }
 
-                if (key == ARG_setbridgeprio) {
-                        write_uint(br, "bridge/priority", xatoi_positive(*argv));
-                        //goto done_next_argv;
-                        return EXIT_SUCCESS;
-                }
+        if ((unsigned)(key - ARG_setageing) < 4) { /* time related ops */
+                /* setageing BR N: "N*100\n" to /sys/class/net/BR/bridge/ageing_time
+                 * setfd BR N:     "N*100\n" to /sys/class/net/BR/bridge/forward_delay
+                 * sethello BR N:  "N*100\n" to /sys/class/net/BR/bridge/hello_time
+                 * setmaxage BR N: "N*100\n" to /sys/class/net/BR/bridge/max_age
+                 */
+                write_uint(br,
+                        nth_string(
+                                "bridge/ageing_time"  "\0" /* ARG_setageing */
+                                "bridge/forward_delay""\0" /* ARG_setfd     */
+                                "bridge/hello_time"   "\0" /* ARG_sethello  */
+                                "bridge/max_age",          /* ARG_setmaxage */
+                                key - ARG_setageing
+                        ),
+                        str_to_jiffies(*argv)
+                );
+                return EXIT_SUCCESS;
+        }
 
-                if (key == ARG_setpathcost
-                 || key == ARG_setportprio
-                ) {
-                        if (!argv[1])
-                                bb_show_usage();
-                        /* BR is not used (and ignored!) for these commands:
-                         * "setpathcost BR PORT N" writes "N\n" to
-                         * /sys/class/net/PORT/brport/path_cost
-                         * "setportprio BR PORT N" writes "N\n" to
-                         * /sys/class/net/PORT/brport/priority
-                         */
-                        write_uint(argv[0],
-                                nth_string(
-                                        "brport/path_cost" "\0" /* ARG_setpathcost */
-                                        "brport/priority",      /* ARG_setportprio */
-                                        key - ARG_setpathcost
-                                ),
-                                xatoi_positive(argv[1])
-                        );
-                        //argv++;
-                        //goto done_next_argv;
-                        return EXIT_SUCCESS;
-                }
+        if (key == ARG_setbridgeprio) {
+                write_uint(br, "bridge/priority", xatoi_positive(*argv));
+                return EXIT_SUCCESS;
+        }
 
-/* TODO: "showmacs BR"
- *      port no\tmac addr\t\tis local?\tageing timer
- *      <sp><sp>1\txx:xx:xx:xx:xx:xx\tno\t\t<sp><sp><sp>1.31
- *      port no mac addr                is local?       ageing timer
- *        1     xx:xx:xx:xx:xx:xx       no                 1.31
- * Read fixed-sized records from /sys/class/net/BR/brforward:
- *      struct __fdb_entry {
- *              uint8_t  mac_addr[ETH_ALEN];
- *              uint8_t  port_no; //lsb
- *              uint8_t  is_local;
- *              uint32_t ageing_timer_value;
- *              uint8_t  port_hi;
- *              uint8_t  pad0;
- *              uint16_t unused;
- *      };
- */
+        if (key == ARG_setpathcost
+         || key == ARG_setportprio
+        ) {
+                if (!argv[1])
+                        bb_show_usage();
+                /* BR is not used (and ignored!) for these commands:
+                 * "setpathcost BR PORT N" writes "N\n" to
+                 * /sys/class/net/PORT/brport/path_cost
+                 * "setportprio BR PORT N" writes "N\n" to
+                 * /sys/class/net/PORT/brport/priority
+                 */
+                write_uint(argv[0],
+                        nth_string(
+                                "brport/path_cost" "\0" /* ARG_setpathcost */
+                                "brport/priority",      /* ARG_setportprio */
+                                key - ARG_setpathcost
+                        ),
+                        xatoi_positive(argv[1])
+                );
+                return EXIT_SUCCESS;
+        }
 #endif
-                /* always true: if (key == ARG_addif || key == ARG_delif) */ {
-                        /* addif or delif */
-                        struct ifreq ifr;
-                        int fd = xsocket(AF_INET, SOCK_STREAM, 0);
-
-                        strncpy_IFNAMSIZ(ifr.ifr_name, br);
-                        ifr.ifr_ifindex = if_nametoindex(*argv);
-                        if (ifr.ifr_ifindex == 0) {
-                                bb_perror_msg_and_die("iface %s", *argv);
-                        }
-                        ioctl_or_perror_and_die(fd,
-                                key == ARG_addif ? SIOCBRADDIF : SIOCBRDELIF,
-                                &ifr, "bridge %s", br
-                        );
-                        //close(fd);
-                        //goto done_next_argv;
-                        if (ENABLE_FEATURE_CLEAN_UP)
-                                close(fd);
-                        return EXIT_SUCCESS;
+        /* always true: if (key == ARG_addif || key == ARG_delif) */ {
+                struct ifreq ifr;
+                int fd = xsocket(AF_INET, SOCK_STREAM, 0);
+
+                strncpy_IFNAMSIZ(ifr.ifr_name, br);
+                ifr.ifr_ifindex = if_nametoindex(*argv);
+                if (ifr.ifr_ifindex == 0) {
+                        bb_perror_msg_and_die("iface %s", *argv);
                 }
-
-// done_next_argv:
-//              argv++;
-// done:
+                ioctl_or_perror_and_die(fd,
+                        key == ARG_addif ? SIOCBRADDIF : SIOCBRDELIF,
+                        &ifr, "bridge %s", br
+                );
+                if (ENABLE_FEATURE_CLEAN_UP)
+                        close(fd);
         }
 
         return EXIT_SUCCESS;
diff --git a/networking/netstat.c b/networking/netstat.c
index 29b891cdc..c7934423b 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -172,7 +172,7 @@ struct prg_node {
 #define PRG_HASH_SIZE 211
 
 struct globals {
-        smallint flags;
+        smalluint flags;
 #if ENABLE_FEATURE_NETSTAT_PRG
         smallint prg_cache_loaded;
         struct prg_node *prg_hash[PRG_HASH_SIZE];
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 8adde14b8..c43e60558 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -283,6 +283,7 @@ static const struct {
         { ns_t_cname, "CNAME" },
         { ns_t_mx,    "MX"    },
         { ns_t_txt,   "TXT"   },
+        { ns_t_srv,   "SRV"   },
         { ns_t_ptr,   "PTR"   },
         { ns_t_any,   "ANY"   },
 };
@@ -435,6 +436,25 @@ static int parse_reply(const unsigned char *msg, size_t len)
                         }
                         break;
 
+                case ns_t_srv:
+                        if (rdlen < 6) {
+                                //printf("SRV record too short\n");
+                                return -1;
+                        }
+
+                        cp = ns_rr_rdata(rr);
+                        n = ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
+                                               cp + 6, dname, sizeof(dname));
+
+                        if (n < 0) {
+                                //printf("Unable to uncompress domain: %s\n", strerror(errno));
+                                return -1;
+                        }
+
+                        printf("%s\tservice = %u %u %u %s\n", ns_rr_name(rr),
+                                ns_get16(cp), ns_get16(cp + 2), ns_get16(cp + 4), dname);
+                        break;
+
                 case ns_t_soa:
                         if (rdlen < 20) {
                                 dbg("SOA record too short:%d\n", rdlen);
@@ -615,9 +635,15 @@ static int send_queries(struct ns *ns)
                                         G.query[qn].name, rcodes[rcode]);
                         G.exitcode = EXIT_FAILURE;
                 } else {
-                        if (parse_reply(reply, recvlen) < 0) {
+                        switch (parse_reply(reply, recvlen)) {
+                        case -1:
                                 printf("*** Can't find %s: Parse error\n", G.query[qn].name);
                                 G.exitcode = EXIT_FAILURE;
+                                break;
+
+                        case 0:
+                                printf("*** Can't find %s: No answer\n", G.query[qn].name);
+                                break;
                         }
                 }
                 bb_putchar('\n');
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 48dc1c379..0f12409f9 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -164,7 +164,7 @@
  */
 
 #define INITIAL_SAMPLES    4    /* how many samples do we want for init */
-#define MIN_FREQHOLD      12    /* adjust offset, but not freq in this many first adjustments */
+#define MIN_FREQHOLD      10    /* adjust offset, but not freq in this many first adjustments */
 #define BAD_DELAY_GROWTH   4    /* drop packet if its delay grew by more than this factor */
 
 #define RETRY_INTERVAL    32    /* on send/recv error, retry in N secs (need to be power of 2) */
@@ -504,12 +504,14 @@ static ALWAYS_INLINE double MAXD(double a, double b)
                 return a;
         return b;
 }
+#if !USING_KERNEL_PLL_LOOP
 static ALWAYS_INLINE double MIND(double a, double b)
 {
         if (a < b)
                 return a;
         return b;
 }
+#endif
 static NOINLINE double my_SQRT(double X)
 {
         union {
@@ -1874,9 +1876,11 @@ update_local_clock(peer_t *p)
 //15:31:53.473 update from:<IP> offset:+0.000007 delay:0.158142 jitter:0.010922 clock drift:+9.343ppm tc:6
 //15:32:58.902 update from:<IP> offset:-0.000728 delay:0.158222 jitter:0.009454 clock drift:+9.298ppm tc:6
                         /*
-                         * This expression would choose MIN_FREQHOLD + 8 in the above example.
+                         * This expression would choose MIN_FREQHOLD + 14 in the above example
+                         * (off_032 is +1 for each 0.032768 seconds of offset).
                          */
-                        G.FREQHOLD_cnt = 1 + MIN_FREQHOLD + ((unsigned)(abs(tmx.offset)) >> 16);
+                        unsigned off_032 = abs((int)(tmx.offset >> 15));
+                        G.FREQHOLD_cnt = 1 + MIN_FREQHOLD + off_032;
                 }
                 G.FREQHOLD_cnt--;
                 tmx.status |= STA_FREQHOLD;
diff --git a/networking/route.c b/networking/route.c
index a5d8d7cb9..e785b1da6 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -628,6 +628,7 @@ static void INET6_displayroutes(void)
 
                 r = 0;
                 while (1) {
+                        memset(&snaddr6, 0, sizeof(snaddr6));
                         inet_pton(AF_INET6, addr6x + r,
                                           (struct sockaddr *) &snaddr6.sin6_addr);
                         snaddr6.sin6_family = AF_INET6;
diff --git a/networking/tc.c b/networking/tc.c
index 2e1078d31..510684443 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -215,8 +215,6 @@ static int prio_print_opt(struct rtattr *opt)
         if (opt == NULL)
                 return 0;
         parse_rtattr_nested_compat(tb, TCA_PRIO_MAX, opt, qopt, sizeof(*qopt));
-        if (tb == NULL)
-                return 0;
         printf("bands %u priomap ", qopt->bands);
         for (i=0; i<=TC_PRIO_MAX; i++)
                 printf(" %d", qopt->priomap[i]);
diff --git a/networking/telnet.c b/networking/telnet.c
index fa1628723..9fc85050b 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -238,6 +238,18 @@ static void handle_net_output(int len)
                         *dst = '\r'; /* Enter -> CR LF */
                         *++dst = '\n';
                 }
+#if 0
+/* putty's "special commands" mode does this: */
+/* Korenix 3005 switch needs at least the backspace tweak */
+                if (c == 0x08 || c == 0x7f) { /* ctrl+h || backspace */
+                        *dst = IAC;
+                        *++dst = EC;
+                }
+                if (c == 0x03) { /* ctrl+c */
+                        *dst = IAC;
+                        *++dst = IP;
+                }
+#endif
                 dst++;
         }
         if (dst - outbuf != 0)
@@ -248,7 +260,7 @@ static void handle_net_input(int len)
 {
         byte c;
         int i;
-        int cstart = cstart; /* for compiler */
+        int cstart = 0;
 
         i = 0;
         //bb_error_msg("[%u,'%.*s']", G.telstate, len, G.buf);
diff --git a/networking/tls_aesgcm.c b/networking/tls_aesgcm.c
index a4663cd79..5ddcdd2ad 100644
--- a/networking/tls_aesgcm.c
+++ b/networking/tls_aesgcm.c
@@ -13,6 +13,7 @@ typedef uint32_t word32;
 
 /* from wolfssl-3.15.3/wolfcrypt/src/aes.c */
 
+#ifdef UNUSED
 static ALWAYS_INLINE void FlattenSzInBits(byte* buf, word32 sz)
 {
     /* Multiply the sz by 8 */
@@ -32,6 +33,7 @@ static ALWAYS_INLINE void FlattenSzInBits(byte* buf, word32 sz)
 //    buf[7] = sz & 0xff;
     *(uint32_t*)(buf + 4) = SWAP_BE32(sz);
 }
+#endif
 
 static void RIGHTSHIFTX(byte* x)
 {
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 0435d6ba6..06d3f19da 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -546,11 +546,11 @@ pr_type(unsigned char t)
         };
 # if ENABLE_TRACEROUTE6
         static const char *const ttab6[] = {
-[0]     "Error", "Dest Unreachable", "Packet Too Big", "Time Exceeded",
-[4]     "Param Problem",
-[8]     "Echo Request", "Echo Reply", "Membership Query", "Membership Report",
-[12]    "Membership Reduction", "Router Solicit", "Router Advert", "Neighbor Solicit",
-[16]    "Neighbor Advert", "Redirect",
+[0]     = "Error", "Dest Unreachable", "Packet Too Big", "Time Exceeded",
+[4]     = "Param Problem",
+[8]     = "Echo Request", "Echo Reply", "Membership Query", "Membership Report",
+[12]    = "Membership Reduction", "Router Solicit", "Router Advert", "Neighbor Solicit",
+[16]    = "Neighbor Advert", "Redirect",
         };
 
         if (dest_lsa->u.sa.sa_family == AF_INET6) {
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 4a452cdb9..9ec752dfc 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -539,7 +539,7 @@ int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg,
 
                 if (optflag->flags == OPTION_BIN) {
                         val = strtok(NULL, ""); /* do not split "'q w e'" */
-                        trim(val);
+                        if (val) trim(val);
                 } else
                         val = strtok(NULL, ", \t");
                 if (!val)
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 9d8e17c51..85c410a7c 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -123,6 +123,7 @@ static const char udhcpc6_longopts[] ALIGN1 =
         "request-option\0" Required_argument "O"
         "no-default-options\0" No_argument   "o"
         "foreground\0"     No_argument       "f"
+        "stateless\0"      No_argument       "l"
         USE_FOR_MMU(
         "background\0"     No_argument       "b"
         )
@@ -147,9 +148,10 @@ enum {
         OPT_o = 1 << 12,
         OPT_x = 1 << 13,
         OPT_f = 1 << 14,
-        OPT_d = 1 << 15,
+        OPT_l = 1 << 15,
+        OPT_d = 1 << 16,
 /* The rest has variable bit positions, need to be clever */
-        OPTBIT_d = 15,
+        OPTBIT_d = 16,
         USE_FOR_MMU(             OPTBIT_b,)
         ///IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,)
         IF_FEATURE_UDHCP_PORT(   OPTBIT_P,)
@@ -479,15 +481,31 @@ static ALWAYS_INLINE uint32_t random_xid(void)
 /* Initialize the packet with the proper defaults */
 static uint8_t *init_d6_packet(struct d6_packet *packet, char type, uint32_t xid)
 {
+        uint8_t *ptr;
         struct d6_option *clientid;
+        unsigned secs;
 
         memset(packet, 0, sizeof(*packet));
 
         packet->d6_xid32 = xid;
         packet->d6_msg_type = type;
 
+        /* ELAPSED_TIME option is required to be present by the RFC,
+         * and some servers do check for its presense. [which?]
+         */
+        ptr = packet->d6_options; /* NB: it is 32-bit aligned */
+        *((uint32_t*)ptr) = htonl((D6_OPT_ELAPSED_TIME << 16) + 2);
+        ptr += 4;
+        client_data.last_secs = monotonic_sec();
+        if (client_data.first_secs == 0)
+                client_data.first_secs = client_data.last_secs;
+        secs = client_data.last_secs - client_data.first_secs;
+        *((uint16_t*)ptr) = (secs < 0xffff) ? htons(secs) : 0xffff;
+        ptr += 2;
+
+        /* add CLIENTID option */
         clientid = (void*)client_data.clientid;
-        return mempcpy(packet->d6_options, clientid, clientid->len + 2+2);
+        return mempcpy(ptr, clientid, clientid->len + 2+2);
 }
 
 static uint8_t *add_d6_client_options(uint8_t *ptr)
@@ -544,6 +562,46 @@ static int d6_mcast_from_client_data_ifindex(struct d6_packet *packet, uint8_t *
         );
 }
 
+/* RFC 3315 18.1.5. Creation and Transmission of Information-request Messages
+ *
+ * The client uses an Information-request message to obtain
+ * configuration information without having addresses assigned to it.
+ *
+ * The client sets the "msg-type" field to INFORMATION-REQUEST.  The
+ * client generates a transaction ID and inserts this value in the
+ * "transaction-id" field.
+ *
+ * The client SHOULD include a Client Identifier option to identify
+ * itself to the server.  If the client does not include a Client
+ * Identifier option, the server will not be able to return any client-
+ * specific options to the client, or the server may choose not to
+ * respond to the message at all.  The client MUST include a Client
+ * Identifier option if the Information-Request message will be
+ * authenticated.
+ *
+ * The client MUST include an Option Request option (see section 22.7)
+ * to indicate the options the client is interested in receiving.  The
+ * client MAY include options with data values as hints to the server
+ * about parameter values the client would like to have returned.
+ */
+/* NOINLINE: limit stack usage in caller */
+static NOINLINE int send_d6_info_request(uint32_t xid)
+{
+        struct d6_packet packet;
+        uint8_t *opt_ptr;
+
+        /* Fill in: msg type, client id */
+        opt_ptr = init_d6_packet(&packet, D6_MSG_INFORMATION_REQUEST, xid);
+
+        /* Add options:
+         * "param req" option according to -O, options specified with -x
+         */
+        opt_ptr = add_d6_client_options(opt_ptr);
+
+        bb_error_msg("sending %s", "info request");
+        return d6_mcast_from_client_data_ifindex(&packet, opt_ptr);
+}
+
 /* Milticast a DHCPv6 Solicit packet to the network, with an optionally requested IP.
  *
  * RFC 3315 17.1.1. Creation of Solicit Messages
@@ -1129,6 +1187,8 @@ static void client_background(void)
 //usage:     "\n        -o              Don't request any options (unless -O is given)"
 //usage:     "\n        -r IPv6         Request this address ('no' to not request any IP)"
 //usage:     "\n        -d              Request prefix"
+//usage:     "\n        -l              Send 'information request' instead of 'solicit'"
+//usage:     "\n                        (used for servers which do not assign IPv6 addresses)"
 //usage:     "\n        -x OPT:VAL      Include option OPT in sent packets (cumulative)"
 //usage:     "\n                        Examples of string, numeric, and hex byte opts:"
 //usage:     "\n                        -x hostname:bbox - option 12"
@@ -1181,7 +1241,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
         /* Parse command line */
         opt = getopt32long(argv, "^"
                 /* O,x: list; -T,-t,-A take numeric param */
-                "i:np:qRr:s:T:+t:+SA:+O:*ox:*fd"
+                "i:np:qRr:s:T:+t:+SA:+O:*ox:*fld"
                 USE_FOR_MMU("b")
                 ///IF_FEATURE_UDHCPC_ARPING("a")
                 IF_FEATURE_UDHCP_PORT("P:")
@@ -1198,15 +1258,20 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
         );
         requested_ipv6 = NULL;
         option_mask32 |= OPT_r;
-        if (opt & OPT_r) {
+        if (opt & OPT_l) {
+                /* for -l, do not require IPv6 assignment from server */
+                option_mask32 &= ~OPT_r;
+        } else if (opt & OPT_r) {
+                /* explicit "-r ARG" given */
                 if (strcmp(str_r, "no") == 0) {
-                        option_mask32 -= OPT_r;
+                        option_mask32 &= ~OPT_r;
                 } else {
                         if (inet_pton(AF_INET6, str_r, &ipv6_buf) <= 0)
                                 bb_error_msg_and_die("bad IPv6 address '%s'", str_r);
                         requested_ipv6 = &ipv6_buf;
                 }
         }
+
 #if ENABLE_FEATURE_UDHCP_PORT
         if (opt & OPT_P) {
                 CLIENT_PORT6 = xatou16(str_P);
@@ -1353,7 +1418,10 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                         if (packet_num == 0)
                                                 xid = random_xid();
                                         /* multicast */
-                                        send_d6_discover(xid, requested_ipv6);
+                                        if (opt & OPT_l)
+                                                send_d6_info_request(xid);
+                                        else
+                                                send_d6_discover(xid, requested_ipv6);
                                         timeout = discover_timeout;
                                         packet_num++;
                                         continue;
@@ -1418,7 +1486,10 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                          * Anyway, it does recover by eventually failing through
                          * into INIT_SELECTING state.
                          */
-                                        send_d6_renew(xid, &srv6_buf, requested_ipv6);
+                                        if (opt & OPT_l)
+                                                send_d6_info_request(xid);
+                                        else
+                                                send_d6_renew(xid, &srv6_buf, requested_ipv6);
                                         timeout >>= 1;
                                         continue;
                                 }
@@ -1432,8 +1503,10 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                 /* Lease is *really* about to run out,
                                  * try to find DHCP server using broadcast */
                                 if (timeout > 0) {
-                                        /* send a broadcast renew request */
-                                        send_d6_renew(xid, /*server_ipv6:*/ NULL, requested_ipv6);
+                                        if (opt & OPT_l)
+                                                send_d6_info_request(xid);
+                                        else /* send a broadcast renew request */
+                                                send_d6_renew(xid, /*server_ipv6:*/ NULL, requested_ipv6);
                                         timeout >>= 1;
                                         continue;
                                 }
@@ -1740,6 +1813,12 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                         prefix_timeout = address_timeout;
                                 /* note: "int timeout" will not overflow even with 0xffffffff inputs here: */
                                 timeout = (prefix_timeout < address_timeout ? prefix_timeout : address_timeout) / 2;
+                                if (opt & OPT_l) {
+                                        /* TODO: request OPTION_INFORMATION_REFRESH_TIME (32)
+                                         * and use its value instead of the default 1 day.
+                                         */
+                                        timeout = 24 * 60 * 60;
+                                }
                                 /* paranoia: must not be too small */
                                 /* timeout > 60 - ensures at least one unicast renew attempt */
                                 if (timeout < 61)
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 656295ff7..5a1f8fd7a 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -606,7 +606,7 @@ static ALWAYS_INLINE uint32_t random_xid(void)
 /* Initialize the packet with the proper defaults */
 static void init_packet(struct dhcp_packet *packet, char type)
 {
-        uint16_t secs;
+        unsigned secs;
 
         /* Fill in: op, htype, hlen, cookie fields; message type option: */
         udhcp_init_header(packet, type);
@@ -617,7 +617,7 @@ static void init_packet(struct dhcp_packet *packet, char type)
         if (client_data.first_secs == 0)
                 client_data.first_secs = client_data.last_secs;
         secs = client_data.last_secs - client_data.first_secs;
-        packet->secs = htons(secs);
+        packet->secs = (secs < 0xffff) ? htons(secs) : 0xffff;
 
         memcpy(packet->chaddr, client_data.client_mac, 6);
         if (client_data.clientid)
diff --git a/networking/udhcp/dhcpc.h b/networking/udhcp/dhcpc.h
index 42fe71a36..b407a6cdb 100644
--- a/networking/udhcp/dhcpc.h
+++ b/networking/udhcp/dhcpc.h
@@ -22,8 +22,8 @@ struct client_data_t {
         uint8_t *hostname;              /* Optional hostname to use */
         uint8_t *fqdn;                  /* Optional fully qualified domain name to use */
 
-        uint16_t first_secs;
-        uint16_t last_secs;
+        unsigned first_secs;
+        unsigned last_secs;
 
         int sockfd;
         smallint listen_mode;
diff --git a/networking/wget.c b/networking/wget.c
index 5b85cce1f..4365c76ce 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1142,7 +1142,7 @@ static void download_one_url(const char *url)
                  * We are not sure it exists on remote side */
         }
 
-        redir_limit = 5;
+        redir_limit = 16;
  resolve_lsa:
         lsa = xhost2sockaddr(server.host, server.port);
         if (!(option_mask32 & WGET_OPT_QUIET)) {
diff --git a/networking/whois.c b/networking/whois.c
index 55e1de964..caa71ac51 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -53,7 +53,9 @@ static char *query(const char *host, int port, const char *domain)
         fp = xfdopen_for_read(fd);
 
         success = 0;
-        while (fgets(linebuf, sizeof(linebuf)-1, fp)) {
+        while (bufpos < 32*1024 /* paranoia */
+         && fgets(linebuf, sizeof(linebuf)-1, fp)
+        ) {
                 unsigned len;
 
                 len = strcspn(linebuf, "\r\n");