1*4882a593SmuzhiyunFrom 81f822f7b4faf670cb3b04adfb065ae411982226 Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com>
3*4882a593SmuzhiyunDate: Tue, 7 Mar 2023 16:51:35 +0800
4*4882a593SmuzhiyunSubject: [PATCH 18/20] adbd: Support setting TCP port with env ADB_TCP_PORT
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunTested on RK3588 EVB:
7*4882a593SmuzhiyunADB_TCP_PORT=3588 adbd
8*4882a593Smuzhiyun
9*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
10*4882a593Smuzhiyun---
11*4882a593Smuzhiyun core/adbd/adb.c | 16 ++++++----------
12*4882a593Smuzhiyun 1 file changed, 6 insertions(+), 10 deletions(-)
13*4882a593Smuzhiyun
14*4882a593Smuzhiyundiff --git a/core/adbd/adb.c b/core/adbd/adb.c
15*4882a593Smuzhiyunindex c4c00d7..32173f2 100644
16*4882a593Smuzhiyun--- a/core/adbd/adb.c
17*4882a593Smuzhiyun+++ b/core/adbd/adb.c
18*4882a593Smuzhiyun@@ -1314,17 +1314,13 @@ int adb_main(int is_daemon, int server_port)
19*4882a593Smuzhiyun     // If one of these properties is set, also listen on that port
20*4882a593Smuzhiyun     // If one of the properties isn't set and we couldn't listen on usb,
21*4882a593Smuzhiyun     // listen on the default port.
22*4882a593Smuzhiyun-    //property_get("service.adb.tcp.port", value, "");
23*4882a593Smuzhiyun-    //if (!value[0]) {
24*4882a593Smuzhiyun-        //property_get("persist.adb.tcp.port", value, "");
25*4882a593Smuzhiyun-    //}
26*4882a593Smuzhiyun-    //if (sscanf(value, "%d", &port) == 1 && port > 0) {
27*4882a593Smuzhiyun-    //    printf("using port=%d\n", port);
28*4882a593Smuzhiyun+    strcpy(value, getenv("ADB_TCP_PORT") ? : "");
29*4882a593Smuzhiyun+    if (sscanf(value, "%d", &port) == 1 && port > 0) {
30*4882a593Smuzhiyun+        printf("using port=%d\n", port);
31*4882a593Smuzhiyun         // listen on TCP port specified by service.adb.tcp.port property
32*4882a593Smuzhiyun-    //    local_init(port);
33*4882a593Smuzhiyun-    //} else
34*4882a593Smuzhiyun-    if (!usb) {
35*4882a593Smuzhiyun-        printf("Using USB\n");
36*4882a593Smuzhiyun+        local_init(port);
37*4882a593Smuzhiyun+    } else if (!usb) {
38*4882a593Smuzhiyun+        printf("Using TCP\n");
39*4882a593Smuzhiyun         // listen on default port
40*4882a593Smuzhiyun         local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT);
41*4882a593Smuzhiyun     }
42*4882a593Smuzhiyun--
43*4882a593Smuzhiyun2.20.1
44*4882a593Smuzhiyun
45