ipv6 sync

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

1 files changed, 13 insertions, 1 deletions

diff --git a/src/modules/netlib/netlib.h b/src/modules/netlib/netlib.h
index 575e77f18c..8939e7fafc 100644
--- a/src/modules/netlib/netlib.h
+++ b/src/modules/netlib/netlib.h
@@ -52,6 +52,12 @@ struct NetlibHTTPProxyPacketQueue
 	int dataBufferLen;

 };

 

+typedef union _SOCKADDR_INET_M {

+    SOCKADDR_IN Ipv4;

+    SOCKADDR_IN6 Ipv6;

+    USHORT si_family;    

+} SOCKADDR_INET_M, *PSOCKADDR_INET_M;

+

 struct NetlibConnection 

 {

 	int handleType;

@@ -83,6 +89,7 @@ struct NetlibConnection
 struct NetlibBoundPort {

 	int handleType;

 	SOCKET s;

+	SOCKET s6;

 	WORD wPort;

 	WORD wExPort;

 	struct NetlibUser *nlu;

@@ -123,7 +130,7 @@ bool NetlibGetIeProxyConn(NetlibConnection *nlc, bool forceHttps);
 //netlibbind.c

 int NetlibFreeBoundPort(struct NetlibBoundPort *nlbp);

 INT_PTR NetlibBindPort(WPARAM wParam,LPARAM lParam);

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

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

 

 //netlibhttp.c

 INT_PTR NetlibHttpSendRequest(WPARAM wParam,LPARAM lParam);

@@ -179,6 +186,11 @@ INT_PTR NetlibSelect(WPARAM wParam,LPARAM lParam);
 INT_PTR NetlibSelectEx(WPARAM wParam,LPARAM lParam);

 INT_PTR NetlibShutdown(WPARAM wParam,LPARAM lParam);

 

+bool NetlibStringToAddress(const char* str, SOCKADDR_INET_M* addr);

+char* NetlibAddressToString(SOCKADDR_INET_M* addr);

+void NetlibGetConnectionInfo(NetlibConnection* nlc, NETLIBCONNINFO *connInfo);

+NETLIBIPLIST* GetMyIp(unsigned flags);

+

 //netlibupnp.c

 bool NetlibUPnPAddPortMapping(WORD intport, char *proto,

 							  WORD *extport, DWORD *extip, bool search);