Bug#715238: [android-tools-adb] Does Not Know it is Running

[Hilko Bengen]

Control: tag -1 +patch

Sorry for breaking things. I intend to do another NMU using the attached
patch tonight.

Cheers,
-Hilko

Index: android-tools-4.2.2+git20130529/core/adb/adb.c
===================================================================
--- android-tools-4.2.2+git20130529.orig/core/adb/adb.c	2013-05-29 22:16:54.000000000 +0200
+++ android-tools-4.2.2+git20130529/core/adb/adb.c	2013-07-09 08:35:55.000000000 +0200
@@ -1154,7 +1154,7 @@
  */
 void build_local_name(char* target_str, size_t target_size, int server_port)
 {
-  snprintf(target_str, target_size, "tcp:%d", server_port);
+  snprintf(target_str, target_size, "local:%d", server_port);
 }
 
 #if !ADB_HOST
Index: android-tools-4.2.2+git20130529/core/adb/adb_client.c
===================================================================
--- android-tools-4.2.2+git20130529.orig/core/adb/adb_client.c	2013-05-29 22:16:54.000000000 +0200
+++ android-tools-4.2.2+git20130529/core/adb/adb_client.c	2013-07-09 09:13:06.864543801 +0200
@@ -185,12 +185,12 @@
         strcpy(__adb_error, "service name too long");
         return -1;
     }
-    snprintf(tmp, sizeof tmp, "%04x", len);
+    snprintf(tmp, sizeof tmp, "%d", __adb_server_port);
 
     if (__adb_server_name)
         fd = socket_network_client(__adb_server_name, __adb_server_port, SOCK_STREAM);
     else
-        fd = socket_loopback_client(__adb_server_port, SOCK_STREAM);
+        fd = socket_local_client(tmp, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM);
 
     if(fd < 0) {
         strcpy(__adb_error, "cannot connect to daemon");
@@ -201,6 +201,7 @@
         return -1;
     }
 
+    snprintf(tmp, sizeof tmp, "%04x", len);
     if(writex(fd, tmp, 4) || writex(fd, service, len)) {
         strcpy(__adb_error, "write failure during connection");
         adb_close(fd);