Merge pull request #127 from AkihiroSuda/revendor-libslirp-20190801

revendor libslirp

Author: AkihiroSuda

slirp4netns.c

@@ -252,6 +252,7 @@ Slirp *create_slirp(void *opaque, struct slirp4netns_config *s4nn)
     Slirp *slirp = NULL;
     SlirpConfig cfg;
     memset(&cfg, 0, sizeof(cfg));
+    cfg.version = 1;
     cfg.restricted = 0;
     cfg.in_enabled = 1;
     cfg.vnetwork = s4nn->vnetwork;
@@ -273,9 +274,9 @@ Slirp *create_slirp(void *opaque, struct slirp4netns_config *s4nn)
     cfg.if_mtu = s4nn->mtu;
     cfg.if_mru = s4nn->mtu;
     cfg.disable_host_loopback = s4nn->disable_host_loopback;
-    slirp = slirp_initx(&cfg, &libslirp_cb, opaque);
+    slirp = slirp_new(&cfg, &libslirp_cb, opaque);
     if (slirp == NULL) {
-        fprintf(stderr, "slirp_initx failed\n");
+        fprintf(stderr, "slirp_new failed\n");
     }
     return slirp;
 }

vendor.md

@@ -1,6 +1,6 @@
 # Vendor
 
-The `*.patch` files in `vendor_patches` directory are applied to `vendor` via [`vendor.sh`](./vendor.sh).
+The `*.patch` files in `vendor_patches` directory (if exists) are applied to `vendor` via [`vendor.sh`](./vendor.sh).
 Please DO NOT edit files under `vendor`.
 
 ## Update vendor

vendor.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eux -o pipefail
-# May 24, 2019
-LIBSLIRP_COMMIT=113a219a69adc730ffa860c3f432049f8aa8f714
+# Aug 1, 2019
+LIBSLIRP_COMMIT=30804efc8f80f43d415057f3099c2894b0f947c4
 LIBSLIRP_REPO=https://gitlab.freedesktop.org/slirp/libslirp.git
 
 # Jul 12, 2019
@@ -20,7 +20,9 @@ git clone $LIBSLIRP_REPO $tmp_git/libslirp
 (
 	cd $tmp_git/libslirp
 	git checkout $LIBSLIRP_COMMIT
-	git am $slirp4netns_root/vendor_patches/libslirp/*.patch
+	if ls $slirp4netns_root/vendor_patches/libslirp/*.patch >/dev/null; then
+		git am $slirp4netns_root/vendor_patches/libslirp/*.patch
+	fi
 	# run make to generate src/libslirp-version.h
 	make
 	mkdir -p $tmp_vendor/libslirp/src
@@ -45,14 +47,22 @@ Vendored components:
 * libslirp: $LIBSLIRP_REPO (\`$LIBSLIRP_COMMIT\`)
 * parson: $PARSON_REPO (\`$PARSON_COMMIT\`)
 
+EOF
+
+if ls $slirp4netns_root/vendor_patches/libslirp/*.patch >/dev/null; then
+	cat <<EOF >>$tmp_vendor/README.md
 Applied patches (sha256sum):
 \`\`\`
 $(
-	cd $slirp4netns_root
-	sha256sum vendor_patches/*/*
-)
+		cd $slirp4netns_root
+		sha256sum vendor_patches/*/*
+	)
 \`\`\`
 
+EOF
+fi
+
+cat <<EOF >>$tmp_vendor/README.md
 Please do not edit the contents under this directory manually.
 
 See also [\`../vendor.md\`](../vendor.md).

vendor/README.md

@@ -1,16 +1,9 @@
 # DO NOT EDIT MANUALLY
 
 Vendored components:
-* libslirp: https://gitlab.freedesktop.org/slirp/libslirp.git (`113a219a69adc730ffa860c3f432049f8aa8f714`)
+* libslirp: https://gitlab.freedesktop.org/slirp/libslirp.git (`30804efc8f80f43d415057f3099c2894b0f947c4`)
 * parson: https://github.com/kgabis/parson.git (`c5bb9557fe98367aa8e041c65863909f12ee76b2`)
 
-Applied patches (sha256sum):
-```
-c8a0602500e5a3c7687f2af5d9d329591d655483505c192b0a656913dcc4e7ee  vendor_patches/libslirp/0001-add-slirp_initx-SlirpConfig-SlirpCb-void.patch
-495a0604f3cd3e8463f127b634215ac25d311204756d4ce4079ae81b6fb87cbe  vendor_patches/libslirp/0002-allow-custom-MTU.patch
-9cd83f55d0696d898bc8f8c48df04f8dd97576511780b36bf92f439dcb33b33c  vendor_patches/libslirp/0003-add-disable_host_loopback-prohibit-connections-to-12.patch
-```
-
 Please do not edit the contents under this directory manually.
 
 See also [`../vendor.md`](../vendor.md).

vendor/libslirp/src/if.h

@@ -12,8 +12,10 @@
 #define IF_NOCIDCOMP 0x08 /* CID compression */
 
 #define IF_MTU_DEFAULT 1500
+#define IF_MTU_MIN 68
 #define IF_MTU_MAX 65521
 #define IF_MRU_DEFAULT 1500
+#define IF_MRU_MIN 68
 #define IF_MRU_MAX 65521
 #define IF_COMP IF_AUTOCOMP /* Flags for compression */
 

vendor/libslirp/src/ip_input.c

