diff options
| author | George Hazan <ghazan@miranda.im> | 2017-01-13 00:01:59 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-01-13 00:01:59 +0300 |
| commit | e145db68fb5b7d0682a4b2be0174cebfe47dd74e (patch) | |
| tree | c8f9edc907876d236eb16bc8ca8b592accb9846f /protocols/MRA/src/MraFilesQueue.cpp | |
| parent | 3cb3883908e3168e5f955be3143771721614307a (diff) | |
a bit less netlib services
Diffstat (limited to 'protocols/MRA/src/MraFilesQueue.cpp')
| -rw-r--r-- | protocols/MRA/src/MraFilesQueue.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/protocols/MRA/src/MraFilesQueue.cpp b/protocols/MRA/src/MraFilesQueue.cpp index 83234d5adf..bad116e95e 100644 --- a/protocols/MRA/src/MraFilesQueue.cpp +++ b/protocols/MRA/src/MraFilesQueue.cpp @@ -471,7 +471,7 @@ HANDLE CMraProto::MraFilesQueueConnectOut(MRA_FILES_QUEUE_ITEM *dat) dwCurConnectReTryCount = dwConnectReTryCount;
do {
- dat->hConnection = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)m_hNetlibUser, (LPARAM)&nloc);
+ dat->hConnection = Netlib_OpenConnection(m_hNetlibUser, &nloc);
}
while (--dwCurConnectReTryCount && dat->hConnection == NULL);
@@ -521,14 +521,13 @@ HANDLE CMraProto::MraFilesQueueConnectIn(MRA_FILES_QUEUE_ITEM *dat) // копируем адреса в соответствии с правилами и начинаем слушать порт
if (getByte("FileSendEnableDirectConn", MRA_DEF_FS_ENABLE_DIRECT_CONN)) {
- NETLIBBIND nlbBind = { 0 };
-
+ NETLIBBIND nlbBind = {};
nlbBind.cbSize = sizeof(nlbBind);
nlbBind.pfnNewConnectionV2 = MraFilesQueueConnectionReceived;
nlbBind.wPort = 0;
nlbBind.pExtra = (LPVOID)dat;
- dat->hListen = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)m_hNetlibUser, (LPARAM)&nlbBind);
+ dat->hListen = Netlib_BindPort(m_hNetlibUser, &nlbBind);
if (dat->hListen) {
ProtoBroadcastAck(dat->hContact, ACKTYPE_FILE, ACKRESULT_LISTENING, (HANDLE)dat->dwIDRequest, 0);
dwAddrListSize = MraFilesQueueGetLocalAddressesList(szAddrList, sizeof(szAddrList), nlbBind.wPort);
|