Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aeceb517 authored by Benoit Goby's avatar Benoit Goby
Browse files

adb: Fix adb tcpip command 

When running "adb tcpip 5555", adb create a service socket named
"tcpip:5555". Only compare the 6 first chars "tcpip:" to decide if
we enable exit_on_close.

Bug: 6650130
Change-Id: I0835973de044f1cfde0e859ff0277c0ccc2630a3
parent 0f3974c3

adb/sockets.c

+3 −3
Original line number Diff line number Diff line
@@ -427,9 +427,9 @@ asocket *create_local_service_socket(const char *name) 
    D("LS(%d): bound to '%s' via %d\n", s->id, name, fd);



#if !ADB_HOST

    if ((!strcmp(name, "root:") && getuid() != 0)

        || !strcmp(name, "usb:")

        || !strcmp(name, "tcpip:")) {

    if ((!strncmp(name, "root:", 5) && getuid() != 0)

        || !strncmp(name, "usb:", 4)

        || !strncmp(name, "tcpip:", 6)) {

        D("LS(%d): enabling exit_on_close\n", s->id);

        s->exit_on_close = 1;

    }