From e89d9f7aee35af5441ce8e3432f7eabdb7ffc5e3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 24 Jun 2018 20:53:05 +0300 Subject: fix for hanging up in new netlib hooks --- src/mir_app/src/netlib.cpp | 2 +- src/mir_app/src/netlibbind.cpp | 4 ++-- src/mir_app/src/netlibopenconn.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/netlib.cpp b/src/mir_app/src/netlib.cpp index 4e35fc8f66..62cdeb8f9c 100644 --- a/src/mir_app/src/netlib.cpp +++ b/src/mir_app/src/netlib.cpp @@ -278,7 +278,7 @@ void NetlibDoCloseSocket(NetlibConnection *nlc, bool noShutdown) getpeername(nlc->s, (SOCKADDR *)&ncei.remote, &size); } - NotifyEventHooks(hEventDisconnected, (WPARAM)&ncei, 0); + NotifyFastHook(hEventDisconnected, (WPARAM)&ncei, 0); closesocket(nlc->s); nlc->s = INVALID_SOCKET; diff --git a/src/mir_app/src/netlibbind.cpp b/src/mir_app/src/netlibbind.cpp index 4fef5341a4..19b86361b4 100644 --- a/src/mir_app/src/netlibbind.cpp +++ b/src/mir_app/src/netlibbind.cpp @@ -119,7 +119,7 @@ int NetlibFreeBoundPort(NetlibBoundPort *nlbp) ncei.szSettingsModule = nlbp->nlu->user.szSettingsModule; int size = sizeof(SOCKADDR_IN); getsockname(nlbp->s, (SOCKADDR *)&ncei.local, &size); - NotifyEventHooks(hEventDisconnected, (WPARAM)&ncei, 0); + NotifyFastHook(hEventDisconnected, (WPARAM)&ncei, 0); nlbp->close(); if (nlbp->hThread) @@ -298,7 +298,7 @@ LBL_Error: ncei.listening = 1; ncei.szSettingsModule = nlu->user.szSettingsModule; memcpy(&ncei.local, &sin, sizeof(sin)); - NotifyEventHooks(hEventConnected, (WPARAM)&ncei, 0); + NotifyFastHook(hEventConnected, (WPARAM)&ncei, 0); return nlbp; } diff --git a/src/mir_app/src/netlibopenconn.cpp b/src/mir_app/src/netlibopenconn.cpp index 187e3c60f3..e0e5bba525 100644 --- a/src/mir_app/src/netlibopenconn.cpp +++ b/src/mir_app/src/netlibopenconn.cpp @@ -790,7 +790,7 @@ bool NetlibDoConnect(NetlibConnection *nlc) size = sizeof(SOCKADDR_IN); getpeername(nlc->s, (SOCKADDR *)&ncei.remote, &size); } - NotifyEventHooks(hEventConnected, (WPARAM)&ncei, 0); + NotifyFastHook(hEventConnected, (WPARAM)&ncei, 0); if (NLOCF_SSL & nloc->flags) return Netlib_StartSsl(nlc, nullptr) != 0; -- cgit v1.2.3