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

Commit 2e93df2e authored by Josh Gao's avatar Josh Gao
Browse files

adb: win32: cleanup winsock initialization. 

Instead of doing it in 3 arbitrary functions, do it at startup always.

Test: wine adb_test.exe
Change-Id: Ida272d218aee6c331471250edce64d512d3b628a
parent 011ba4b9

adb/sysdeps_win32.cpp

+9 −20
Original line number Diff line number Diff line
@@ -726,23 +726,15 @@ static int _fh_socket_writev(FH f, const adb_iovec* iov, int iovcnt) { 
/**************************************************************************/

/**************************************************************************/



#include <winsock2.h>



static int  _winsock_init;



static void

_init_winsock( void )

{

    // TODO: Multiple threads calling this may potentially cause multiple calls

    // to WSAStartup() which offers no real benefit.

    if (!_winsock_init) {

static int _init_winsock(void) {

    static std::once_flag once;

    std::call_once(once, []() {

        WSADATA wsaData;

        int rc = WSAStartup(MAKEWORD(2, 2), &wsaData);

        if (rc != 0) {

            fatal("adb: could not initialize Winsock: %s",

                  android::base::SystemErrorCodeToString(rc).c_str());

        }

        _winsock_init = 1;



        // Note that we do not call atexit() to register WSACleanup to be called

        // at normal process termination because:
@@ -757,9 +749,12 @@ _init_winsock( void ) 
        //    setupapi.dll which tries to load wintrust.dll which tries to load

        //    crypt32.dll which calls atexit() which tries to acquire the C

        //    Runtime lock that the other thread holds.

    }

    });

    return 0;

}



static int _winsock_init = _init_winsock();



// Map a socket type to an explicit socket protocol instead of using the socket

// protocol of 0. Explicit socket protocols are used by most apps and we should

// do the same to reduce the chance of exercising uncommon code-paths that might
@@ -787,8 +782,6 @@ int network_loopback_client(int port, int type, std::string* error) { 
        return -1;

    }



    if (!_winsock_init) _init_winsock();



    memset(&addr, 0, sizeof(addr));

    addr.sin_family = AF_INET;

    addr.sin_port = htons(port);
@@ -837,8 +830,6 @@ static int _network_server(int port, int type, u_long interface_address, std::st 
        return -1;

    }



    if (!_winsock_init) _init_winsock();



    memset(&addr, 0, sizeof(addr));

    addr.sin_family = AF_INET;

    addr.sin_port = htons(port);
@@ -915,8 +906,6 @@ int network_connect(const std::string& host, int port, int type, int timeout, st 
        return -1;

    }



    if (!_winsock_init) _init_winsock();



    struct addrinfo hints;

    memset(&hints, 0, sizeof(hints));

    hints.ai_family = AF_UNSPEC;