14 files changed, 77 insertions, 40 deletions

diff --git a/networking/httpd.c b/networking/httpd.c
index 7684ca4e7..daa3ca1d0 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1038,6 +1038,12 @@ static char *encodeString(const char *string)
  */
 static void decodeBase64(char *Data)
 {
+# if ENABLE_BASE64 || ENABLE_UUDECODE
+        /* Call decode_base64() from uuencode.c */
+        char *eptr = Data;
+        decode_base64(&eptr, Data);
+        *eptr = '\0';
+# else
         const unsigned char *in = (const unsigned char *)Data;
         /* The decoded size will be at most 3/4 the size of the encoded */
         unsigned ch = 0;
@@ -1071,6 +1077,7 @@ static void decodeBase64(char *Data)
                 }
         }
         *Data = '\0';
+# endif
 }
 #endif
 
diff --git a/networking/ip.c b/networking/ip.c
index 7d3faf7f8..33bea5f49 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -252,7 +252,7 @@
 //usage:#define iprule_trivial_usage
 //usage:       "[list] | add|del SELECTOR ACTION"
 //usage:#define iprule_full_usage "\n\n"
-//usage:       "        SELECTOR := [from PREFIX] [to PREFIX] [tos TOS] [fwmark FWMARK]\n"
+//usage:       "        SELECTOR := [from PREFIX] [to PREFIX] [tos TOS] [fwmark FWMARK[/MASK]]\n"
 //usage:       "                        [dev IFACE] [pref NUMBER]\n"
 //usage:       "        ACTION := [table TABLE_ID] [nat ADDR]\n"
 //usage:       "                        [prohibit|reject|unreachable]\n"
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index 0ce0dfeef..50acfe4e7 100644
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -17,8 +17,10 @@
 #include <arpa/inet.h>
 
 /* from <linux/fib_rules.h>: */
-#define FRA_SUPPRESS_IFGROUP   13
-#define FRA_SUPPRESS_PREFIXLEN 14
+#define FRA_FWMARK              10
+#define FRA_SUPPRESS_IFGROUP    13
+#define FRA_SUPPRESS_PREFIXLEN  14
+#define FRA_FWMASK              16
 
 #include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
@@ -117,8 +119,18 @@ static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
         if (r->rtm_tos) {
                 printf("tos %s ", rtnl_dsfield_n2a(r->rtm_tos));
         }
