- miranda32.exe now does nothing bug extends PATH to %miranda_root%\libs and loads mir_app.dll;

- everything that was in miranda32.exe (including resources) moved to mir_app.dll;
- exports from mir_app.dll now available for using directly, without perversions;
- src/stdplug.h deleted;

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

1 files changed, 0 insertions, 313 deletions

diff --git a/src/modules/netlib/netlibsock.cpp b/src/modules/netlib/netlibsock.cpp
deleted file mode 100644
index e53e73bd89..0000000000
--- a/src/modules/netlib/netlibsock.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org),

-Copyright (c) 2000-12 Miranda IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#include "..\..\core\commonheaders.h"

-#include "netlib.h"

-

-extern HANDLE hConnectionHeaderMutex, hSendEvent, hRecvEvent;

-

-INT_PTR NetlibSend(WPARAM wParam, LPARAM lParam)

-{

-	NetlibConnection *nlc = (NetlibConnection*)wParam;

-	NETLIBBUFFER *nlb = (NETLIBBUFFER*)lParam;

-	INT_PTR result;

-

-	if (nlb == NULL) {

-		SetLastError(ERROR_INVALID_PARAMETER);

-		return SOCKET_ERROR;

-	}

-

-	if (!NetlibEnterNestedCS(nlc, NLNCS_SEND))

-		return SOCKET_ERROR;

-

-	if (nlc->usingHttpGateway && !(nlb->flags & MSG_RAW)) {

-		if (!(nlb->flags & MSG_NOHTTPGATEWAYWRAP) && nlc->nlu->user.pfnHttpGatewayWrapSend) {

-			NetlibDumpData(nlc, (PBYTE)nlb->buf, nlb->len, 1, nlb->flags);

-			result = nlc->nlu->user.pfnHttpGatewayWrapSend((HANDLE)nlc, (PBYTE)nlb->buf, nlb->len, nlb->flags | MSG_NOHTTPGATEWAYWRAP, NetlibSend);

-		}

-		else result = NetlibHttpGatewayPost(nlc, nlb->buf, nlb->len, nlb->flags);

-	}

-	else {

-		NetlibDumpData(nlc, (PBYTE)nlb->buf, nlb->len, 1, nlb->flags);

-		if (nlc->hSsl)

-			result = si.write(nlc->hSsl, nlb->buf, nlb->len);

-		else

-			result = send(nlc->s, nlb->buf, nlb->len, nlb->flags & 0xFFFF);

-	}

-	NetlibLeaveNestedCS(&nlc->ncsSend);

-

-	NETLIBNOTIFY nln = { nlb, result };

-	NotifyFastHook(hSendEvent, (WPARAM)&nln, (LPARAM)&nlc->nlu->user);

-

-	return result;

-}

-

-INT_PTR NetlibRecv(WPARAM wParam, LPARAM lParam)

-{

-	NetlibConnection *nlc = (NetlibConnection*)wParam;

-	NETLIBBUFFER* nlb = (NETLIBBUFFER*)lParam;

-	int recvResult;

-

-	if (nlb == NULL) {

-		SetLastError(ERROR_INVALID_PARAMETER);

-		return SOCKET_ERROR;

-	}

-

-	if (!NetlibEnterNestedCS(nlc, NLNCS_RECV))

-		return SOCKET_ERROR;

-

-	if (nlc->usingHttpGateway && !(nlb->flags & MSG_RAW))

-		recvResult = NetlibHttpGatewayRecv(nlc, nlb->buf, nlb->len, nlb->flags);

-	else {

-		if (nlc->hSsl)

-			recvResult = si.read(nlc->hSsl, nlb->buf, nlb->len, (nlb->flags & MSG_PEEK) != 0);

-		else

-			recvResult = recv(nlc->s, nlb->buf, nlb->len, nlb->flags & 0xFFFF);

-	}

-	NetlibLeaveNestedCS(&nlc->ncsRecv);

-	if (recvResult <= 0)

-		return recvResult;

-

-	NetlibDumpData(nlc, (PBYTE)nlb->buf, recvResult, 0, nlb->flags);

-

-	if ((nlb->flags & MSG_PEEK) == 0) {

-		NETLIBNOTIFY nln = { nlb, recvResult };

-		NotifyFastHook(hRecvEvent, (WPARAM)&nln, (LPARAM)&nlc->nlu->user);

-	}

-	return recvResult;

-}

-

-static int ConnectionListToSocketList(HANDLE *hConns, fd_set *fd, int& pending)

