Make UriParser to support [$HOSTNAME] notation.

[ovyalov]

Summary

UriParser:Parse expects that host name doesn't contain special URL symbols - ":", ";", "$",...
However, in case of adb protocol (adb://$device_serial_no:$port) it poses a problem - device serial number may contain a colon ("192.168.0.1:5555").
In order to handle this situation UriParser now supports optional [$HOSTNAME] notation - i.e. connect://localhost:5555 and connect://[localhost]:5555 should be parsed identically.
This change allows us to pass special URL symbols (like colon) as part of a hostname.

[tberghammer]

The implementation looks good, but I don't like the approach you try to handle the problem.

I think you do far too much work to use UriParser in a case where it isn't necessary and isn't make things easier. I think a better (and definitely simpler) solution would be to change only ConnectionFileDescriptorPosix.cpp to parse the adb addresses with a locally specified regexp or with looking for the last colon in the address and split the address to host and port based on that.

[ovyalov]

In D12025#224355, @tberghammer wrote:

The implementation looks good, but I don't like the approach you try to handle the problem.

I think you do far too much work to use UriParser in a case where it isn't necessary and isn't make things easier. I think a better (and definitely simpler) solution would be to change only ConnectionFileDescriptorPosix.cpp to parse the adb addresses with a locally specified regexp or with looking for the last colon in the address and split the address to host and port based on that.

The problem that connection url goes all way down PlatformAndroid::ConnectRemote-> PlatformAndroidRemoteGDBServer::ConnectRemote->PlatformRemoteGDBServer::ConnectRemote whiles it reaches ConnectionFileDescriptorPosix::Connect. Within each ConnectRemote we call UriParser::Parse - either to verify url correctness or fetch device_id from adb url. In this case we may need to have special handling for adb protocol inside of UriParser::Parse to pass it through - I'm not very happy to bring protocol-specific knowledge to this class.

[tberghammer]

I see your point. I am still not too happy with this approach but I don't have any better idea to solve it. I am fine with committing it in in this format and we can improve it later if we find a better approach.

[ovyalov]

Rewrote the CL to make UriParser to support optional [$HOSTNAME] notation for LLDB connect URL - i.e. connect://localhost:5555 and connect://[localhost]:5555 should be parsed identically.
This change allows us to pass special URL symbols (like colon) as part of a hostname.

[tberghammer]

source/Utility/UriParser.cpp

14

I think you wanted to include <string>, not <string.h>

67–76

I would prefer no to remove the '[' and the ']' characters from the hostname. At the moment you don't use the hostname for the adb protocol so it isn't matter but if we consider IPv6 then having '[' and ']' around the address sounds like a good idea to me (later stages can use this information).

[ovyalov]

source/Utility/UriParser.cpp

14

I need string.h for strlen - it's required even with <string> included .

67–76

Let me leave [] removal as-is since we treat hostname as device_id in case of adb and then use it for port forwarding setup - https://github.com/llvm-mirror/lldb/blob/master/source/Plugins/Platform/Android/PlatformAndroid.cpp#L199

[labath]

source/Utility/UriParser.cpp

14

The C++ way would be to #include <cstring>

</driveby>

[tberghammer]

source/Utility/UriParser.cpp

14

Sorry, I missed that you use strlen

67–76

I would prefer to remove them in PlatformAndroid when we convert it to devices id, but if you want to leave it this way I am fine with that also.

[ovyalov]

Replaced #include <string.h> with <cstring>

[ovyalov]

Files:

/lldb/trunk/source/Host/posix/ConnectionFileDescriptorPosix.cpp
/lldb/trunk/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
/lldb/trunk/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h
/lldb/trunk/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
/lldb/trunk/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
/lldb/trunk/source/Utility/UriParser.cpp
/lldb/trunk/source/Utility/UriParser.h
/lldb/trunk/unittests/Utility/UriParserTest.cpp

Users:

ovyalov (Author)

http://reviews.llvm.org/rL245639

lldb.xcodeproj/project.pbxproj

/* Begin PBXBuildFile section */
     255EFF741AFABA720069F277 /* LockFileBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 255EFF731AFABA720069F277 /* LockFileBase.cpp */; };
     255EFF761AFABA950069F277 /* LockFilePosix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 255EFF751AFABA950069F277 /* LockFilePosix.cpp */; };
     256CBDB11ADD0E1700BC6CDC /* NativeRegisterContextLinux_arm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 256CBDAB1ADD0DB600BC6CDC /* NativeRegisterContextLinux_arm.cpp */; };
     256CBDB41ADD0EFD00BC6CDC /* RegisterContextPOSIXCore_arm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 256CBDB21ADD0EFD00BC6CDC /* RegisterContextPOSIXCore_arm.cpp */; };
     256CBDBA1ADD107200BC6CDC /* RegisterContextLinux_arm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 256CBDB61ADD107200BC6CDC /* RegisterContextLinux_arm.cpp */; };
     256CBDBC1ADD107200BC6CDC /* RegisterContextLinux_mips64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 256CBDB81ADD107200BC6CDC /* RegisterContextLinux_mips64.cpp */; };
     256CBDC01ADD11C000BC6CDC /* RegisterContextPOSIX_arm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 256CBDBE1ADD11C000BC6CDC /* RegisterContextPOSIX_arm.cpp */; };
     257E47171AA56C2000A62F81 /* ModuleCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 257E47151AA56C2000A62F81 /* ModuleCache.cpp */; };
