diff options
| author | Joel Blumen <jbcode42@gmail.com> | 2015-10-06 13:15:46 -0500 |
|---|---|---|
| committer | Joel Blumen <jbcode42@gmail.com> | 2015-10-06 13:15:46 -0500 |
| commit | 34c8c09dae068ffbbf59d46e843dc05829dee73b (patch) | |
| tree | 4c3f44113527be0fff5bd18ce4f4d9e2c18b873a /app/src | |
| parent | 14318dab67d7c013b1a88861367eecb423010e70 (diff) | |
| download | connectbot-34c8c09dae068ffbbf59d46e843dc05829dee73b.tar.gz connectbot-34c8c09dae068ffbbf59d46e843dc05829dee73b.tar.bz2 connectbot-34c8c09dae068ffbbf59d46e843dc05829dee73b.zip | |
Add IPv6 Host support to SSH.
Changes REGEX to allow for IPV6 entry
Alters Uri generation to support IPV6 hosts on create
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/main/java/org/connectbot/transport/SSH.java | 6 |
1 files changed, 3 insertions, 3 deletions
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 { |