-{

-	FD_ZERO(fd);

-	for (int i = 0; hConns[i] && hConns[i] != INVALID_HANDLE_VALUE && i < FD_SETSIZE; i++) {

-		NetlibConnection *nlcCheck = (NetlibConnection*)hConns[i];

-		if (nlcCheck->handleType != NLH_CONNECTION && nlcCheck->handleType != NLH_BOUNDPORT) {

-			SetLastError(ERROR_INVALID_DATA);

-			return 0;

-		}

-		FD_SET(nlcCheck->s, fd);

-		if (si.pending(nlcCheck->hSsl))

-			pending++;

-	}

-	return 1;

-}

-

-INT_PTR NetlibSelect(WPARAM, LPARAM lParam)

-{

-	NETLIBSELECT *nls = (NETLIBSELECT*)lParam;

-	if (nls == NULL || nls->cbSize != sizeof(NETLIBSELECT)) {

-		SetLastError(ERROR_INVALID_PARAMETER);

-		return SOCKET_ERROR;

-	}

-

-	TIMEVAL tv;

-	tv.tv_sec = nls->dwTimeout/1000;

-	tv.tv_usec = (nls->dwTimeout%1000)*1000;

-

-	int pending = 0;

-	fd_set readfd, writefd, exceptfd;

-	WaitForSingleObject(hConnectionHeaderMutex, INFINITE);

-	if (!ConnectionListToSocketList(nls->hReadConns, &readfd, pending)

-		 || !ConnectionListToSocketList(nls->hWriteConns, &writefd, pending)

-		 || !ConnectionListToSocketList(nls->hExceptConns, &exceptfd, pending))

-	{

-		ReleaseMutex(hConnectionHeaderMutex);

-		return SOCKET_ERROR;

-	}

-	ReleaseMutex(hConnectionHeaderMutex);

-	if (pending)

-		return 1;

-

-	return select(0, &readfd, &writefd, &exceptfd, nls->dwTimeout == INFINITE ? NULL : &tv);

-}

-

-INT_PTR NetlibSelectEx(WPARAM, LPARAM lParam)

-{

-	NETLIBSELECTEX *nls = (NETLIBSELECTEX*)lParam;

-	if (nls == NULL || nls->cbSize != sizeof(NETLIBSELECTEX)) {

-		SetLastError(ERROR_INVALID_PARAMETER);

-		return SOCKET_ERROR;

-	}

-

-	TIMEVAL tv;

-	tv.tv_sec = nls->dwTimeout / 1000;

-	tv.tv_usec = (nls->dwTimeout % 1000) * 1000;

-	WaitForSingleObject(hConnectionHeaderMutex, INFINITE);

-

-	int pending = 0;

-	fd_set readfd, writefd, exceptfd;

-	if (!ConnectionListToSocketList(nls->hReadConns, &readfd, pending)

-		|| !ConnectionListToSocketList(nls->hWriteConns, &writefd, pending)

-		|| !ConnectionListToSocketList(nls->hExceptConns, &exceptfd, pending))

-	{

-		ReleaseMutex(hConnectionHeaderMutex);

-		return SOCKET_ERROR;

-	}

-	ReleaseMutex(hConnectionHeaderMutex);

-

-	int rc = (pending) ? pending : select(0, &readfd, &writefd, &exceptfd, nls->dwTimeout == INFINITE ? NULL : &tv);

-

-	WaitForSingleObject(hConnectionHeaderMutex, INFINITE);

-	/* go thru each passed HCONN array and grab its socket handle, then give it to FD_ISSET()

-	to see if an event happened for that socket, if it has it will be returned as TRUE (otherwise not)

-	This happens for read/write/except */

-	NetlibConnection *conn = NULL;

-	int j;

-	for (j = 0; j < FD_SETSIZE; j++) {

-		conn = (NetlibConnection*)nls->hReadConns[j];

-		if (conn == NULL || conn == INVALID_HANDLE_VALUE) break;

-

-		if (si.pending(conn->hSsl))

-			nls->hReadStatus[j] = TRUE;

-		if (conn->usingHttpGateway && conn->nlhpi.szHttpGetUrl == NULL && conn->dataBuffer == NULL)

-			nls->hReadStatus[j] = (conn->pHttpProxyPacketQueue != NULL);

-		else

-			nls->hReadStatus[j] = FD_ISSET(conn->s, &readfd);

-	}

-	for (j = 0; j < FD_SETSIZE; j++) {

-		conn = (NetlibConnection*)nls->hWriteConns[j];

-		if (conn == NULL || conn == INVALID_HANDLE_VALUE) break;

-		nls->hWriteStatus[j] = FD_ISSET(conn->s, &writefd);

-	}

-	for (j = 0; j < FD_SETSIZE; j++) {

-		conn = (NetlibConnection*)nls->hExceptConns[j];

-		if (conn == NULL || conn == INVALID_HANDLE_VALUE) break;

-		nls->hExceptStatus[j] = FD_ISSET(conn->s, &exceptfd);

-	}

-	ReleaseMutex(hConnectionHeaderMutex);

-	return rc;

-}

-