-        if (tb[RTA_PROTOINFO]) {
-                printf("fwmark %#x ", *(uint32_t*)RTA_DATA(tb[RTA_PROTOINFO]));
+
+        if (tb[FRA_FWMARK] || tb[FRA_FWMASK]) {
+                uint32_t mark = 0, mask = 0;
+
+                if (tb[FRA_FWMARK])
+                        mark = *(uint32_t*)RTA_DATA(tb[FRA_FWMARK]);
+                if (tb[FRA_FWMASK]
+                 && (mask = *(uint32_t*)RTA_DATA(tb[FRA_FWMASK])) != 0xFFFFFFFF
+                )
+                        printf("fwmark %#x/%#x ", mark, mask);
+                else
+                        printf("fwmark %#x ", mark);
         }
 
         if (tb[RTA_IIF]) {
@@ -257,10 +269,18 @@ static int iprule_modify(int cmd, char **argv)
                                 invarg_1_to_2(*argv, "TOS");
                         req.r.rtm_tos = tos;
                 } else if (key == ARG_fwmark) {
-                        uint32_t fwmark;
+                        char *slash;
+                        uint32_t fwmark, fwmask;
                         NEXT_ARG();
+                        slash = strchr(*argv, '/');
+                        if (slash)
+                                *slash = '\0';
                         fwmark = get_u32(*argv, keyword_fwmark);
-                        addattr32(&req.n, sizeof(req), RTA_PROTOINFO, fwmark);
+                        addattr32(&req.n, sizeof(req), FRA_FWMARK, fwmark);
+                        if (slash) {
+                                fwmask = get_u32(slash + 1, "fwmask");
+                                addattr32(&req.n, sizeof(req), FRA_FWMASK, fwmask);
+                        }
                 } else if (key == ARG_realms) {
                         uint32_t realm;
                         NEXT_ARG();
diff --git a/networking/netstat.c b/networking/netstat.c
index 936610f89..3ab7b0d21 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -272,10 +272,9 @@ static long extract_socket_inode(const char *lname)
         return inode;
 }
 
-static int FAST_FUNC add_to_prg_cache_if_socket(const char *fileName,
-                struct stat *statbuf UNUSED_PARAM,
-                void *pid_slash_progname,
-                int depth UNUSED_PARAM)
+static int FAST_FUNC add_to_prg_cache_if_socket(struct recursive_state *state,
+                const char *fileName,
+                struct stat *statbuf UNUSED_PARAM)
 {
         char *linkname;
         long inode;
@@ -284,16 +283,17 @@ static int FAST_FUNC add_to_prg_cache_if_socket(const char *fileName,
         if (linkname != NULL) {
                 inode = extract_socket_inode(linkname);
                 free(linkname);
-                if (inode >= 0)
-                        prg_cache_add(inode, (char *)pid_slash_progname);
+                if (inode >= 0) {
+                        char *pid_slash_progname = state->userData;
+                        prg_cache_add(inode, pid_slash_progname);
+                }
         }
         return TRUE;
 }
 
-static int FAST_FUNC dir_act(const char *fileName,
-                struct stat *statbuf UNUSED_PARAM,
-                void *userData UNUSED_PARAM,
-                int depth)
+static int FAST_FUNC dir_act(struct recursive_state *state,
+                const char *fileName,
+                struct stat *statbuf UNUSED_PARAM)
 {
         const char *pid;
         char *pid_slash_progname;
@@ -301,7 +301,7 @@ static int FAST_FUNC dir_act(const char *fileName,
         char cmdline_buf[512];
         int n, len;
 
-        if (depth == 0) /* "/proc" itself */
+        if (state->depth == 0) /* "/proc" itself */
                 return TRUE; /* continue looking one level below /proc */
 
         pid = fileName + sizeof("/proc/")-1; /* point after "/proc/" */
@@ -321,8 +321,8 @@ static int FAST_FUNC dir_act(const char *fileName,
                         ACTION_RECURSE | ACTION_QUIET,
                         add_to_prg_cache_if_socket,
                         NULL,
-                        (void *)pid_slash_progname,
-                        0);
+                        (void *)pid_slash_progname
+        );
         free(pid_slash_progname);
 
         if (!n)
@@ -337,7 +337,7 @@ static void prg_cache_load(void)
 
         prg_cache_loaded = 1;
         load_ok = recursive_action("/proc", ACTION_RECURSE | ACTION_QUIET,
-                                NULL, dir_act, NULL, 0);
+                                NULL, dir_act, NULL);
         if (load_ok)
                 return;
 
diff --git a/networking/nslookup.c b/networking/nslookup.c
index c43e60558..759de5c83 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -703,12 +703,13 @@ static void parse_resolvconf(void)
 
                 while (fgets(line, sizeof(line), resolv)) {
                         char *p, *arg;
+                        char *tokstate;
 
-                        p = strtok(line, " \t\n");
+                        p = strtok_r(line, " \t\n", &tokstate);
                         if (!p)
                                 continue;
                         dbg("resolv_key:'%s'\n", p);
-                        arg = strtok(NULL, "\n");
+                        arg = strtok_r(NULL, "\n", &tokstate);
                         dbg("resolv_arg:'%s'\n", arg);
                         if (!arg)
                                 continue;
diff --git a/networking/ntpd.c b/networking/ntpd.c
index d721fe80c..44e711232 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -2025,6 +2025,15 @@ recv_and_process_peer_pkt(peer_t *p)
 
         offset = 0;
 
+        /* The below can happen as follows:
+         * = we receive two peer rsponses at once.
+         * = recv_and_process_peer_pkt(PEER1) -> update_local_clock()
+         *   -> step_time() and it closes all other fds, sets all ->fd to -1.
+         * = recv_and_process_peer_pkt(PEER2) sees PEER2->fd == -1
+         */
+        if (p->p_fd < 0)
+                return;
+
         /* We can recvfrom here and check from.IP, but some multihomed
          * ntp servers reply from their *other IP*.
          * TODO: maybe we should check at least what we can: from.port == 123?
diff --git a/networking/ping.c b/networking/ping.c
index 47b6ab1b2..5f7e5b9b5 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -217,7 +217,7 @@ static void ping4(len_and_sockaddr *lsa)
         /*memset(pkt, 0, sizeof(G.packet)); already is */
         pkt->icmp_type = ICMP_ECHO;
         pkt->icmp_id = G.myid;
-        pkt->icmp_cksum = inet_cksum((uint16_t *) pkt, sizeof(G.packet));
+        pkt->icmp_cksum = inet_cksum(pkt, sizeof(G.packet));
 
         xsendto(pingsock, G.packet, DEFDATALEN + ICMP_MINLEN, &lsa->u.sa, lsa->len);
 
@@ -529,7 +529,7 @@ static void sendping4(int junk UNUSED_PARAM)
                 /* No hton: we'll read it back on the same machine */
                 *(uint32_t*)&pkt->icmp_dun = G.cur_us = monotonic_us();
 
-        pkt->icmp_cksum = inet_cksum((uint16_t *) pkt, datalen + ICMP_MINLEN);
+        pkt->icmp_cksum = inet_cksum(pkt, datalen + ICMP_MINLEN);
 
         sendping_tail(sendping4, ICMP_MINLEN);
 }
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 5068f654b..1c4dc3e4a 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -468,7 +468,7 @@ send_probe(int seq, int ttl)
                         /* Always calculate checksum for icmp packets */
                         outicmp->icmp_cksum = 0;
                         outicmp->icmp_cksum = inet_cksum(
-                                        (uint16_t *)outicmp,
+                                        outicmp,
                                         ((char*)outip + packlen) - (char*)outicmp
                         );
                         if (outicmp->icmp_cksum == 0)
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 20d843bab..4bc719001 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -526,7 +526,7 @@ int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg,
 
         /* Cheat, the only *const* str possible is "" */
         str = (char *) const_str;
-        opt = strtok(str, " \t=:");
+        opt = strtok_r(str, " \t=:", &str);
         if (!opt)
                 return 0;
 
@@ -550,10 +550,10 @@ int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg,
                 char *val;
 
                 if (optflag->flags == OPTION_BIN) {
-                        val = strtok(NULL, ""); /* do not split "'q w e'" */
+                        val = strtok_r(NULL, "", &str); /* do not split "'q w e'" */
                         if (val) trim(val);
                 } else
-                        val = strtok(NULL, ", \t");
+                        val = strtok_r(NULL, ", \t", &str);
                 if (!val)
                         break;
 
@@ -567,7 +567,7 @@ int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg,
                         break;
                 case OPTION_IP_PAIR:
                         retval = udhcp_str2nip(val, buffer);
-                        val = strtok(NULL, ", \t/-");
+                        val = strtok_r(NULL, ", \t/-", &str);
                         if (!val)
                                 retval = 0;
                         if (retval)
@@ -631,7 +631,7 @@ int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg,
                                 *slash = '\0';
                                 retval = udhcp_str2nip(val, buffer + 1);
                                 buffer[0] = mask = bb_strtou(slash + 1, NULL, 10);
-                                val = strtok(NULL, ", \t/-");
+                                val = strtok_r(NULL, ", \t/-", &str);
                                 if (!val || mask > 32 || errno)
                                         retval = 0;
                                 if (retval) {
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 81c1dcbdc..3cbd2d3c8 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -46,7 +46,7 @@ struct dhcp_packet {
         uint8_t file[128];    /* boot file name (ASCIZ) */
         uint32_t cookie;      /* fixed first four option bytes (99,130,83,99 dec) */
         uint8_t options[DHCP_OPTIONS_BUFSIZE + CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS];
-} PACKED;
+};
 #define DHCP_PKT_SNAME_LEN      64
 #define DHCP_PKT_FILE_LEN      128
 #define DHCP_PKT_SNAME_LEN_STR "64"
@@ -56,12 +56,12 @@ struct ip_udp_dhcp_packet {
         struct iphdr ip;
         struct udphdr udp;
         struct dhcp_packet data;
-} PACKED;
+};
 
 struct udp_dhcp_packet {
         struct udphdr udp;
         struct dhcp_packet data;
-} PACKED;
+};
 
 enum {
         IP_UDP_DHCP_SIZE = sizeof(struct ip_udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS,
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index fc2d672b7..ac8af91d3 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -947,7 +947,7 @@ static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6, struct d6_pac
 //      packet.ip.tot_len = packet.udp.len; /* yes, this is needed */
 //      check = packet.udp.check;
 //      packet.udp.check = 0;
-//      if (check && check != inet_cksum((uint16_t *)&packet, bytes)) {
+//      if (check && check != inet_cksum(&packet, bytes)) {
 //              log1("packet with bad UDP checksum received, ignoring");
 //              return -2;
 //      }
diff --git a/networking/udhcp/d6_packet.c b/networking/udhcp/d6_packet.c
index 446497e15..167a813e3 100644
--- a/networking/udhcp/d6_packet.c
+++ b/networking/udhcp/d6_packet.c
@@ -103,7 +103,7 @@ int FAST_FUNC d6_send_raw_packet(
          */
         packet.ip6.ip6_hlim = IPPROTO_UDP;
         packet.udp.check = inet_cksum(
-                                (uint16_t *)&packet + 2,
+                                (uint8_t *)&packet + 4,
                                 offsetof(struct ip6_udp_d6_packet, data) - 4 + d6_pkt_size
         );
         /* fix 'hop limit' and 'next header' after UDP checksumming */
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index e13eb3f9f..66aa38c20 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -935,7 +935,7 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
         /* verify IP checksum */
         check = packet.ip.check;
         packet.ip.check = 0;
-        if (check != inet_cksum((uint16_t *)&packet.ip, sizeof(packet.ip))) {
+        if (check != inet_cksum(&packet.ip, sizeof(packet.ip))) {
                 log1s("bad IP header checksum, ignoring");
                 return -2;
         }
@@ -960,7 +960,7 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
         packet.ip.tot_len = packet.udp.len; /* yes, this is needed */
         check = packet.udp.check;
         packet.udp.check = 0;
-        if (check && check != inet_cksum((uint16_t *)&packet, bytes)) {
+        if (check && check != inet_cksum(&packet, bytes)) {
                 log1s("packet with bad UDP checksum received, ignoring");
                 return -2;
         }
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 6d4375237..51374646d 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -164,14 +164,14 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
         packet.udp.len = htons(UDP_DHCP_SIZE - padding);
         /* for UDP checksumming, ip.len is set to UDP packet len */
         packet.ip.tot_len = packet.udp.len;
-        packet.udp.check = inet_cksum((uint16_t *)&packet,
+        packet.udp.check = inet_cksum(&packet,
                         IP_UDP_DHCP_SIZE - padding);
         /* but for sending, it is set to IP packet len */
         packet.ip.tot_len = htons(IP_UDP_DHCP_SIZE - padding);
         packet.ip.ihl = sizeof(packet.ip) >> 2;
         packet.ip.version = IPVERSION;
         packet.ip.ttl = IPDEFTTL;
-        packet.ip.check = inet_cksum((uint16_t *)&packet.ip, sizeof(packet.ip));
+        packet.ip.check = inet_cksum(&packet.ip, sizeof(packet.ip));
 
         udhcp_dump_packet(dhcp_pkt);
         result = sendto(fd, &packet, IP_UDP_DHCP_SIZE - padding, /*flags:*/ 0,