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
6 changed files with 14 additions and 14 deletions
@@ -17,8 +17,8 @@ android {
        applicationId 'com.wireguard.android'
        minSdkVersion 21
        targetSdkVersion 28
-        versionCode 448
-        versionName '0.0.20190307'
+        versionCode 449
+        versionName '0.0.20190319'
        buildConfigField 'int', 'MIN_SDK_VERSION', "$minSdkVersion.apiLevel"
    }
    // If the keystore file exists
@@ -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));
    }
 }
@@ -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;
@@ -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>
@@ -3,6 +3,6 @@ module golang.zx2c4.com/wireguard/android
 go 1.12

 require (
-	golang.org/x/sys v0.0.0-20190307162637-572b51eaf722
-	golang.zx2c4.com/wireguard v0.0.0-20190308004054-5c7cc256e39a
+	golang.org/x/sys v0.0.0-20190318195719-6c81ef8f67ca
+	golang.zx2c4.com/wireguard v0.0.0-20190319063404-2c51d6af48b8
 )
@@ -5,7 +5,7 @@ golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95 h1:fY7Dsw114eJN4boqzVSbpVHO6
 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-20190307162637-572b51eaf722 h1:LSRNeQHux7ghsicM4qcfeKMS/jqCsp0fqd4Y2UJL6eA=
-golang.org/x/sys v0.0.0-20190307162637-572b51eaf722/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.zx2c4.com/wireguard v0.0.0-20190308004054-5c7cc256e39a h1:RvrH0NQcXaN9h2JoBDAI3BWcTTJL3vH9L1gHQY0T76w=
-golang.zx2c4.com/wireguard v0.0.0-20190308004054-5c7cc256e39a/go.mod h1:Koyxt99ZAZcr8lJuisBNX9vnaqKVNGcITeWOI1Zkmsw=
+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=
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