From 34c8c09dae068ffbbf59d46e843dc05829dee73b Mon Sep 17 00:00:00 2001 From: Joel Blumen Date: Tue, 6 Oct 2015 13:15:46 -0500 Subject: Add IPv6 Host support to SSH. Changes REGEX to allow for IPV6 entry Alters Uri generation to support IPV6 hosts on create --- app/src/main/java/org/connectbot/transport/SSH.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/src/main/java/org/connectbot/transport/SSH.java') diff --git a/app/src/main/java/org/connectbot/transport/SSH.java b/app/src/main/java/org/connectbot/transport/SSH.java index 0867256..89e2d8d 100644 --- a/app/src/main/java/org/connectbot/transport/SSH.java +++ b/app/src/main/java/org/connectbot/transport/SSH.java @@ -101,7 +101,7 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC static final Pattern hostmask; static { - hostmask = Pattern.compile("^(.+)@([0-9a-z.-]+)(:(\\d+))?$", Pattern.CASE_INSENSITIVE); + hostmask = Pattern.compile("^(.+)@(([0-9a-z.-]+)|(\\[[a-f:0-9]+\\]))(:(\\d+))?$", Pattern.CASE_INSENSITIVE); } private boolean compression = false; @@ -770,9 +770,9 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC .append("://") .append(Uri.encode(matcher.group(1))) .append('@') - .append(matcher.group(2)); + .append(Uri.encode(matcher.group(2))); - String portString = matcher.group(4); + String portString = matcher.group(6); int port = DEFAULT_PORT; if (portString != null) { try { -- cgit v1.2.3