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

Commit 46b0b1c6 authored by Erik Kline's avatar Erik Kline Committed by Gerrit Code Review
Browse files

Merge "Switch from using sockaddr to sockaddr_storage."

parents c6899844 7e16cc15

adb/adb_auth_client.cpp

+2 −2
Original line number Diff line number Diff line
@@ -228,13 +228,13 @@ void adb_auth_confirm_key(unsigned char *key, size_t len, atransport *t) 


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

{

    struct sockaddr addr;

    sockaddr_storage addr;

    socklen_t alen;

    int s;



    alen = sizeof(addr);



    s = adb_socket_accept(fd, &addr, &alen);

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

    if (s < 0) {

        D("Failed to accept: errno=%d", errno);

        return;

adb/adb_listeners.cpp

+9 −7
Original line number Diff line number Diff line
@@ -34,9 +34,10 @@ static alistener listener_list = { 


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

    if (ev & FDE_READ) {

        struct sockaddr addr;

        socklen_t alen = sizeof(addr);

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

        sockaddr_storage ss;

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

        socklen_t alen = sizeof(ss);

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

        if (fd < 0) return;



        int rcv_buf_size = CHUNK_SIZE;
@@ -58,12 +59,13 @@ static void listener_event_func(int _fd, unsigned ev, void* _l) 
    asocket *s;



    if (ev & FDE_READ) {

        struct sockaddr addr;

        sockaddr_storage ss;

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

        socklen_t alen;

        int fd;



        alen = sizeof(addr);

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

        alen = sizeof(ss);

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

        if (fd < 0) {

            return;

        }

adb/jdwp_service.cpp

+12 −11
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ jdwp_control_init( JdwpControl* control, 
                   const char*   sockname,

                   int           socknamelen )

{

    struct sockaddr_un   addr;

    sockaddr_un   addr;

    socklen_t     addrlen;

    int           s;

    int           maxpath = sizeof(addr.sun_path);
@@ -485,7 +485,7 @@ jdwp_control_init( JdwpControl* control, 


    addrlen = (pathlen + sizeof(addr.sun_family));



    if (bind(s, (struct sockaddr*)&addr, addrlen) < 0) {

    if (bind(s, reinterpret_cast<sockaddr*>(&addr), addrlen) < 0) {

        D( "could not bind vm debug control socket: %d: %s",

           errno, strerror(errno) );

        adb_close(s);
@@ -523,13 +523,14 @@ jdwp_control_event( int s, unsigned events, void* _control ) 
    JdwpControl*  control = (JdwpControl*) _control;



    if (events & FDE_READ) {

        struct sockaddr   addr;

        socklen_t         addrlen = sizeof(addr);

        sockaddr_storage   ss;

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

        socklen_t          addrlen = sizeof(ss);

        int                s = -1;

        JdwpProcess*       proc;



        do {

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

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

            if (s < 0) {

                if (errno == EINTR)

                    continue;

adb/transport_local.cpp

+4 −3
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ static void *client_socket_thread(void *x) 
static void *server_socket_thread(void * arg)

{

    int serverfd, fd;

    struct sockaddr addr;

    sockaddr_storage ss;

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

    socklen_t alen;

    int port = (int) (uintptr_t) arg;
@@ -162,9 +163,9 @@ static void *server_socket_thread(void * arg) 
            close_on_exec(serverfd);

        }



        alen = sizeof(addr);

        alen = sizeof(ss);

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

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

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

        if(fd >= 0) {

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

            close_on_exec(fd);

debuggerd/debuggerd.cpp

+4 −3
Original line number Diff line number Diff line
@@ -518,11 +518,12 @@ static int do_server() { 
  ALOGI("debuggerd: starting\n");



  for (;;) {

    sockaddr addr;

    socklen_t alen = sizeof(addr);

    sockaddr_storage ss;

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

    socklen_t alen = sizeof(ss);



    ALOGV("waiting for connection\n");

    int fd = accept(s, &addr, &alen);

    int fd = accept(s, addrp, &alen);

    if (fd < 0) {

      ALOGV("accept failed: %s\n", strerror(errno));

      continue;