Merge pull request #197 from AkihiroSuda/libslirp430-04

v0.4.5 (libslirp v4.3.0)

Author: AkihiroSuda

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([slirp4netns], [0.4.4+dev], [https://github.com/rootless-containers/slirp4netns/issues])
+AC_INIT([slirp4netns], [0.4.5+dev], [https://github.com/rootless-containers/slirp4netns/issues])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_HEADERS([config.h])
 

vendor.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eux -o pipefail
-# Mar 17, 2020 (v4.2.0)
-LIBSLIRP_COMMIT=daba14c3416fa9641ab4453a9a11e7f8bde08875
+# Apr 22, 2020 (v4.3.0)
+LIBSLIRP_COMMIT=3b478b0028d210518b5cc16ec9f208192ad31caa
 LIBSLIRP_REPO=https://gitlab.freedesktop.org/slirp/libslirp.git
 
 # Feb 21, 2020

vendor/README.md

@@ -1,7 +1,7 @@
 # DO NOT EDIT MANUALLY
 
 Vendored components:
-* libslirp: https://gitlab.freedesktop.org/slirp/libslirp.git (`daba14c3416fa9641ab4453a9a11e7f8bde08875`)
+* libslirp: https://gitlab.freedesktop.org/slirp/libslirp.git (`3b478b0028d210518b5cc16ec9f208192ad31caa`)
 * parson: https://github.com/kgabis/parson.git (`70dc239f8f54c80bf58477b25435fd3dd3102804`)
 
 Please do not edit the contents under this directory manually.

vendor/libslirp/src/ip_input.c

@@ -327,8 +327,7 @@ static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp)
      */
     q = fp->frag_link.next;
     m = dtom(slirp, q);
-
-    int was_ext = m->m_flags & M_EXT;
+    int delta = (char *)q - (m->m_flags & M_EXT ? m->m_ext : m->m_dat);
 
     q = (struct ipasfrag *)q->ipf_next;
     while (q != (struct ipasfrag *)&fp->frag_link) {
@@ -351,8 +350,7 @@ static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp)
      * then an m_ext buffer was alloced. But fp->ipq_next points to the old
      * buffer (in the mbuf), so we must point ip into the new buffer.
      */
-    if (!was_ext && m->m_flags & M_EXT) {
-        int delta = (char *)q - m->m_dat;
+    if (m->m_flags & M_EXT) {
         q = (struct ipasfrag *)(m->m_ext + delta);
     }
 

vendor/libslirp/src/libslirp-version.h

@@ -7,8 +7,9 @@ extern "C" {
 #endif
 
 #define SLIRP_MAJOR_VERSION 4
-#define SLIRP_MINOR_VERSION 2
+#define SLIRP_MINOR_VERSION 3
 #define SLIRP_MICRO_VERSION 0
+#define SLIRP_VERSION_STRING "4.3.0-git"
 
 #define SLIRP_CHECK_VERSION(major,minor,micro)                          \
     (SLIRP_MAJOR_VERSION > (major) ||                                   \

vendor/libslirp/src/libslirp.h

@@ -67,7 +67,7 @@ typedef struct SlirpCb {
 } SlirpCb;
 
 #define SLIRP_CONFIG_VERSION_MIN 1
-#define SLIRP_CONFIG_VERSION_MAX 2
+#define SLIRP_CONFIG_VERSION_MAX 3
 
 typedef struct SlirpConfig {
     /* Version must be provided */
@@ -109,6 +109,10 @@ typedef struct SlirpConfig {
      */
     struct sockaddr_in *outbound_addr;
     struct sockaddr_in6 *outbound_addr6;
+    /*
+     * Fields introduced in SlirpConfig version 3 begin
+     */
+    bool disable_dns;  /* slirp will not redirect/serve any DNS packet */
 } SlirpConfig;
 
 Slirp *slirp_new(const SlirpConfig *cfg, const SlirpCb *callbacks,

vendor/libslirp/src/slirp.c

@@ -29,6 +29,11 @@
 #include <net/if.h>
 #endif
 
+/* https://gitlab.freedesktop.org/slirp/libslirp/issues/18 */
+#if defined(__NetBSD__) && defined(if_mtu)
+#undef if_mtu
+#endif
+
 int slirp_debug;
 
 /* Define to 1 if you want KEEPALIVE timers */
@@ -333,6 +338,13 @@ Slirp *slirp_new(const SlirpConfig *cfg, const SlirpCb *callbacks, void *opaque)
         slirp->outbound_addr = NULL;
         slirp->outbound_addr6 = NULL;
     }
+
+    if (cfg->version >= 3) {
+        slirp->disable_dns = cfg->disable_dns;
+    } else {
+        slirp->disable_dns = false;
+    }
+
     return slirp;
 }
 

vendor/libslirp/src/slirp.h

@@ -202,6 +202,7 @@ struct Slirp {
 
     struct sockaddr_in *outbound_addr;
     struct sockaddr_in6 *outbound_addr6;
+    bool disable_dns; /* slirp will not redirect/serve any DNS packet */
 };
 
 void if_start(Slirp *);

vendor/libslirp/src/socket.c

@@ -821,8 +821,8 @@ void sofwdrain(struct socket *so)
 
 static bool sotranslate_out4(Slirp *s, struct socket *so, struct sockaddr_in *sin)
 {
-    if (so->so_faddr.s_addr == s->vnameserver_addr.s_addr) {
-        return get_dns_addr(&sin->sin_addr) >= 0;
+    if (!s->disable_dns && so->so_faddr.s_addr == s->vnameserver_addr.s_addr) {
+        return so->so_fport == htons(53) && get_dns_addr(&sin->sin_addr) >= 0;
     }
 
     if (so->so_faddr.s_addr == s->vhost_addr.s_addr ||
@@ -839,8 +839,13 @@ static bool sotranslate_out4(Slirp *s, struct socket *so, struct sockaddr_in *si
 
 static bool sotranslate_out6(Slirp *s, struct socket *so, struct sockaddr_in6 *sin)
 {
-    if (in6_equal(&so->so_faddr6, &s->vnameserver_addr6)) {
-        return get_dns6_addr(&sin->sin6_addr, &sin->sin6_scope_id) >= 0;
+    if (!s->disable_dns && in6_equal(&so->so_faddr6, &s->vnameserver_addr6)) {
+        uint32_t scope_id;
+        if (so->so_fport == htons(53) && get_dns6_addr(&sin->sin6_addr, &scope_id) >= 0) {
+            sin->sin6_scope_id = scope_id;
+            return true;
+        }
+        return false;
     }
 
     if (in6_equal_net(&so->so_faddr6, &s->vprefix_addr6, s->vprefix_len) ||

vendor/libslirp/src/version.c

@@ -1,11 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 #include "libslirp.h"
-#include "util.h"
 
 const char *
 slirp_version_string(void)
 {
-    return stringify(SLIRP_MAJOR_VERSION) "."
-        stringify(SLIRP_MINOR_VERSION) "."
-        stringify(SLIRP_MICRO_VERSION);
+    return SLIRP_VERSION_STRING;
 }