-bool NetlibStringToAddress(const char* str, SOCKADDR_INET_M* addr)

-{

-	if (!str) return false;

-

-	int len = sizeof(SOCKADDR_INET_M);

-	return !WSAStringToAddressA((char*)str, AF_INET6, NULL, (PSOCKADDR)addr, &len);

-}

-

-char* NetlibAddressToString(SOCKADDR_INET_M* addr)

-{

-	char saddr[128];

-	DWORD len = sizeof(saddr);

-	if (!WSAAddressToStringA((PSOCKADDR)addr, sizeof(*addr), NULL, saddr, &len))

-		return mir_strdup(saddr);

-

-	if (addr->si_family == AF_INET) {

-		char *szIp = inet_ntoa(addr->Ipv4.sin_addr);

-		if (addr->Ipv4.sin_port != 0) {

-			mir_snprintf(saddr, SIZEOF(saddr), "%s:%d", szIp, htons(addr->Ipv4.sin_port));

-			return mir_strdup(saddr);

-		}

-		return mir_strdup(szIp);

-	}

-	return NULL;

-}

-

-void NetlibGetConnectionInfo(NetlibConnection* nlc, NETLIBCONNINFO *connInfo)

-{

-	if (!nlc || !connInfo || connInfo->cbSize < sizeof(NETLIBCONNINFO)) return;

-

-	SOCKADDR_INET_M sin = { 0 };

-	int len = sizeof(sin);

-	if (!getsockname(nlc->s, (PSOCKADDR)&sin, &len)) {

-		connInfo->wPort = ntohs(sin.Ipv4.sin_port);

-		connInfo->dwIpv4 = sin.si_family == AF_INET ? htonl(sin.Ipv4.sin_addr.s_addr) : 0;

-

-		char *szTmp = NetlibAddressToString(&sin);

-		strncpy(connInfo->szIpPort, szTmp, sizeof(connInfo->szIpPort));

-		connInfo->szIpPort[sizeof(connInfo->szIpPort) - 1] = 0;

-		mir_free(szTmp);

-	}

-}

-

-inline bool IsAddrGlobal(const IN6_ADDR *a)

-{

-	unsigned char High = a->s6_bytes[0] & 0xf0;

-	return High != 0 && High != 0xf0;

-}

-

-static NETLIBIPLIST* GetMyIpv6(unsigned flags)

-{

-	addrinfo *air = NULL, *ai, hints = { 0 };

-	const char *szMyHost = "";

-

-	hints.ai_family = AF_UNSPEC;

-	hints.ai_flags = AI_PASSIVE;

-

-	if (GetAddrInfoA(szMyHost, NULL, &hints, &air))

-		return NULL;

-

-	unsigned n = 0;

-	for (ai = air; ai; ai = ai->ai_next) {

-		SOCKADDR_INET_M *iaddr = (SOCKADDR_INET_M*)ai->ai_addr;

-		if (ai->ai_family == AF_INET || (ai->ai_family == AF_INET6 && (!(flags & 1) || IsAddrGlobal(&iaddr->Ipv6.sin6_addr))))

-			++n;

-	}

-

-	NETLIBIPLIST *addr = (NETLIBIPLIST*)mir_calloc(n * 64 + 4);

-	addr->cbNum = n;

-

-	unsigned i = 0;

-	for (ai = air; ai; ai = ai->ai_next) {

-		SOCKADDR_INET_M *iaddr = (SOCKADDR_INET_M*)ai->ai_addr;

-		if (ai->ai_family == AF_INET ||

-			(ai->ai_family == AF_INET6 &&

-			(!(flags & 1) || IsAddrGlobal(&iaddr->Ipv6.sin6_addr))))

-		{

-			char *szIp = NetlibAddressToString(iaddr);

-			if (szIp)

-				strncpy_s(addr->szIp[i++], szIp, _TRUNCATE);

-			mir_free(szIp);

-		}

-	}

-	FreeAddrInfoA(air);

-	return addr;

-}

-

-static NETLIBIPLIST* GetMyIpv4(void)

-{

-	char hostname[256] = "";

-

-	gethostname(hostname, sizeof(hostname));

-	PHOSTENT he = gethostbyname(hostname);

-

-	unsigned n;

-	for (n = 0; he->h_addr_list[n]; ++n)

-		;

-

-	NETLIBIPLIST *addr = (NETLIBIPLIST*)mir_calloc(n * 64 + 4);

-	addr->cbNum = n;

-

-	for (unsigned i = 0; i < n; i++)

-		strncpy_s(addr->szIp[i], inet_ntoa(*(PIN_ADDR)he->h_addr_list[i]), _TRUNCATE);

-

-	return addr;

-}

-

-NETLIBIPLIST* GetMyIp(unsigned flags)

-{

-	return GetMyIpv6(flags);

-}