diff options
| author | George Hazan <ghazan@miranda.im> | 2019-03-05 21:32:36 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-03-05 21:32:36 +0300 |
| commit | aa77e05ced34970b921f0d1bd34501ce61cc152f (patch) | |
| tree | b809bdb06ccdeaa2330cb2ea905a287fdd0c7532 /src/mir_app | |
| parent | d9fddc0cfa9066eb1b5ad3f4807b37426ae6ca88 (diff) | |
code cleaning
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/netlibopenconn.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mir_app/src/netlibopenconn.cpp b/src/mir_app/src/netlibopenconn.cpp index 52758ab3fd..7d0c3f101a 100644 --- a/src/mir_app/src/netlibopenconn.cpp +++ b/src/mir_app/src/netlibopenconn.cpp @@ -650,11 +650,6 @@ retry: return rc == 0; } -static bool my_connect(NetlibConnection *nlc, NETLIBOPENCONNECTION *nloc) -{ - return my_connectIPv6(nlc, nloc); -} - static int NetlibHttpFallbackToDirect(NetlibConnection *nlc, NetlibUser *nlu, NETLIBOPENCONNECTION *nloc) { NetlibDoCloseSocket(nlc, true); @@ -664,7 +659,7 @@ static int NetlibHttpFallbackToDirect(NetlibConnection *nlc, NetlibUser *nlu, NE nlc->proxyAuthNeeded = false; nlc->proxyType = 0; replaceStr(nlc->szProxyServer, nullptr); - if (!my_connect(nlc, nloc)) { + if (!my_connectIPv6(nlc, nloc)) { Netlib_Logf(nlu, "%s %d: %s() failed (%u)", __FILE__, __LINE__, "connect", WSAGetLastError()); return false; } @@ -692,7 +687,7 @@ bool NetlibDoConnect(NetlibConnection *nlc) } } - while (!my_connect(nlc, nloc)) { + while (!my_connectIPv6(nlc, nloc)) { // if connection failed, the state of nlc might be unpredictable if (GetNetlibHandleType(nlc) == NLH_CONNECTION) { // Fallback to direct only when using HTTP proxy, as this is what used by companies |