commit f64d0824dd04cfa95801826b46e561a2e4716d72
author David 'Digit' Turner <digit@google.com> Thu Jan 22 09:07:41 2015 +0100
committer David 'Digit' Turner <digit@google.com> Fri Jan 23 10:02:58 2015 +0100
tree 24472583347a517e0b287575f6f3735b3821541d
parent 9182d5e08e4a402293690e3fe54d7568c58c1735

adb: Fix 'adb forward --no-rebind'.

Due to a typo, the --no-rebind option never worked (it always failed).
The root of the problem was that the client was sending on the wire
a command like:

  host:forward:norebind::tcp:<port>;tcp:<port>
                       ^^
Instead of:

  host:forward:norebind:tcp:<port>;tcp:<port>
                       ^

Note the erroneous double-column.

The fix is local to the adb client and thus doesn't require a new
version of the server or guest adbd on the device-side.

This also fixes 'adb reverse --no-rebind'.

See https://code.google.com/p/chromium/issues/detail?id=451109

Change-Id: I680fd432b5470072f6a9968ca32a7f90c600ac68

commandline.c

diff --git a/commandline.c b/commandline.c
index f345787..44541b7 100644
--- a/commandline.c
+++ b/commandline.c
@@ -1578,7 +1578,7 @@
         {
           if (argc != 3)
             return usage();
-          const char* command = no_rebind ? "forward:norebind:" : "forward";
+          const char* command = no_rebind ? "forward:norebind" : "forward";
           snprintf(buf, sizeof buf, "%s:%s:%s;%s", host_prefix, command, argv[1], argv[2]);
         }