netlib moved to the core logger

git-svn-id: http://svn.miranda-ng.org/main/trunk@5665 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 18 insertions, 18 deletions

diff --git a/src/modules/netlib/netlib.h b/src/modules/netlib/netlib.h
index c7ca929e0c..290d9b44b6 100644
--- a/src/modules/netlib/netlib.h
+++ b/src/modules/netlib/netlib.h
@@ -48,7 +48,7 @@ struct NetlibNestedCriticalSection
 

 struct NetlibHTTPProxyPacketQueue

 {

-	struct NetlibHTTPProxyPacketQueue *next;

+	NetlibHTTPProxyPacketQueue *next;

 	PBYTE dataBuffer;

 	int dataBufferLen;

 };

@@ -68,16 +68,16 @@ struct NetlibConnection
 	bool proxyAuthNeeded;

 	bool dnsThroughProxy;

 	bool termRequested;

-	struct NetlibUser *nlu;

+	NetlibUser *nlu;

 	NETLIBHTTPPROXYINFO nlhpi;

 	PBYTE dataBuffer;

 	int dataBufferLen;

 	CRITICAL_SECTION csHttpSequenceNums;

 	HANDLE hOkToCloseEvent;

 	LONG dontCloseNow;

-	struct NetlibNestedCriticalSection ncsSend, ncsRecv;

+	NetlibNestedCriticalSection ncsSend, ncsRecv;

 	HSSL hSsl;

-	struct NetlibHTTPProxyPacketQueue * pHttpProxyPacketQueue;

+	NetlibHTTPProxyPacketQueue * pHttpProxyPacketQueue;

 	char *szNewUrl;

 	char *szProxyServer;

 	WORD wProxyPort;

