- Netlib_Send & Netlib_Recv helpers became real functions, MS_NETLIB_SEND & MS_NETLIB_RECV died;

- fix for dumping chunked http replies into a network log

2 files changed, 3 insertions, 4 deletions

diff --git a/protocols/IcqOscarJ/src/icq_http.cpp b/protocols/IcqOscarJ/src/icq_http.cpp
index 5c5492cbc3..d9a8e5378a 100644
--- a/protocols/IcqOscarJ/src/icq_http.cpp
+++ b/protocols/IcqOscarJ/src/icq_http.cpp
@@ -101,7 +101,7 @@ int icq_httpGatewayBegin(HANDLE hConn, NETLIBOPENCONNECTION* nloc)
 

 

 

-int icq_httpGatewayWrapSend(HANDLE hConn, PBYTE buf, int len, int flags, MIRANDASERVICE pfnNetlibSend)

+int icq_httpGatewayWrapSend(HANDLE hConn, PBYTE buf, int len, int flags)

 {

 	PBYTE sendBuf = buf;

 	int sendLen = len;

@@ -119,8 +119,7 @@ int icq_httpGatewayWrapSend(HANDLE hConn, PBYTE buf, int len, int flags, MIRANDA
 		write_httphdr(&packet, HTTP_PACKETTYPE_FLAP, GetGatewayIndex(hConn));

 		packBuffer(&packet, sendBuf, curLen);

 

-		NETLIBBUFFER nlb={ (char*)packet.pData, packet.wLen, flags };

-		curResult = pfnNetlibSend((WPARAM)hConn, (LPARAM)&nlb);

+		curResult = Netlib_Send(hConn, (char*)packet.pData, packet.wLen, flags);

 		

 		SAFE_FREE((void**)&packet.pData);

 

diff --git a/protocols/IcqOscarJ/src/icq_http.h b/protocols/IcqOscarJ/src/icq_http.h
index fb4b948770..0f2eb6a394 100644
--- a/protocols/IcqOscarJ/src/icq_http.h
+++ b/protocols/IcqOscarJ/src/icq_http.h
@@ -37,7 +37,7 @@
 

 int icq_httpGatewayInit(HANDLE hConn, NETLIBOPENCONNECTION *nloc, NETLIBHTTPREQUEST *nlhr);

 int icq_httpGatewayBegin(HANDLE hConn, NETLIBOPENCONNECTION *nloc);

-int icq_httpGatewayWrapSend(HANDLE hConn, PBYTE buf, int len, int flags, MIRANDASERVICE pfnNetlibSend);

+int icq_httpGatewayWrapSend(HANDLE hConn, PBYTE buf, int len, int flags);

 PBYTE icq_httpGatewayUnwrapRecv(NETLIBHTTPREQUEST *nlhr, PBYTE buf, int bufLen, int *outBufLen, void *(*NetlibRealloc)(void *, size_t));

 int icq_httpGatewayWalkTo(HANDLE hConn, NETLIBOPENCONNECTION* nloc);