Version bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
InetEndpoint: properly match IPv6 addresses
2026-07-03 14:05:13 +02:00 · 2019-03-19 00:56:13 -06:00 · 2019-03-19 00:53:14 -06:00 · 2019-03-19 00:40:45 -06:00 · 2019-03-19 00:30:53 -06:00 · 2019-03-16 12:24:28 -06:00
94 changed files with 194 additions and 540 deletions
@@ -4,6 +4,3 @@
 [submodule "app/tools/wireguard"]
 	path = app/tools/wireguard
 	url = https://git.zx2c4.com/WireGuard
-[submodule "app/tools/wireguard-go"]
-	path = app/tools/wireguard-go
-	url = https://git.zx2c4.com/wireguard-go
@@ -17,8 +17,8 @@ android {
        applicationId 'com.wireguard.android'
        minSdkVersion 21
        targetSdkVersion 28
-        versionCode 446
-        versionName '0.0.20181218'
+        versionCode 449
+        versionName '0.0.20190319'
        buildConfigField 'int', 'MIN_SDK_VERSION', "$minSdkVersion.apiLevel"
    }
    // If the keystore file exists
@@ -46,6 +46,8 @@ android {
                    arguments "-DANDROID_PACKAGE_NAME=${android.defaultConfig.applicationId}"
                }
            }
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
        }
        debug {
            applicationIdSuffix ".debug"
@@ -68,11 +70,11 @@ ext {
    annotationsVersion = '1.0.1'
    appcompatVersion = '1.0.2'
    cardviewVersion = '1.0.0'
-    databindingVersion = '3.1.3'
+    databindingVersion = '3.3.1'
    materialComponentsVersion = '1.0.0'
    jsr305Version = '3.0.2'
    preferenceVersion = '1.0.0'
-    streamsupportVersion = '1.6.0'
+    streamsupportVersion = '1.7.0'
    threetenabpVersion = '1.1.1'
    zxingEmbeddedVersion = '3.6.0'
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -0,0 +1,5 @@
+# Squelch all warnings, they're harmless but ProGuard
+# escalates them as errors.
+-dontwarn sun.misc.Unsafe
+# We're OSS anyway and who doesn't love a readable log
+-dontobfuscate
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -128,6 +128,6 @@ public final class WgQuickBackend implements Backend {
        // noinspection ResultOfMethodCallIgnored
        tempFile.delete();
        if (result != 0)
-            throw new Exception(context.getString(R.string.tunnel_config_error));
+            throw new Exception(context.getString(R.string.tunnel_config_error, result));
    }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */
 package com.wireguard.android.util;
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -117,13 +117,13 @@ public final class ToolsInstaller {
    private int installMagisk() throws NoRootException {
        final StringBuilder script = new StringBuilder("set -ex; ");

-        script.append("trap 'rm -rf /sbin/.core/img/wireguard' INT TERM EXIT; ");
-        script.append(String.format("rm -rf /sbin/.core/img/wireguard/; mkdir -p /sbin/.core/img/wireguard%s; ", INSTALL_DIR));
-        script.append(String.format("printf 'name=WireGuard Command Line Tools\nversion=%s\nversionCode=%s\nauthor=zx2c4\ndescription=Command line tools for WireGuard\nminMagisk=1500\n' > /sbin/.core/img/wireguard/module.prop; ", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
-        script.append("touch /sbin/.core/img/wireguard/auto_mount; ");
+        script.append("trap 'rm -rf /sbin/.magisk/img/wireguard' INT TERM EXIT; ");
+        script.append(String.format("rm -rf /sbin/.magisk/img/wireguard/; mkdir -p /sbin/.magisk/img/wireguard%s; ", INSTALL_DIR));
+        script.append(String.format("printf 'name=WireGuard Command Line Tools\nversion=%s\nversionCode=%s\nauthor=zx2c4\ndescription=Command line tools for WireGuard\nminMagisk=1500\n' > /sbin/.magisk/img/wireguard/module.prop; ", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
+        script.append("touch /sbin/.magisk/img/wireguard/auto_mount; ");
        for (final String[] names : EXECUTABLES) {
-            final File destination = new File("/sbin/.core/img/wireguard" + INSTALL_DIR, names[1]);
-            script.append(String.format("cp '%s' '%s'; chmod 755 '%s'; restorecon '%s' || true; ",
+            final File destination = new File("/sbin/.magisk/img/wireguard" + INSTALL_DIR, names[1]);
+            script.append(String.format("cp '%s' '%s'; chmod 755 '%s'; chcon 'u:object_r:system_file:s0' '%s' || true; ",
                    new File(nativeLibraryDir, names[0]), destination, destination, destination));
        }
        script.append("trap - INT TERM EXIT;");
@@ -179,7 +179,7 @@ public final class ToolsInstaller {
        synchronized (lock) {
            if (installAsMagiskModule == null) {
                try {
-                    installAsMagiskModule = Application.getRootShell().run(null, "[ -d /sbin/.core/mirror -a -d /sbin/.core/img -a ! -f /cache/.disable_magisk ]") == OsConstants.EXIT_SUCCESS;
+                    installAsMagiskModule = Application.getRootShell().run(null, "[ -d /sbin/.magisk/mirror -a -d /sbin/.magisk/img -a ! -f /cache/.disable_magisk ]") == OsConstants.EXIT_SUCCESS;
                } catch (final Exception ignored) {
                    installAsMagiskModule = false;
                }
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -226,6 +226,7 @@ public class PeerProxy extends BaseObservable implements Parcelable {

    private void setInterfaceDns(final CharSequence dnsServers) {
        final List<String> newDnsRoutes = Stream.of(Attribute.split(dnsServers))
+                .filter(server -> !server.contains(":"))
                .map(server -> server + "/32")
                .collect(Collectors.toUnmodifiableList());
        if (allowedIpsState == AllowedIpsState.CONTAINS_IPV4_PUBLIC_NETWORKS) {
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,6 +1,6 @@
 /*
 * Copyright © 2018 The Android Open Source Project
- * Copyright © 2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,6 +1,6 @@
 /*
 * Copyright © 2013 The Android Open Source Project
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,6 +1,6 @@
 /*
 * Copyright © 2014 Jerzy Chalupski
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,6 +1,6 @@
 /*
 * Copyright © 2014 Jerzy Chalupski
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,6 +1,6 @@
 /*
 * Copyright © 2014 Jerzy Chalupski
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -26,7 +26,7 @@ import java9.util.Optional;
 * Instances of this class are externally immutable.
 */
 public final class InetEndpoint {
-    private static final Pattern BARE_IPV6 = Pattern.compile("^[^\\[]*:");
+    private static final Pattern BARE_IPV6 = Pattern.compile("^[^\\[\\]]*:[^\\[\\]]*");
    private static final Pattern FORBIDDEN_CHARACTERS = Pattern.compile("[/?#]");

    private final String host;
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,6 +1,6 @@
 /*
 * Copyright © 2016 Southern Storm Software, Pty Ltd.
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -28,9 +28,9 @@
    <string name="addresses">Addresses</string>
    <string name="allowed_ips">Allowed IPs</string>
    <string name="app_name">WireGuard</string>
-    <string name="bad_config_context">%s\'s %s</string>
+    <string name="bad_config_context">%1$s\'s %2$s</string>
    <string name="bad_config_context_top_level">%s</string>
-    <string name="bad_config_error">%s in %s</string>
+    <string name="bad_config_error">%1$s in %2$s</string>
    <string name="bad_config_explanation_pka">: Must be positive and no more than 65535</string>
    <string name="bad_config_explanation_positive_number">: Must be positive</string>
    <string name="bad_config_explanation_udp_port">: Must be a valid UDP port number</string>
@@ -123,8 +123,8 @@
    <string name="set_exclusions">Set Exclusions</string>
    <string name="settings">Settings</string>
    <string name="shell_exit_status_read_error">Shell cannot read exit status</string>
-    <string name="shell_marker_count_error">Shell expected 4 markers, received %i</string>
-    <string name="shell_start_error">Shell failed to start: %i</string>
+    <string name="shell_marker_count_error">Shell expected 4 markers, received %d</string>
+    <string name="shell_start_error">Shell failed to start: %d</string>
    <string name="toggle_error">Error toggling WireGuard tunnel: %s</string>
    <string name="tools_installer_already">wg and wg-quick are already installed</string>
    <string name="tools_installer_failure">Unable to install command-line tools (no root?)</string>
@@ -137,14 +137,14 @@
    <string name="tools_installer_working">Installing wg and wg-quick</string>
    <string name="tools_unavailable_error">Required tools unavailable</string>
    <string name="tun_create_error">Unable to create tun device</string>
-    <string name="tunnel_config_error">Unable to configure tunnel (wg-quick returned %i)</string>
+    <string name="tunnel_config_error">Unable to configure tunnel (wg-quick returned %d)</string>
    <string name="tunnel_create_error">Unable to create tunnel: %s</string>
    <string name="tunnel_create_success">Successfully created tunnel “%s”</string>
    <string name="tunnel_error_already_exists">Tunnel “%s” already exists</string>
    <string name="tunnel_error_invalid_name">Invalid name</string>
    <string name="tunnel_list_placeholder">Add a tunnel using the blue button</string>
    <string name="tunnel_name">Tunnel Name</string>
-    <string name="tunnel_on_error">Unable to turn tunnel on (wgTurnOn returned %i)</string>
+    <string name="tunnel_on_error">Unable to turn tunnel on (wgTurnOn returned %d)</string>
    <string name="tunnel_rename_error">Unable to rename tunnel: %s</string>
    <string name="tunnel_rename_success">Successfully renamed tunnel to “%s”</string>
    <string name="type_name_go_userspace">Go userspace</string>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
    <com.wireguard.android.preference.VersionPreference android:icon="@mipmap/ic_launcher" />
    <CheckBoxPreference
        android:defaultValue="false"
@@ -15,4 +15,4 @@
        android:summaryOff="@string/dark_theme_summary_off"
        android:summaryOn="@string/dark_theme_summary_on"
        android:title="@string/dark_theme_title" />
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright © 2018 WireGuard LLC. All Rights Reserved.
+# Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.

 cmake_minimum_required(VERSION 3.4.1)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
@@ -1,2 +1 @@
-build/
-.gobuildversion
+build/
@@ -1,9 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
-
-UPSTREAM_FILES := $(filter-out %/main.go %/queueconstants.go,$(wildcard ../wireguard-go/*/*.go) $(wildcard ../wireguard-go/*.go)) ../wireguard-go/go.mod ../wireguard-go/go.sum
-DOWNSTREAM_FILES := $(wildcard src/*.go) $(wildcard src/*.c) $(wildcard src/*/*.go)
+# Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.

 BUILDDIR ?= $(CURDIR)/build
 DESTDIR ?= $(CURDIR)/out
@@ -27,7 +24,7 @@ default: $(DESTDIR)/libwg-go.so

 GOBUILDARCH := $(NDK_GO_ARCH_MAP_$(shell uname -m))
 GOBUILDOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
-GOBUILDVERSION := 1.11.4
+GOBUILDVERSION := 1.12
 GOBUILDTARBALL := https://dl.google.com/go/go$(GOBUILDVERSION).$(GOBUILDOS)-$(GOBUILDARCH).tar.gz
 GOBUILDVERSION_NEEDED := go version go$(GOBUILDVERSION) $(GOBUILDOS)/$(GOBUILDARCH)
 export GOROOT := $(BUILDDIR)/goroot
@@ -41,25 +38,12 @@ $(GOROOT)/bin/go:
 	rm -rf "$(GOROOT)"
 	mkdir -p "$(GOROOT)"
 	curl "$(GOBUILDTARBALL)" | tar -C "$(GOROOT)" --strip-components=1 -xzf - || { rm -rf "$(GOROOT)"; exit 1; }
-	cat goruntime-*.diff | patch -p1 -f -N -r- -d "$(GOROOT)" || { rm -rf "$(GOROOT)"; exit 1; }
+	patch -p1 -f -N -r- -d "$(GOROOT)" < goruntime-boottime-over-monotonic.diff || { rm -rf "$(GOROOT)"; exit 1; }

-$(shell test "$$(cat .gobuildversion 2>/dev/null)" = "$(GOBUILDVERSION_CURRENT)" || rm -f "$(DESTDIR)/libwg-go.so")
+$(shell test "$$(cat $(BUILDDIR)/.gobuildversion 2>/dev/null)" = "$(GOBUILDVERSION_CURRENT)" || rm -f "$(DESTDIR)/libwg-go.so")

-define copy-src-to-build
-$(subst $(1),$(BUILDDIR)/,$(2)): $(2)
-	@mkdir -vp "$$(dir $$@)"
-	@cp -vp "$$<" "$$@"
-$(BUILDDIR)/.prepared: $(subst $(1),$(BUILDDIR)/,$(2))
-endef
-
-$(foreach FILE,$(UPSTREAM_FILES),$(eval $(call copy-src-to-build,../wireguard-go/,$(FILE))))
-$(foreach FILE,$(DOWNSTREAM_FILES),$(eval $(call copy-src-to-build,src/,$(FILE))))
-
-$(BUILDDIR)/.prepared: $(GOROOT)/bin/go
-	cd "$(BUILDDIR)" && go get || { chmod -fR +w "$(GOPATH)/pkg/mod"; rm -rf "$(GOPATH)/pkg/mod"; exit 1; }
+$(DESTDIR)/libwg-go.so: $(GOROOT)/bin/go
+	go get -tags linux || { chmod -fR +w "$(GOPATH)/pkg/mod"; rm -rf "$(GOPATH)/pkg/mod"; exit 1; }
 	chmod -fR +w "$(GOPATH)/pkg/mod"
-	touch "$@"
-
-$(DESTDIR)/libwg-go.so: $(BUILDDIR)/.prepared
-	cd "$(BUILDDIR)" && go build -ldflags="-X main.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard" -v -o "$@" -buildmode c-shared
-	go version > .gobuildversion
+	go build -tags linux -ldflags="-X main.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard" -v -o "$@" -buildmode c-shared
+	go version > $(BUILDDIR)/.gobuildversion
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: Apache-2.0
 *
- * Copyright (C) 2017-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright (C) 2017-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
 */

 package main
@@ -11,9 +11,10 @@ import "C"

 import (
 	"bufio"
-	"git.zx2c4.com/wireguard-go/tun"
 	"golang.org/x/sys/unix"
-	"io/ioutil"
+	"golang.zx2c4.com/wireguard/device"
+	"golang.zx2c4.com/wireguard/ipc"
+	"golang.zx2c4.com/wireguard/tun"
 	"log"
 	"math"
 	"net"
@@ -35,14 +36,14 @@ func (l AndroidLogger) Write(p []byte) (int, error) {
 }

 type TunnelHandle struct {
-	device *Device
+	device *device.Device
 	uapi   net.Listener
 }

 var tunnelHandles map[int32]TunnelHandle

 func init() {
-	roamingDisabled = true
+	device.RoamingDisabled = true
 	tunnelHandles = make(map[int32]TunnelHandle)
 	signals := make(chan os.Signal)
 	signal.Notify(signals, unix.SIGUSR2)
@@ -53,7 +54,7 @@ func init() {
 			case <-signals:
 				n := runtime.Stack(buf, true)
 				buf[n] = 0
-				C.__android_log_write(C.ANDROID_LOG_ERROR, C.CString("WireGuard/GoBackend/Stacktrace"), (*_Ctype_char)(unsafe.Pointer(&buf[0])))
+				C.__android_log_write(C.ANDROID_LOG_ERROR, C.CString("WireGuard/GoBackend/Stacktrace"), (*C.char)(unsafe.Pointer(&buf[0])))
 			}
 		}
 	}()
@@ -63,7 +64,7 @@ func init() {
 func wgTurnOn(ifnameRef string, tunFd int32, settings string) int32 {
 	interfaceName := string([]byte(ifnameRef))

-	logger := &Logger{
+	logger := &device.Logger{
 		Debug: log.New(&AndroidLogger{level: C.ANDROID_LOG_DEBUG, interfaceName: interfaceName}, "", 0),
 		Info:  log.New(&AndroidLogger{level: C.ANDROID_LOG_INFO, interfaceName: interfaceName}, "", 0),
 		Error: log.New(&AndroidLogger{level: C.ANDROID_LOG_ERROR, interfaceName: interfaceName}, "", 0),
@@ -71,7 +72,7 @@ func wgTurnOn(ifnameRef string, tunFd int32, settings string) int32 {

 	logger.Debug.Println("Debug log enabled")

-	tun, name, err := tun.CreateTUNFromFD(int(tunFd))
+	tun, name, err := tun.CreateUnmonitoredTUNFromFD(int(tunFd))
 	if err != nil {
 		unix.Close(int(tunFd))
 		logger.Error.Println(err)
@@ -79,25 +80,22 @@ func wgTurnOn(ifnameRef string, tunFd int32, settings string) int32 {
 	}

 	logger.Info.Println("Attaching to interface", name)
-	device := NewDevice(tun, logger)
+	device := device.NewDevice(tun, logger)

-	logger.Debug.Println("Interface has MTU", device.tun.mtu)
-
-	bufferedSettings := bufio.NewReadWriter(bufio.NewReader(strings.NewReader(settings)), bufio.NewWriter(ioutil.Discard))
-	setError := ipcSetOperation(device, bufferedSettings)
+	setError := device.IpcSetOperation(bufio.NewReader(strings.NewReader(settings)))
 	if setError != nil {
 		unix.Close(int(tunFd))
 		logger.Error.Println(setError)
 		return -1
 	}

-	var uapi net.Listener;
+	var uapi net.Listener

-	uapiFile, err := UAPIOpen(name)
+	uapiFile, err := ipc.UAPIOpen(name)
 	if err != nil {
 		logger.Error.Println(err)
 	} else {
-		uapi, err = UAPIListen(name, uapiFile)
+		uapi, err = ipc.UAPIListen(name, uapiFile)
 		if err != nil {
 			uapiFile.Close()
 			logger.Error.Println(err)
@@ -108,7 +106,7 @@ func wgTurnOn(ifnameRef string, tunFd int32, settings string) int32 {
 					if err != nil {
 						return
 					}
-					go ipcHandle(device, conn)
+					go device.IpcHandle(conn)
 				}
 			}()
 		}
@@ -150,22 +148,11 @@ func wgGetSocketV4(tunnelHandle int32) int32 {
 	if !ok {
 		return -1
 	}
-	native, ok := handle.device.net.bind.(*NativeBind)
-	if !ok {
-		return -1
-	}
-	fd := int32(-1)
-	conn, err := native.ipv4.SyscallConn()
+	fd, err := handle.device.PeekLookAtSocketFd4()
 	if err != nil {
 		return -1
 	}
-	err = conn.Control(func(f uintptr) {
-		fd = int32(f)
-	})
-	if err != nil {
-		return -1
-	}
-	return fd
+	return int32(fd)
 }

 //export wgGetSocketV6
@@ -174,27 +161,16 @@ func wgGetSocketV6(tunnelHandle int32) int32 {
 	if !ok {
 		return -1
 	}
-	native, ok := handle.device.net.bind.(*NativeBind)
-	if !ok {
-		return -1
-	}
-	fd := int32(-1)
-	conn, err := native.ipv6.SyscallConn()
+	fd, err := handle.device.PeekLookAtSocketFd6()
 	if err != nil {
 		return -1
 	}
-	err = conn.Control(func(f uintptr) {
-		fd = int32(f)
-	})
-	if err != nil {
-		return -1
-	}
-	return fd
+	return int32(fd)
 }

 //export wgVersion
 func wgVersion() *C.char {
-	return C.CString(WireGuardGoVersion)
+	return C.CString(device.WireGuardGoVersion)
 }

 func main() {}
@@ -0,0 +1,8 @@
+module golang.zx2c4.com/wireguard/android
+
+go 1.12
+
+require (
+	golang.org/x/sys v0.0.0-20190318195719-6c81ef8f67ca
+	golang.zx2c4.com/wireguard v0.0.0-20190319063404-2c51d6af48b8
+)
@@ -0,0 +1,11 @@
+github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25 h1:jsG6UpNLt9iAsb0S2AGW28DveNzzgmbXR+ENoPjUeIU=
+golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95 h1:fY7Dsw114eJN4boqzVSbpVHO6rTdhq6/GnXeu+PKnzU=
+golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190302025703-b6889370fb10/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190318195719-6c81ef8f67ca h1:o2TLx1bGN3W+Ei0EMU5fShLupLmTOU95KvJJmfYhAzM=
+golang.org/x/sys v0.0.0-20190318195719-6c81ef8f67ca/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.zx2c4.com/wireguard v0.0.0-20190319063404-2c51d6af48b8 h1:wp9bMuYaRtmbF5VhDpWWYldLb7z+QVQbO2z+NSvZyJo=
+golang.zx2c4.com/wireguard v0.0.0-20190319063404-2c51d6af48b8/go.mod h1:Koyxt99ZAZcr8lJuisBNX9vnaqKVNGcITeWOI1Zkmsw=
@@ -1,6 +1,6 @@
-From 6f345a38d9533db388009d91d29981673dcf95b4 Mon Sep 17 00:00:00 2001
-From: Jason A. Donenfeld <Jason@zx2c4.com>
-Date: Fri, 04 May 2018 03:48:23 +0200
+From 6998a7866b8428fd49c31506795c9f8154826d13 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Wed, 27 Feb 2019 05:05:44 +0100
 Subject: [PATCH] runtime: use CLOCK_BOOTTIME in nanotime on Linux

 This makes timers account for having expired while a computer was
@@ -17,12 +17,21 @@ Fixes #24595

 Change-Id: I7b2a6ca0c5bc5fce57ec0eeafe7b68270b429321
 ---
+ src/runtime/sys_linux_386.s     | 4 ++--
+ src/runtime/sys_linux_amd64.s   | 2 +-
+ src/runtime/sys_linux_arm.s     | 4 ++--
+ src/runtime/sys_linux_arm64.s   | 4 ++--
+ src/runtime/sys_linux_mips64x.s | 2 +-
+ src/runtime/sys_linux_mipsx.s   | 2 +-
+ src/runtime/sys_linux_ppc64x.s  | 2 +-
+ src/runtime/sys_linux_s390x.s   | 2 +-
+ 8 files changed, 11 insertions(+), 11 deletions(-)

 diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
-index 8d5a4ff..bfad064 100644
+index 40b55a67eb..6105780ff4 100644
 --- a/src/runtime/sys_linux_386.s
 +++ b/src/runtime/sys_linux_386.s
-@@ -285,13 +285,13 @@
+@@ -288,13 +288,13 @@ noswitch:
 
 	LEAL	8(SP), BX	// &ts (struct timespec)
 	MOVL	BX, 4(SP)
@@ -39,10 +48,10 @@ index 8d5a4ff..bfad064 100644
 	INVOKE_SYSCALL
 
 diff --git a/src/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s
-index 62d8024..8510be4 100644
+index b709f77060..18a1f1d43a 100644
 --- a/src/runtime/sys_linux_amd64.s
 +++ b/src/runtime/sys_linux_amd64.s
-@@ -257,7 +257,7 @@
+@@ -261,7 +261,7 @@ noswitch:
 	MOVQ	runtime·vdsoClockgettimeSym(SB), AX
 	CMPQ	AX, $0
 	JEQ	fallback
@@ -52,7 +61,7 @@ index 62d8024..8510be4 100644
 	CALL	AX
 	MOVQ	0(SP), AX	// sec
 diff --git a/src/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s
-index aa39732..d29cb88 100644
+index 43a58335c8..8b93635f4f 100644
 --- a/src/runtime/sys_linux_arm.s
 +++ b/src/runtime/sys_linux_arm.s
@@ -11,7 +11,7 @@
@@ -64,7 +73,7 @@ index aa39732..d29cb88 100644
 
 // for EABI, as we don't support OABI
 #define SYS_BASE 0x0
-@@ -287,7 +287,7 @@
+@@ -291,7 +291,7 @@ noswitch:
 	SUB	$24, R13	// Space for results
 	BIC	$0x7, R13	// Align for C code
 
@@ -74,7 +83,7 @@ index aa39732..d29cb88 100644
 	MOVW	runtime·vdsoClockgettimeSym(SB), R11
 	CMP	$0, R11
 diff --git a/src/runtime/sys_linux_arm64.s b/src/runtime/sys_linux_arm64.s
-index c6afd76..24294e8 100644
+index 8b344be8f8..daf142fba0 100644
 --- a/src/runtime/sys_linux_arm64.s
 +++ b/src/runtime/sys_linux_arm64.s
@@ -13,7 +13,7 @@
@@ -86,7 +95,7 @@ index c6afd76..24294e8 100644
 
 #define SYS_exit		93
 #define SYS_read		63
-@@ -243,7 +243,7 @@
+@@ -247,7 +247,7 @@ noswitch:
 	BIC	$15, R1
 	MOVD	R1, RSP
 
@@ -96,10 +105,10 @@ index c6afd76..24294e8 100644
 	CBZ	R2, fallback
 	BL	(R2)
 diff --git a/src/runtime/sys_linux_mips64x.s b/src/runtime/sys_linux_mips64x.s
-index 8e64f1c..521062f 100644
+index c45703d228..9842b596e7 100644
 --- a/src/runtime/sys_linux_mips64x.s
 +++ b/src/runtime/sys_linux_mips64x.s
-@@ -185,7 +185,7 @@
+@@ -189,7 +189,7 @@ TEXT runtime·walltime(SB),NOSPLIT,$16
 	RET
 
 TEXT runtime·nanotime(SB),NOSPLIT,$16
@@ -109,10 +118,10 @@ index 8e64f1c..521062f 100644
 	MOVV	$SYS_clock_gettime, R2
 	SYSCALL
 diff --git a/src/runtime/sys_linux_mipsx.s b/src/runtime/sys_linux_mipsx.s
-index a6bca3b..920ed9a 100644
+index f362b0f3f1..5ab866e047 100644
 --- a/src/runtime/sys_linux_mipsx.s
 +++ b/src/runtime/sys_linux_mipsx.s
-@@ -189,7 +189,7 @@
+@@ -193,7 +193,7 @@ TEXT runtime·walltime(SB),NOSPLIT,$8-12
 	RET
 
 TEXT runtime·nanotime(SB),NOSPLIT,$8-8
@@ -122,23 +131,23 @@ index a6bca3b..920ed9a 100644
 	MOVW	$SYS_clock_gettime, R2
 	SYSCALL
 diff --git a/src/runtime/sys_linux_ppc64x.s b/src/runtime/sys_linux_ppc64x.s
-index 483cb8e..11f3c49 100644
+index 6835f434de..46618b2d91 100644
 --- a/src/runtime/sys_linux_ppc64x.s
 +++ b/src/runtime/sys_linux_ppc64x.s
-@@ -164,7 +164,7 @@
- 	RET
+@@ -204,7 +204,7 @@ fallback:
+ 	JMP	finish
 
 TEXT runtime·nanotime(SB),NOSPLIT,$16
-	MOVW	$1, R3 // CLOCK_MONOTONIC
-+	MOVW	$7, R3 // CLOCK_BOOTTIME
- 	MOVD	$0(R1), R4
- 	SYSCALL	$SYS_clock_gettime
- 	MOVD	0(R1), R3	// sec
+-	MOVD	$1, R3		// CLOCK_MONOTONIC
+	MOVD	$7, R3		// CLOCK_BOOTTIME
+ 
+ 	MOVD	R1, R15		// R15 is unchanged by C code
+ 	MOVD	g_m(g), R21	// R21 = m
 diff --git a/src/runtime/sys_linux_s390x.s b/src/runtime/sys_linux_s390x.s
-index 1ff110c..e9049e0 100644
+index c79ceea751..44e3258e60 100644
 --- a/src/runtime/sys_linux_s390x.s
 +++ b/src/runtime/sys_linux_s390x.s
-@@ -176,7 +176,7 @@
+@@ -180,7 +180,7 @@ TEXT runtime·walltime(SB),NOSPLIT,$16
 	RET
 
 TEXT runtime·nanotime(SB),NOSPLIT,$16
@@ -147,3 +156,6 @@ index 1ff110c..e9049e0 100644
 	MOVD	$tp-16(SP), R3
 	MOVW	$SYS_clock_gettime, R1
 	SYSCALL
+-- 
+2.20.1
+
@@ -1,291 +0,0 @@
-diff --git a/src/syscall/syscall_linux_386.go b/src/syscall/syscall_linux_386.go
-index 49db72450f..6e162ebb41 100644
--- a/src/syscall/syscall_linux_386.go
-+++ b/src/syscall/syscall_linux_386.go
-@@ -62,8 +62,6 @@ func Pipe2(p []int, flags int) (err error) {
- //sysnb	InotifyInit() (fd int, err error)
- //sys	Ioperm(from int, num int, on int) (err error)
- //sys	Iopl(level int) (err error)
-//sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
-//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
- //sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
- //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
- //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
-@@ -74,7 +72,6 @@ func Pipe2(p []int, flags int) (err error) {
- //sysnb	Setresuid(ruid int, euid int, suid int) (err error) = SYS_SETRESUID32
- //sysnb	Setreuid(ruid int, euid int) (err error) = SYS_SETREUID32
- //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
-//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
- //sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
- //sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
- //sysnb	getgroups(n int, list *_Gid_t) (nn int, err error) = SYS_GETGROUPS32
-@@ -84,6 +81,18 @@ func Pipe2(p []int, flags int) (err error) {
- //sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
- //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
- 
-+func Stat(path string, stat *Stat_t) (err error) {
-+	return fstatat(_AT_FDCWD, path, stat, 0)
-+}
-+
-+func Lchown(path string, uid int, gid int) (err error) {
-+	return Fchownat(_AT_FDCWD, path, uid, gid, _AT_SYMLINK_NOFOLLOW)
-+}
-+
-+func Lstat(path string, stat *Stat_t) (err error) {
-+	return fstatat(_AT_FDCWD, path, stat, _AT_SYMLINK_NOFOLLOW)
-+}
-+
- func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
- 	page := uintptr(offset / 4096)
- 	if offset != int64(page)*4096 {
-diff --git a/src/syscall/syscall_linux_amd64.go b/src/syscall/syscall_linux_amd64.go
-index 1a21d9db6f..f740ab4e72 100644
--- a/src/syscall/syscall_linux_amd64.go
-+++ b/src/syscall/syscall_linux_amd64.go
-@@ -22,9 +22,7 @@ const (
- //sysnb	InotifyInit() (fd int, err error)
- //sys	Ioperm(from int, num int, on int) (err error)
- //sys	Iopl(level int) (err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
- //sys	Listen(s int, n int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
- //sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
- //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
- //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-@@ -66,6 +64,14 @@ func Stat(path string, stat *Stat_t) (err error) {
- 	return fstatat(_AT_FDCWD, path, stat, 0)
- }
- 
-+func Lchown(path string, uid int, gid int) (err error) {
-+	return Fchownat(_AT_FDCWD, path, uid, gid, _AT_SYMLINK_NOFOLLOW)
-+}
-+
-+func Lstat(path string, stat *Stat_t) (err error) {
-+	return fstatat(_AT_FDCWD, path, stat, _AT_SYMLINK_NOFOLLOW)
-+}
-+
- //go:noescape
- func gettimeofday(tv *Timeval) (err Errno)
- 
-diff --git a/src/syscall/syscall_linux_arm.go b/src/syscall/syscall_linux_arm.go
-index b0c0ac7c4f..65543193e1 100644
--- a/src/syscall/syscall_linux_arm.go
-+++ b/src/syscall/syscall_linux_arm.go
-@@ -83,9 +83,7 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
- //sysnb	Getgid() (gid int) = SYS_GETGID32
- //sysnb	Getuid() (uid int) = SYS_GETUID32
- //sysnb	InotifyInit() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
- //sys	Listen(s int, n int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
- //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
- //sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
- //sys	Setfsgid(gid int) (err error) = SYS_SETFSGID32
-@@ -96,7 +94,6 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
- //sysnb	Setreuid(ruid int, euid int) (err error) = SYS_SETREUID32
- //sys	Shutdown(fd int, how int) (err error)
- //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
-//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
- 
- // Vsyscalls on amd64.
- //sysnb	Gettimeofday(tv *Timeval) (err error)
-@@ -110,6 +107,18 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
- //sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
- //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
- 
-+func Stat(path string, stat *Stat_t) (err error) {
-+	return fstatat(_AT_FDCWD, path, stat, 0)
-+}
-+
-+func Lchown(path string, uid int, gid int) (err error) {
-+	return Fchownat(_AT_FDCWD, path, uid, gid, _AT_SYMLINK_NOFOLLOW)
-+}
-+
-+func Lstat(path string, stat *Stat_t) (err error) {
-+	return fstatat(_AT_FDCWD, path, stat, _AT_SYMLINK_NOFOLLOW)
-+}
-+
- func Fstatfs(fd int, buf *Statfs_t) (err error) {
- 	_, _, e := Syscall(SYS_FSTATFS64, uintptr(fd), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
- 	if e != 0 {
-diff --git a/src/syscall/zsyscall_linux_386.go b/src/syscall/zsyscall_linux_386.go
-index 62827f16dc..0882494c47 100644
--- a/src/syscall/zsyscall_linux_386.go
-+++ b/src/syscall/zsyscall_linux_386.go
-@@ -1276,36 +1276,6 @@ func Iopl(level int) (err error) {
- 
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
- 
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN32, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
- func Pread(fd int, p []byte, offset int64) (n int, err error) {
- 	var _p0 unsafe.Pointer
- 	if len(p) > 0 {
-@@ -1422,21 +1392,6 @@ func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n i
- 
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
- 
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
- func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
- 	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(off>>32), uintptr(n), uintptr(n>>32), uintptr(flags))
- 	if e1 != 0 {
-diff --git a/src/syscall/zsyscall_linux_amd64.go b/src/syscall/zsyscall_linux_amd64.go
-index b6638269be..9f2046bf93 100644
--- a/src/syscall/zsyscall_linux_amd64.go
-+++ b/src/syscall/zsyscall_linux_amd64.go
-@@ -1261,21 +1261,6 @@ func Iopl(level int) (err error) {
- 
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
- 
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
- func Listen(s int, n int) (err error) {
- 	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
- 	if e1 != 0 {
-@@ -1286,21 +1271,6 @@ func Listen(s int, n int) (err error) {
- 
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
- 
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
- func Pread(fd int, p []byte, offset int64) (n int, err error) {
- 	var _p0 unsafe.Pointer
- 	if len(p) > 0 {
-diff --git a/src/syscall/zsyscall_linux_arm.go b/src/syscall/zsyscall_linux_arm.go
-index bb20d6e946..3d099aa16d 100644
--- a/src/syscall/zsyscall_linux_arm.go
-+++ b/src/syscall/zsyscall_linux_arm.go
-@@ -1415,21 +1415,6 @@ func InotifyInit() (fd int, err error) {
- 
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
- 
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN32, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
- func Listen(s int, n int) (err error) {
- 	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
- 	if e1 != 0 {
-@@ -1440,21 +1425,6 @@ func Listen(s int, n int) (err error) {
- 
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
- 
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
- func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
- 	r0, _, e1 := Syscall6(SYS_SENDFILE64, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
- 	written = int(r0)
-@@ -1558,21 +1528,6 @@ func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n i
- 
- // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
- 
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
- func Gettimeofday(tv *Timeval) (err error) {
- 	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
- 	if e1 != 0 {
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: Apache-2.0
 *
- * Copyright © 2017-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
 */

 #include <jni.h>
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0
- *
- * Copyright (C) 2017-2018 WireGuard LLC. All Rights Reserved.
- */
-
-package main
-
-/* Reduce memory consumption for Android */
-
-const (
-        QueueOutboundSize          = 1024
-        QueueInboundSize           = 1024
-        QueueHandshakeSize         = 1024
-        MaxSegmentSize             = 2200
-        PreallocatedBuffersPerPool = 4096
-)
@@ -1,33 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (C) 2017-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- */
-
-package tun
-
-import (
-	"git.zx2c4.com/wireguard-go/rwcancel"
-	"os"
-)
-
-func CreateTUNFromFD(tunFd int) (TUNDevice, string, error) {
-	file := os.NewFile(uintptr(tunFd), "/dev/tun")
-	tun := &nativeTun{
-		tunFile: file,
-		fd:      file.Fd(),
-		events:  make(chan TUNEvent, 5),
-		errors:  make(chan error, 5),
-		nopi:    true,
-	}
-	var err error
-	tun.fdCancel, err = rwcancel.NewRWCancel(tunFd)
-	if err != nil {
-		return nil, "", err
-	}
-	name, err := tun.Name()
-	if err != nil {
-		tun.fdCancel.Cancel()
-		return nil, "", err
-	}
-	return tun, name, nil
-}
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD
 *
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 *
 */

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD
 *
- * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
 *
 */

@@ -7,7 +7,7 @@ allprojects {

 buildscript {
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.1'
    }
    repositories {
        google()
@@ -1,6 +1,6 @@
-#Mon Oct 01 15:59:48 CEST 2018
+#Sun Feb 17 03:37:07 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
Author	SHA1	Message	Date
Jason A. Donenfeld	81dc89f85b	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-03-19 00:56:13 -06:00
Jason A. Donenfeld	76305045db	InetEndpoint: properly match IPv6 addresses The old one didn't account for trailing digits. Reported-by: Brandon Jackson <bjackson@napshome.net> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-03-19 00:53:14 -06:00
Jason A. Donenfeld	c4ba48d7a9	libwg-go: bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-03-19 00:40:45 -06:00
Jason A. Donenfeld	d5dcdf13bf	strings: %i is invalid Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-03-19 00:30:53 -06:00
Jason A. Donenfeld	7feb3dccbf	WgQuickBackend: pass result to error string Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-03-16 12:24:28 -06:00
Jason A. Donenfeld	2251d74fce	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-03-08 01:41:41 +01:00
Jason A. Donenfeld	2c89d3fa7f	libwg-go: use netpoll rather than rwcancel Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-03-07 02:05:42 +01:00
Jason A. Donenfeld	49cc634678	libwg-go: don't use submodule Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-03-03 05:43:42 +01:00
Jason A. Donenfeld	c93e81c632	libwg-go: update to 1.12 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-02-27 05:24:25 +01:00
Jason A. Donenfeld	050e202291	project: bump dependencies Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-02-17 04:14:11 +01:00
Jason A. Donenfeld	efe04d6602	ToolsInstaller: fix typo on cleanup Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-02-17 03:32:35 +01:00
Jason A. Donenfeld	823b8324c7	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-02-15 18:03:43 +01:00
Jason A. Donenfeld	ae2f88a9ee	tools: bump upstream version This now includes the latest ARM64 ChaCha20 implementation, which should improve performance. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-02-14 11:59:10 +01:00
Jason A. Donenfeld	32287c60c4	ToolsInstaller: Require Magisk 18 People installing magisk modules are people capable of updating Magisk. No need to leave around old compat cruft. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-02-14 11:59:10 +01:00
Harsh Shandilya	69c6fa0a24	ToolsInstaller: Use chcon over restorecon restorecon probes file_contexts to get the context to be applied to the file. /sbin/.magisk does not exist in file_contexts for obvious reasons so restorecon always fails. Use chcon directly with the system_file context to allow contexts to be applied. Suggested-by: Chris Renshaw <osm0sis@outlook.com> Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2019-02-14 11:03:41 +01:00
Jason A. Donenfeld	c3e63df7b5	Update copyright Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-01-07 19:21:34 -05:00
Samuel Holland	fb4f1e30d5	PeerProxy: Only add IPv4 DNS servers when excluding private IPs Reported-By: Christophe-Marie Duquesne <chmd@chmd.fr> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-01-07 19:21:34 -05:00
Harsh Shandilya	6d0fde218b	Bump stream support libraries to latest stable Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-12-18 17:58:55 +01:00
Jason A. Donenfeld	6d02b0a26d	strings: squelch warning on multiple %s Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-12-18 17:58:12 +01:00
Harsh Shandilya	495bf9c954	Enable proguard and wire up rules Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-12-18 22:18:00 +05:30