Apply post 1.13.1 patches, bump to 1.13.21_13_2

5 files changed, 49 insertions, 9 deletions

diff --git a/networking/arping.c b/networking/arping.c
index aba32b869..021dc86ea 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -322,8 +322,7 @@ int arping_main(int argc UNUSED_PARAM, char **argv)
                 struct sockaddr_in saddr;
                 int probe_fd = xsocket(AF_INET, SOCK_DGRAM, 0);
 
-                if (setsockopt(probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device, strlen(device) + 1) == -1)
-                        bb_perror_msg("cannot bind to device %s", device);
+                setsockopt_bindtodevice(probe_fd, device);
                 memset(&saddr, 0, sizeof(saddr));
                 saddr.sin_family = AF_INET;
                 if (src.s_addr) {
diff --git a/networking/ip.c b/networking/ip.c
index 10059c55f..9903c6800 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -31,7 +31,7 @@ static int NORETURN ip_print_help(char **argv UNUSED_PARAM)
 
 static int ip_do(int (*ip_func)(char **argv), char **argv)
 {
-        argv = ip_parse_common_args(argv);
+        argv = ip_parse_common_args(argv + 1);
         return ip_func(argv);
 }
 
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index 65c27f936..14fc6bbcc 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -6,7 +6,6 @@
  *
  * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
- *
  * Changes:
  *
  * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
@@ -18,10 +17,52 @@
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <asm/types.h>
+
 #ifndef __constant_htons
 #define __constant_htons htons
 #endif
-#include <linux/if_tunnel.h>
+
+// FYI: #define SIOCDEVPRIVATE 0x89F0
+
+/* From linux/if_tunnel.h. #including it proved troublesome
+ * (redefiniton errors due to name collisions in linux/ and net[inet]/) */
+#define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
+#define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)
+#define SIOCDELTUNNEL   (SIOCDEVPRIVATE + 2)
+#define SIOCCHGTUNNEL   (SIOCDEVPRIVATE + 3)
+//#define SIOCGETPRL      (SIOCDEVPRIVATE + 4)
+//#define SIOCADDPRL      (SIOCDEVPRIVATE + 5)
+//#define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
+//#define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
+#define GRE_CSUM        __constant_htons(0x8000)
+//#define GRE_ROUTING     __constant_htons(0x4000)
+#define GRE_KEY         __constant_htons(0x2000)
+#define GRE_SEQ         __constant_htons(0x1000)
+//#define GRE_STRICT      __constant_htons(0x0800)
+//#define GRE_REC         __constant_htons(0x0700)
+//#define GRE_FLAGS       __constant_htons(0x00F8)
+//#define GRE_VERSION     __constant_htons(0x0007)
+struct ip_tunnel_parm {
+        char            name[IFNAMSIZ];
+        int             link;
+        uint16_t        i_flags;
+        uint16_t        o_flags;
+        uint32_t        i_key;
+        uint32_t        o_key;
+        struct iphdr    iph;
+};
+/* SIT-mode i_flags */
+//#define SIT_ISATAP 0x0001
+//struct ip_tunnel_prl {
+//      uint32_t          addr;
+//      uint16_t          flags;
+//      uint16_t          __reserved;
+//      uint32_t          datalen;
+//      uint32_t          __reserved2;
+//      /* data follows */
+//};
+///* PRL flags */
+//#define PRL_DEFAULT 0x0001
 
 #include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
diff --git a/networking/ping.c b/networking/ping.c
index 01a9f9ac5..f2a612fde 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -572,7 +572,7 @@ static void ping4(len_and_sockaddr *lsa)
                 xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
         }
         if (str_I)
-                setsockopt(pingsock, SOL_SOCKET, SO_BINDTODEVICE, str_I, strlen(str_I) + 1);
+                setsockopt_bindtodevice(pingsock, str_I);
 
         /* enable broadcast pings */
         setsockopt_broadcast(pingsock);
@@ -622,7 +622,7 @@ static void ping6(len_and_sockaddr *lsa)
         if (source_lsa)
                 xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
         if (str_I)
-                setsockopt(pingsock, SOL_SOCKET, SO_BINDTODEVICE, str_I, strlen(str_I) + 1);
+                setsockopt_bindtodevice(pingsock, str_I);
 
 #ifdef ICMP6_FILTER
         {
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index ea0a2c3a8..385d5c3c0 100644
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -98,8 +98,8 @@ int FAST_FUNC udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf)
                 bb_perror_msg_and_die("SO_BROADCAST");
 
         /* NB: bug 1032 says this doesn't work on ethernet aliases (ethN:M) */
-        if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &inf, strlen(inf) + 1) == -1)
-                bb_perror_msg_and_die("SO_BINDTODEVICE");
+        if (setsockopt_bindtodevice(fd, inf))
+                xfunc_die(); /* warning is already printed */
 
         memset(&addr, 0, sizeof(addr));
         addr.sin_family = AF_INET;