+    259323B71B7D8EF300C11BD6 /* UrlEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 259323B51B7D8EF300C11BD6 /* UrlEncoder.cpp */; };
+    259323B81B7D8EF300C11BD6 /* UrlEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 259323B61B7D8EF300C11BD6 /* UrlEncoder.h */; };
     25EF23781AC09B3700908DF0 /* AdbClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 25EF23751AC09AD800908DF0 /* AdbClient.cpp */; };
     260157C61885F51C00F875CF /* libpanel.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 260157C41885F4FF00F875CF /* libpanel.dylib */; };
     260157C81885F53100F875CF /* libpanel.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 260157C41885F4FF00F875CF /* libpanel.dylib */; };
     2606EDDF184E68A10034641B /* liblldb-core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2689FFCA13353D7A00698AC0 /* liblldb-core.a */; };
     260A63171861008E00FECF8E /* IOHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 260A63161861008E00FECF8E /* IOHandler.h */; };
     260A63191861009E00FECF8E /* IOHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260A63181861009E00FECF8E /* IOHandler.cpp */; };
     260CC64815D0440D002BF2E0 /* OptionValueArgs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260CC63B15D0440D002BF2E0 /* OptionValueArgs.cpp */; };
     260CC64915D0440D002BF2E0 /* OptionValueArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260CC63C15D0440D002BF2E0 /* OptionValueArray.cpp */; };
