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

Commit 78e1eb19 authored by Josh Gao's avatar Josh Gao
Browse files

adb: remove unnecessary addr arguments to accept. 

Follow up to https://android-review.googlesource.com/#/c/261412/

Change-Id: I0ee130db302940f3224cc823a26b02fc45da0fca
Test: mma
parent 5990191c

adb/adb_auth_client.cpp

+1 −3
Original line number Diff line number Diff line
@@ -151,9 +151,7 @@ void adb_auth_confirm_key(unsigned char* key, size_t len, atransport* t) { 
}



static void adb_auth_listener(int fd, unsigned events, void* data) {

    sockaddr_storage addr;

    socklen_t alen = sizeof(addr);

    int s = adb_socket_accept(fd, reinterpret_cast<sockaddr*>(&addr), &alen);

    int s = adb_socket_accept(fd, nullptr, nullptr);

    if (s < 0) {

        PLOG(ERROR) << "Failed to accept";

        return;

adb/adb_listeners.cpp

+2 −11
Original line number Diff line number Diff line
@@ -71,10 +71,7 @@ static ListenerList& listener_list = *new ListenerList(); 


static void ss_listener_event_func(int _fd, unsigned ev, void *_l) {

    if (ev & FDE_READ) {

        sockaddr_storage ss;

        sockaddr* addrp = reinterpret_cast<sockaddr*>(&ss);

        socklen_t alen = sizeof(ss);

        int fd = adb_socket_accept(_fd, addrp, &alen);

        int fd = adb_socket_accept(_fd, nullptr, nullptr);

        if (fd < 0) return;



        int rcv_buf_size = CHUNK_SIZE;
@@ -96,13 +93,7 @@ static void listener_event_func(int _fd, unsigned ev, void* _l) 
    asocket *s;



    if (ev & FDE_READ) {

        sockaddr_storage ss;

        sockaddr* addrp = reinterpret_cast<sockaddr*>(&ss);

        socklen_t alen;

        int fd;



        alen = sizeof(ss);

        fd = adb_socket_accept(_fd, addrp, &alen);

        int fd = adb_socket_accept(_fd, nullptr, nullptr);

        if (fd < 0) {

            return;

        }

adb/jdwp_service.cpp

+1 −4
Original line number Diff line number Diff line
@@ -444,10 +444,7 @@ static void jdwp_control_event(int s, unsigned events, void* _control) { 
    JdwpControl* control = (JdwpControl*)_control;



    if (events & FDE_READ) {

        sockaddr_storage ss;

        sockaddr* addrp = reinterpret_cast<sockaddr*>(&ss);

        socklen_t addrlen = sizeof(ss);

        int s = adb_socket_accept(control->listen_socket, addrp, &addrlen);

        int s = adb_socket_accept(control->listen_socket, nullptr, nullptr);

        if (s < 0) {

            if (errno == ECONNABORTED) {

                /* oops, the JDWP process died really quick */

adb/transport_local.cpp

+1 −5
Original line number Diff line number Diff line
@@ -197,9 +197,6 @@ static void client_socket_thread(void* x) { 


static void server_socket_thread(void* arg) {

    int serverfd, fd;

    sockaddr_storage ss;

    sockaddr *addrp = reinterpret_cast<sockaddr*>(&ss);

    socklen_t alen;

    int port = (int) (uintptr_t) arg;



    adb_thread_setname("server socket");
@@ -217,9 +214,8 @@ static void server_socket_thread(void* arg) { 
            close_on_exec(serverfd);

        }



        alen = sizeof(ss);

        D("server: trying to get new connection from %d", port);

        fd = adb_socket_accept(serverfd, addrp, &alen);

        fd = adb_socket_accept(serverfd, nullptr, nullptr);

        if(fd >= 0) {

            D("server: new connection on fd %d", fd);

            close_on_exec(fd);