@@ -93,7 +93,7 @@ struct NetlibBoundPort {
 	SOCKET s6;

 	WORD wPort;

 	WORD wExPort;

-	struct NetlibUser *nlu;

+	NetlibUser *nlu;

 	NETLIBNEWCONNECTIONPROC_V2 pfnNewConnectionV2;

 	HANDLE hThread;

 	void *pExtra;

@@ -101,7 +101,7 @@ struct NetlibBoundPort {
 

 struct NetlibPacketRecver {

 	int handleType;

-	struct NetlibConnection *nlc;

+	NetlibConnection *nlc;

 	NETLIBPACKETRECVER packetRecver;

 };

 

@@ -109,12 +109,12 @@ struct NetlibPacketRecver {
 void NetlibFreeUserSettingsStruct(NETLIBUSERSETTINGS *settings);

 void NetlibDoClose(NetlibConnection *nlc, bool noShutdown = false);

 INT_PTR NetlibCloseHandle(WPARAM wParam, LPARAM lParam);

-void NetlibInitializeNestedCS(struct NetlibNestedCriticalSection *nlncs);

-void NetlibDeleteNestedCS(struct NetlibNestedCriticalSection *nlncs);

+void NetlibInitializeNestedCS(NetlibNestedCriticalSection *nlncs);

+void NetlibDeleteNestedCS(NetlibNestedCriticalSection *nlncs);

 #define NLNCS_SEND  0

 #define NLNCS_RECV  1

-int NetlibEnterNestedCS(struct NetlibConnection *nlc, int which);

-void NetlibLeaveNestedCS(struct NetlibNestedCriticalSection *nlncs);

+int NetlibEnterNestedCS(NetlibConnection *nlc, int which);

+void NetlibLeaveNestedCS(NetlibNestedCriticalSection *nlncs);

 INT_PTR NetlibBase64Encode(WPARAM wParam, LPARAM lParam);

 INT_PTR NetlibBase64Decode(WPARAM wParam, LPARAM lParam);

 INT_PTR NetlibHttpUrlEncode(WPARAM wParam, LPARAM lParam);

@@ -129,7 +129,7 @@ char* NetlibGetIeProxy(char *szUrl);
 bool NetlibGetIeProxyConn(NetlibConnection *nlc, bool forceHttps);

 

 //netlibbind.c

-int NetlibFreeBoundPort(struct NetlibBoundPort *nlbp);

+int NetlibFreeBoundPort(NetlibBoundPort *nlbp);

 INT_PTR NetlibBindPort(WPARAM wParam, LPARAM lParam);

 bool BindSocketToPort(const char *szPorts, SOCKET s, SOCKET s6, int* portn);

 

@@ -143,9 +143,9 @@ NETLIBHTTPREQUEST* NetlibHttpRecv(NetlibConnection* nlc, DWORD hflags, DWORD dfl
 void NetlibConnFromUrl(const char* szUrl, bool secur, NETLIBOPENCONNECTION &nloc);

 

 //netlibhttpproxy.c

-int NetlibInitHttpConnection(struct NetlibConnection *nlc, struct NetlibUser *nlu, NETLIBOPENCONNECTION *nloc);

-int NetlibHttpGatewayRecv(struct NetlibConnection *nlc, char *buf, int len, int flags);

-int NetlibHttpGatewayPost(struct NetlibConnection *nlc, const char *buf, int len, int flags);

+int NetlibInitHttpConnection(NetlibConnection *nlc, NetlibUser *nlu, NETLIBOPENCONNECTION *nloc);

+int NetlibHttpGatewayRecv(NetlibConnection *nlc, char *buf, int len, int flags);

+int NetlibHttpGatewayPost(NetlibConnection *nlc, const char *buf, int len, int flags);

 void HttpGatewayRemovePacket(NetlibConnection *nlc, int pck);

 

 INT_PTR NetlibHttpGatewaySetInfo(WPARAM wParam, LPARAM lParam);

@@ -154,13 +154,13 @@ INT_PTR NetlibHttpSetSticky(WPARAM wParam, LPARAM lParam);
 

 //netliblog.c

 void NetlibLogShowOptions(void);

-void NetlibDumpData(struct NetlibConnection *nlc, PBYTE buf, int len, int sent, int flags);

+void NetlibDumpData(NetlibConnection *nlc, PBYTE buf, int len, int sent, int flags);

 void NetlibLogf(NetlibUser* nlu, const char *fmt, ...);

 void NetlibLogInit(void);

 void NetlibLogShutdown(void);

 

 //netlibopenconn.c

-DWORD DnsLookup(struct NetlibUser *nlu, const char *szHost);

+DWORD DnsLookup(NetlibUser *nlu, const char *szHost);

 int WaitUntilReadable(SOCKET s, DWORD dwTimeout, bool check = false);

 int WaitUntilWritable(SOCKET s, DWORD dwTimeout);

 bool NetlibDoConnect(NetlibConnection *nlc);

@@ -209,12 +209,12 @@ HANDLE NetlibInitSecurityProvider(const char* szProvider, const char* szPrincipa
 char*  NtlmCreateResponseFromChallenge(HANDLE hSecurity, const char *szChallenge, const TCHAR* login, const TCHAR* psw,

 									   bool http, unsigned& complete);

 

-static __inline INT_PTR NLSend(struct NetlibConnection *nlc, const char *buf, int len, int flags) {

+static __inline INT_PTR NLSend(NetlibConnection *nlc, const char *buf, int len, int flags) {

 	NETLIBBUFFER nlb = {(char*)buf, len, flags};

 	return NetlibSend((WPARAM)nlc, (LPARAM)&nlb);

 }

 

-static __inline INT_PTR NLRecv(struct NetlibConnection *nlc, char *buf, int len, int flags) {

+static __inline INT_PTR NLRecv(NetlibConnection *nlc, char *buf, int len, int flags) {

 	NETLIBBUFFER nlb = {buf, len, flags};

 	return NetlibRecv((WPARAM)nlc, (LPARAM)&nlb);

 }