/* Begin PBXFileReference section */
     256CBDB61ADD107200BC6CDC /* RegisterContextLinux_arm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RegisterContextLinux_arm.cpp; path = Utility/RegisterContextLinux_arm.cpp; sourceTree = "<group>"; };
     256CBDB71ADD107200BC6CDC /* RegisterContextLinux_arm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegisterContextLinux_arm.h; path = Utility/RegisterContextLinux_arm.h; sourceTree = "<group>"; };
     256CBDB81ADD107200BC6CDC /* RegisterContextLinux_mips64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RegisterContextLinux_mips64.cpp; path = Utility/RegisterContextLinux_mips64.cpp; sourceTree = "<group>"; };
     256CBDB91ADD107200BC6CDC /* RegisterContextLinux_mips64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegisterContextLinux_mips64.h; path = Utility/RegisterContextLinux_mips64.h; sourceTree = "<group>"; };
     256CBDBE1ADD11C000BC6CDC /* RegisterContextPOSIX_arm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RegisterContextPOSIX_arm.cpp; path = Utility/RegisterContextPOSIX_arm.cpp; sourceTree = "<group>"; };
     256CBDBF1ADD11C000BC6CDC /* RegisterContextPOSIX_arm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegisterContextPOSIX_arm.h; path = Utility/RegisterContextPOSIX_arm.h; sourceTree = "<group>"; };
     257E47151AA56C2000A62F81 /* ModuleCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ModuleCache.cpp; path = source/Utility/ModuleCache.cpp; sourceTree = "<group>"; };
     257E47161AA56C2000A62F81 /* ModuleCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ModuleCache.h; path = source/Utility/ModuleCache.h; sourceTree = "<group>"; };
+    259323B51B7D8EF300C11BD6 /* UrlEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UrlEncoder.cpp; path = source/Utility/UrlEncoder.cpp; sourceTree = "<group>"; };
+    259323B61B7D8EF300C11BD6 /* UrlEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UrlEncoder.h; path = source/Utility/UrlEncoder.h; sourceTree = "<group>"; };
     25EF23751AC09AD800908DF0 /* AdbClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AdbClient.cpp; sourceTree = "<group>"; };
     25EF23761AC09AD800908DF0 /* AdbClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdbClient.h; sourceTree = "<group>"; };
     260157C41885F4FF00F875CF /* libpanel.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpanel.dylib; path = /usr/lib/libpanel.dylib; sourceTree = "<absolute>"; };
     260223E7115F06D500A601A2 /* SBCommunication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBCommunication.h; path = include/lldb/API/SBCommunication.h; sourceTree = "<group>"; };
     260223E8115F06E500A601A2 /* SBCommunication.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBCommunication.cpp; path = source/API/SBCommunication.cpp; sourceTree = "<group>"; };
     26022531115F27FA00A601A2 /* SBFileSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBFileSpec.h; path = include/lldb/API/SBFileSpec.h; sourceTree = "<group>"; };
     26022532115F281400A601A2 /* SBFileSpec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBFileSpec.cpp; path = source/API/SBFileSpec.cpp; sourceTree = "<group>"; };
     260A248D15D06C4F009981B0 /* OptionValues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OptionValues.h; path = include/lldb/Interpreter/OptionValues.h; sourceTree = "<group>"; };
266DFE9013FD64D200D0C574 /* OperatingSystem */ = {
         2698699715E6CBD0002415FF /* Python */,
       );
       path = OperatingSystem;
       sourceTree = "<group>";
     };
     2682F168115ED9C800CCFF99 /* Utility */ = {
       isa = PBXGroup;
       children = (
+        259323B51B7D8EF300C11BD6 /* UrlEncoder.cpp */,
+        259323B61B7D8EF300C11BD6 /* UrlEncoder.h */,
         257E47151AA56C2000A62F81 /* ModuleCache.cpp */,
         257E47161AA56C2000A62F81 /* ModuleCache.h */,
         33064C9B1A5C7A490033D415 /* UriParser.h */,
         33064C991A5C7A330033D415 /* UriParser.cpp */,
         AF9107E91685709A00DBCD3C /* ARM64_GCC_Registers.h */,
         26CF992414428766001E4138 /* AnsiTerminal.h */,
         26F996A7119B79C300412154 /* ARM_DWARF_Registers.h */,
         26ECA04213665FED008D1F18 /* ARM_DWARF_Registers.cpp */,
26680202115FD0ED008E1FE4 /* Headers */ = {
       );
       runOnlyForDeploymentPostprocessing = 0;
     };
     2689FFC813353D7A00698AC0 /* Headers */ = {
       isa = PBXHeadersBuildPhase;
       buildActionMask = 2147483647;
       files = (
         260A63171861008E00FECF8E /* IOHandler.h in Headers */,
+        259323B81B7D8EF300C11BD6 /* UrlEncoder.h in Headers */,
       );
       runOnlyForDeploymentPostprocessing = 0;
     };
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXLegacyTarget section */
     235AFBB5199BC6AD00897A4B /* Linux */ = {
       isa = PBXLegacyTarget;
2689FFC613353D7A00698AC0 /* Sources */ = {
         26BC17AD18C7F4CB00D2196D /* RegisterContextPOSIXCore_mips64.cpp in Sources */,
         3F8169191ABA2419001DA9DF /* ConvertEnum.cpp in Sources */,
         268900F113353E6F00698AC0 /* RegisterContext.cpp in Sources */,
         6D55BAED1A8CD0A800A70529 /* PlatformAndroid.cpp in Sources */,
         268900F213353E6F00698AC0 /* SectionLoadList.cpp in Sources */,
         942AFF0519F84ABF007B43B4 /* LibCxxVector.cpp in Sources */,
         268900F313353E6F00698AC0 /* StackFrame.cpp in Sources */,
         268900F413353E6F00698AC0 /* StackFrameList.cpp in Sources */,
+        259323B71B7D8EF300C11BD6 /* UrlEncoder.cpp in Sources */,
         268900F513353E6F00698AC0 /* StackID.cpp in Sources */,
         268900F613353E6F00698AC0 /* StopInfo.cpp in Sources */,
         256CBDB41ADD0EFD00BC6CDC /* RegisterContextPOSIXCore_arm.cpp in Sources */,
         268900F713353E6F00698AC0 /* Target.cpp in Sources */,
         268900F813353E6F00698AC0 /* TargetList.cpp in Sources */,
         268900F913353E6F00698AC0 /* Thread.cpp in Sources */,
         268900FA13353E6F00698AC0 /* ThreadList.cpp in Sources */,
         268900FB13353E6F00698AC0 /* ThreadPlan.cpp in Sources */,

source/Host/posix/ConnectionFileDescriptorPosix.cpp

 #include <stdlib.h>
 #include <sys/types.h>
 
 #ifndef LLDB_DISABLE_POSIX
 #include <termios.h>
 #endif
 
 // C++ Includes
+#include <sstream>
+
 // Other libraries and framework includes
 #include "llvm/Support/ErrorHandling.h"
 #if defined(__APPLE__)
 #include "llvm/ADT/SmallVector.h"
 #endif
 // Project includes
 #include "lldb/Core/Communication.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/StreamString.h"
 #include "lldb/Core/Timer.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Host/Socket.h"
 #include "lldb/Interpreter/Args.h"
+#include "Utility/UriParser.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
 ConnectionFileDescriptor::ConnectionFileDescriptor(bool child_processes_inherit)
     : Connection()
     , m_pipe()
     , m_mutex(Mutex::eMutexTypeRecursive)
if (s && s[0])
         else if (strstr(s, "unix-accept://") == s)
         {
             // unix://SOCKNAME
             return NamedSocketAccept(s + strlen("unix-accept://"), error_ptr);
         }
         else if (strstr(s, "adb://") == s)
         {
             int port = -1;
-            sscanf(s, "adb://%*[^:]:%d", &port);
-            char host_and_port[sizeof("localhost:65535")];
-            snprintf(host_and_port, sizeof(host_and_port), "localhost:%d", port);
-            return ConnectTCP(host_and_port, error_ptr);
+            std::string scheme, host, path;
+            if (!UriParser::Parse(s, scheme, host, port, path))
+            {
+                if (error_ptr)
+                    error_ptr->SetErrorStringWithFormat("Failed to parse URL '%s'", s);
+                return eConnectionStatusError;
+            }
+            std::ostringstream host_and_port;
+            host_and_port << "localhost:" << port;
+            return ConnectTCP(host_and_port.str().c_str(), error_ptr);
         }
         else if (strstr(s, "connect://") == s)
         {
             return ConnectTCP(s + strlen("connect://"), error_ptr);
         }
         else if (strstr(s, "tcp-connect://") == s)
         {
             return ConnectTCP(s + strlen("tcp-connect://"), error_ptr);

source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp

 #include "lldb/Host/FileSpec.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Host/HostInfo.h"
 #include "lldb/Host/StringConvert.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Target.h"
 
 #include "Utility/UriParser.h"
+#include "Utility/UrlEncoder.h"
 
 #include "Plugins/Process/Utility/GDBRemoteSignals.h"
 
 using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::platform_gdb_server;
 
 static bool g_initialized = false;
 
 static std::string MakeGdbServerUrl(
         const std::string &platform_scheme,
         const std::string &platform_hostname,
         uint16_t port)
 {
     const char *override_scheme = getenv("LLDB_PLATFORM_REMOTE_GDB_SERVER_SCHEME");
     const char *override_hostname = getenv("LLDB_PLATFORM_REMOTE_GDB_SERVER_HOSTNAME");
     const char *port_offset_c_str = getenv("LLDB_PLATFORM_REMOTE_GDB_SERVER_PORT_OFFSET");
     int port_offset = port_offset_c_str ? ::atoi(port_offset_c_str) : 0;
+
+    const std::string encoded_hostname = UrlEncoder::Encode(
+        override_hostname ? override_hostname : platform_hostname.c_str());
+
     StreamString result;
     result.Printf("%s://%s:%u",
             override_scheme ? override_scheme : platform_scheme.c_str(),
-            override_hostname ? override_hostname : platform_hostname.c_str(),
+            encoded_hostname.c_str(),
             port + port_offset);
     return result.GetString();
 }
 
 void
 PlatformRemoteGDBServer::Initialize ()
 {
     Platform::Initialize ();

source/Utility/CMakeLists.txt

add_lldb_library(lldbUtility
   Range.cpp
   RegisterNumber.cpp
   SharingPtr.cpp
   StringExtractor.cpp
   StringExtractorGDBRemote.cpp
   StringLexer.cpp
   TimeSpecTimeout.cpp
   UriParser.cpp
+  UrlEncoder.cpp
   )

source/Utility/UriParser.cpp

 //===-- UriParser.cpp -------------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "Utility/UriParser.h"
 
 // C Includes
 #include <stdlib.h>
 #include <stdio.h>
 
 // C++ Includes
+
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Host/StringConvert.h"
+#include "Utility/UrlEncoder.h"
 
 using namespace lldb_private;
 
 //----------------------------------------------------------------------
 // UriParser::Parse
 //----------------------------------------------------------------------
 bool
 UriParser::Parse(const char* uri,
     std::string& scheme,
     std::string& hostname,
     int& port,
     std::string& path
     )
 {
     char scheme_buf[100] = {0};
     char hostname_buf[256] = {0};
     char port_buf[11] = {0}; // 10==strlen(2^32)
     char path_buf[2049] = {'/', 0};
-  
     bool ok = false;
-         if (4==sscanf(uri, "%99[^:/]://%255[^/:]:%10[^/]/%2047s", scheme_buf, hostname_buf, port_buf, path_buf+1)) { ok = true; }
-    else if (3==sscanf(uri, "%99[^:/]://%255[^/:]:%10[^/]", scheme_buf, hostname_buf, port_buf)) { ok = true; }
-    else if (3==sscanf(uri, "%99[^:/]://%255[^/]/%2047s", scheme_buf, hostname_buf, path_buf+1)) { ok = true; }
-    else if (2==sscanf(uri, "%99[^:/]://%255[^/]", scheme_buf, hostname_buf)) { ok = true; }
+    if (4 == sscanf(uri, "%99[^:/]://%255[^/:]:%10[^/]/%2047s", scheme_buf, hostname_buf, port_buf, path_buf+1)) { ok = true; }
+    else if (3 == sscanf(uri, "%99[^:/]://%255[^/:]:%10[^/]", scheme_buf, hostname_buf, port_buf)) { ok = true; }
+    else if (3 == sscanf(uri, "%99[^:/]://%255[^/]/%2047s", scheme_buf, hostname_buf, path_buf+1)) { ok = true; }
+    else if (2 == sscanf(uri, "%99[^:/]://%255[^/]", scheme_buf, hostname_buf)) { ok = true; }
 
     bool success = false;
     int port_tmp = -1;
     if (port_buf[0])
     {
-        port_tmp = StringConvert::ToUInt32(port_buf, UINT32_MAX, 10, &success);
+        port_tmp = StringConvert::ToUInt32(UrlEncoder::Decode(port_buf).c_str(), UINT32_MAX, 10, &success);
         if (!success || port_tmp > 65535)
         {
             // there are invalid characters in port_buf
             return false;
         }
     }
 
     if (ok)
     {
         scheme.assign(scheme_buf);
-        hostname.assign(hostname_buf);
+        hostname.assign(UrlEncoder::Decode(hostname_buf));
         port = port_tmp;
-        path.assign(path_buf);
+        path.assign(UrlEncoder::Decode(path_buf));
     }
     return ok;
 }
-

source/Utility/UrlEncoder.h

+//===-- UrlEncoder.h --------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef utility_UrlEncoder_h_
+#define utility_UrlEncoder_h_
+
+// C Includes
+// C++ Includes
+#include <string>
+
+// Other libraries and framework includes
+// Project includes
+
+class UrlEncoder
+{
+public:
+    static std::string Encode(const std::string& url);
+    static std::string Decode(const std::string& url);
+};
+
+#endif  // utility_UrlEncoder_h_

source/Utility/UrlEncoder.cpp

+//===-- UrlEncoder.cpp ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "Utility/UrlEncoder.h"
+
+// C++ Includes
+#include <sstream>
+
+namespace {
+
+const char kUrlSpecialSyms[] = {'!', '*', '\'', '(', ')', ';', ':', '@', '&', '=', '+', '$', ',', '/', '?', '%', '#', '[', ']'};
+
+bool
+IsSpecialUrlSymbol(const char ch)
+{
+    for (const char sym: kUrlSpecialSyms)
+    {
+        if (sym == ch)
+            return true;
+    }
+    return false;
+}
+
+}
+
+std::string
+UrlEncoder::Encode(const std::string& url)
+{
+    std::ostringstream result;
+    char sym_fmt[3];
+
+    for (const char sym: url)
+    {
+        if (IsSpecialUrlSymbol(sym))
+        {
+            sprintf(sym_fmt, "%02X", uint16_t(sym));
+            result << "%" << sym_fmt;
+        }
+        else
+            result << sym;
+    }
+    return result.str();
+}
+
+std::string
+UrlEncoder::Decode(const std::string& url)
+{
+    std::ostringstream result;
+
+    for (int i = 0, len = url.length(); i < len; ++i)
+    {
+        if (url[i] == '%' &&
+            (i + 2) < len &&
+            isxdigit(url[i + 1]) && isxdigit(url[i + 2]))
+        {
+            int decoded = 0;
+            sscanf(url.substr(i + 1, 2).c_str(), "%x", &decoded);
+            result << static_cast<char>(decoded);
+            i += 2;
+        }
+        else
+            result << url[i];
+    }
+
+    return result.str();
+}

unittests/Utility/CMakeLists.txt

 add_lldb_unittest(UtilityTests
   StringExtractorTest.cpp
   UriParserTest.cpp
+  UrlEncoderTest.cpp
   )

unittests/Utility/UriParserTest.cpp

 }
 
 TEST_F (UriParserTest, TypicalPortPath)
 {
     const UriTestCase testCase("connect://192.168.100.132:5432/", "connect", "192.168.100.132", 5432, "/");
     VALIDATE
 }
 
+TEST_F (UriParserTest, AdbHostPortSerial)
+{
+    const UriTestCase testCase("adb://192.168.100.132%3A5555:5432/", "adb", "192.168.100.132:5555", 5432, "/");
+    VALIDATE
+}
+
 TEST_F (UriParserTest, SchemeHostSeparator)
 {
     const UriTestCase testCase("x:/y");
     VALIDATE
 }
 
 TEST_F (UriParserTest, SchemeHostSeparator2)
 {
TEST_F (UriParserTest, Empty)
     VALIDATE
 }
 
 TEST_F (UriParserTest, PortOverflow)
 {
     const UriTestCase testCase("x://y:0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789/");
     VALIDATE
 }
-

unittests/Utility/UrlEncoderTest.cpp

+#include "gtest/gtest.h"
+#include "Utility/UrlEncoder.h"
+
+namespace
+{
+    class UrlEncoderTest: public ::testing::Test
+    {
+    };
+}
+
+TEST_F (UrlEncoderTest, EncodeHostPort)
+{
+    EXPECT_EQ("192.168.100.132%3A5555", UrlEncoder::Encode("192.168.100.132:5555"));
+}
+
+TEST_F (UrlEncoderTest, DecodeHostPort)
+{
+    EXPECT_EQ("192.168.100.132:5555", UrlEncoder::Decode("192.168.100.132%3A5555"));
+}
+
+TEST_F (UrlEncoderTest, DecodeBrokenInput)
+{
+    EXPECT_EQ("192.168.100.132%3", UrlEncoder::Decode("192.168.100.132%3"));
+}
+
+TEST_F (UrlEncoderTest, EncodeDecodeAscii)
+{
+    const char* url = "192.168.100.132";
+    EXPECT_EQ(url, UrlEncoder::Encode(url));
+    EXPECT_EQ(url, UrlEncoder::Decode(url));
+}