@@ -326,6 +326,8 @@ 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;
+
     q = (struct ipasfrag *)q->ipf_next;
     while (q != (struct ipasfrag *)&fp->frag_link) {
         struct mbuf *t = dtom(slirp, q);
@@ -348,7 +350,7 @@ static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp)
      * the old buffer (in the mbuf), so we must point ip
      * into the new buffer.
      */
-    if (m->m_flags & M_EXT) {
+    if (!was_ext && m->m_flags & M_EXT) {
         int delta = (char *)q - m->m_dat;
         q = (struct ipasfrag *)(m->m_ext + delta);
     }

vendor/libslirp/src/libslirp.h

@@ -66,7 +66,15 @@ typedef struct SlirpCb {
     void (*notify)(void *opaque);
 } SlirpCb;
 
+#define SLIRP_CONFIG_VERSION_MIN 1
+#define SLIRP_CONFIG_VERSION_MAX 1
+
 typedef struct SlirpConfig {
+    /* Version must be already provided */
+    uint32_t version;
+    /*
+     * Fields introduced in SlirpConfig version 1 begin
+     */
     int restricted;
     bool in_enabled;
     struct in_addr vnetwork;
@@ -86,16 +94,19 @@ typedef struct SlirpConfig {
     const char **vdnssearch;
     const char *vdomainname;
     /* Default: IF_MTU_DEFAULT */
-    int if_mtu;
+    size_t if_mtu;
     /* Default: IF_MRU_DEFAULT */
-    int if_mru;
+    size_t if_mru;
     /* Prohibit connecting to 127.0.0.1:* */
     bool disable_host_loopback;
+    /*
+     * Fields introduced in SlirpConfig version 2 begin
+     */
 } SlirpConfig;
 
-Slirp *slirp_initx(const SlirpConfig *cfg, const SlirpCb *callbacks,
-                   void *opaque);
-/* slirp_init is deprecated in favor of slirp_initx */
+Slirp *slirp_new(const SlirpConfig *cfg, const SlirpCb *callbacks,
+                 void *opaque);
+/* slirp_init is deprecated in favor of slirp_new */
 Slirp *slirp_init(int restricted, bool in_enabled, struct in_addr vnetwork,
                   struct in_addr vnetmask, struct in_addr vhost,
                   bool in6_enabled, struct in6_addr vprefix_addr6,

vendor/libslirp/src/slirp.c

@@ -267,19 +267,17 @@ static void slirp_init_once(void)
     }
 }
 
-Slirp *slirp_initx(const SlirpConfig *cfg, const SlirpCb *callbacks,
-                   void *opaque)
+Slirp *slirp_new(const SlirpConfig *cfg, const SlirpCb *callbacks, void *opaque)
 {
     Slirp *slirp;
-    if (cfg == NULL) {
-        return NULL;
-    }
-    if (cfg->if_mtu > IF_MTU_MAX) {
-        return NULL;
-    }
-    if (cfg->if_mru > IF_MRU_MAX) {
-        return NULL;
-    }
+
+    g_return_val_if_fail(cfg != NULL, NULL);
+    g_return_val_if_fail(cfg->version >= SLIRP_CONFIG_VERSION_MIN, NULL);
+    g_return_val_if_fail(cfg->version <= SLIRP_CONFIG_VERSION_MAX, NULL);
+    g_return_val_if_fail(cfg->if_mtu >= IF_MTU_MIN || cfg->if_mtu == 0, NULL);
+    g_return_val_if_fail(cfg->if_mtu <= IF_MTU_MAX, NULL);
+    g_return_val_if_fail(cfg->if_mru >= IF_MRU_MIN || cfg->if_mru == 0, NULL);
+    g_return_val_if_fail(cfg->if_mru <= IF_MRU_MAX, NULL);
 
     slirp = g_malloc0(sizeof(Slirp));
 
@@ -297,7 +295,6 @@ Slirp *slirp_initx(const SlirpConfig *cfg, const SlirpCb *callbacks,
     ip_init(slirp);
     ip6_init(slirp);
 
-    /* Initialise mbufs *after* setting the MTU */
     m_init(slirp);
 
     slirp->vnetwork_addr = cfg->vnetwork;
@@ -341,6 +338,7 @@ Slirp *slirp_init(int restricted, bool in_enabled, struct in_addr vnetwork,
 {
     SlirpConfig cfg;
     memset(&cfg, 0, sizeof(cfg));
+    cfg.version = 1;
     cfg.restricted = restricted;
     cfg.in_enabled = in_enabled;
     cfg.vnetwork = vnetwork;
@@ -359,7 +357,7 @@ Slirp *slirp_init(int restricted, bool in_enabled, struct in_addr vnetwork,
     cfg.vnameserver6 = vnameserver6;
     cfg.vdnssearch = vdnssearch;
     cfg.vdomainname = vdomainname;
-    return slirp_initx(&cfg, callbacks, opaque);
+    return slirp_new(&cfg, callbacks, opaque);
 }
 
 void slirp_cleanup(Slirp *slirp)

vendor/libslirp/src/tcp_subr.c

@@ -261,6 +261,10 @@ struct tcpcb *tcp_newtcpcb(struct socket *so)
 
     memset((char *)tp, 0, sizeof(struct tcpcb));
     tp->seg_next = tp->seg_prev = (struct tcpiphdr *)tp;
+    /*
+     * 40: length of IPv4 header (20) + TCP header (20)
+     * 60: length of IPv6 header (40) + TCP header (20)
+     */
     tp->t_maxseg =
         MIN(so->slirp->if_mtu - ((so->so_ffamily == AF_INET) ? 40 : 60),
             TCP_MAXSEG_MAX);