diff --git a/CheckProxy_Th.h b/CheckProxy_Th.h index d7dabd0..d2f93c5 100644 --- a/CheckProxy_Th.h +++ b/CheckProxy_Th.h @@ -3,7 +3,6 @@ #pragma once #include "nesca_3.h" -#include "resource.h" class CheckProxy_Th : public QThread { diff --git a/DrawerTh_HorNet.h b/DrawerTh_HorNet.h index e47d4bd..5279c18 100644 --- a/DrawerTh_HorNet.h +++ b/DrawerTh_HorNet.h @@ -3,7 +3,6 @@ #pragma once #include "nesca_3.h" -#include "resource.h" class DrawerTh_HorNet : public QThread { diff --git a/DrawerTh_QoSScanner.h b/DrawerTh_QoSScanner.h index 27be0e2..7f710e3 100644 --- a/DrawerTh_QoSScanner.h +++ b/DrawerTh_QoSScanner.h @@ -3,7 +3,6 @@ #pragma once #include "nesca_3.h" -#include "resource.h" class DrawerTh_QoSScanner : public QThread { diff --git a/DrawerTh_VoiceScanner.h b/DrawerTh_VoiceScanner.h index 3da5997..88a5457 100644 --- a/DrawerTh_VoiceScanner.h +++ b/DrawerTh_VoiceScanner.h @@ -3,7 +3,6 @@ #pragma once #include "nesca_3.h" -#include "resource.h" class DrawerTh_VoiceScanner : public QThread { diff --git a/IRCPinger_Th.h b/IRCPinger_Th.h index e4ab1df..5872ea4 100644 --- a/IRCPinger_Th.h +++ b/IRCPinger_Th.h @@ -3,7 +3,6 @@ #pragma once #include "nesca_3.h" -#include "resource.h" extern int iWantToConnect; class IRCPinger_Th : public QThread diff --git a/STh.h b/STh.h index 8ed2897..f030969 100644 --- a/STh.h +++ b/STh.h @@ -3,7 +3,6 @@ #pragma once #include "nesca_3.h" -#include "resource.h" #include "externFunctions.h" extern int tMax; diff --git a/connector.cpp b/connector.cpp index ede1506..77fd149 100644 --- a/connector.cpp +++ b/connector.cpp @@ -3,6 +3,7 @@ #include #include #include +#include "resource.h" #include "externFunctions.h" #include "externData.h" #pragma once @@ -1800,6 +1801,9 @@ lopaStr _WFBrut(char *cookie, char *ip, int port, char *methodVal, char *actionV strcat(request, " HTTP/1.1\r\n"); strcat(request, "Host: "); strcat(request, ip); + strcat(request, ":"); + char tbuff[16] = {0}; + strcat(request, itoa(port, tbuff, 10)); if(cookieLen != 0) { strcat(request, "\r\nCookie: "); @@ -1922,6 +1926,9 @@ lopaStr _WFBrut(char *cookie, char *ip, int port, char *methodVal, char *actionV strcat(request, " HTTP/1.1\r\n"); strcat(request, "Host: "); strcat(request, ip); + strcat(request, ":"); + char tbuff[16] = {0}; + strcat(request, itoa(port, tbuff, 10)); if(cookieLen != 0) { strcat(request, "\r\nCookie: "); @@ -2500,7 +2507,7 @@ QString strIP; QString strPort; const char *buff1 = "GET / HTTP/1.1\r\nHost: "; const char *buff2 = "\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: us-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\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\nConnection: close\r\n\r\n"; -int _SSHLobby(char *ip, int port, conSTR *CSTR) +int Connector::_SSHLobby(char *ip, int port, conSTR *CSTR) { char banner[256] = {0}; strncpy(banner, _get_ssh_banner(ip, port), 256); @@ -2527,6 +2534,8 @@ int Connector::_ConnectToPort(char *ip, const char *portC, char *hl) int strFlag = 0; strcpy(mes, buff1); strcat(mes, ip); + strcat(mes, ":"); + strcat(mes, portC); strcat(mes, buff2); int port = atoi(portC); int cRes; diff --git a/externFunctions.h b/externFunctions.h index d25f4bf..c6c7389 100644 --- a/externFunctions.h +++ b/externFunctions.h @@ -12,5 +12,4 @@ extern void _SaveBackupToFile(); extern char* __cdecl strstri(char *_Str, const char *_SubStr); extern char* _getAttribute(char *str, char *attrib); extern char *_findFirstOcc(char *str, char *delim); -extern int _SSHLobby(char *ip, int port, conSTR *CSTR); extern void nCleanup(); \ No newline at end of file diff --git a/finder.cpp b/finder.cpp index 4db0600..a63b1d3 100644 --- a/finder.cpp +++ b/finder.cpp @@ -1446,10 +1446,11 @@ int Lexems::_filler(int p, char* buffcpy, char* ip, int recd, Lexems *lx, char * if( strstr(buffcpy, "[IGNR_ADDR]") != NULL ) return -1; if( strstr(buffcpy, "SSH-2.0-OpenSSH") != NULL ) { + Connector con; conSTR CSTR; CSTR.lowerBuff = NULL; CSTR.size = 0; - int res = _SSHLobby(ip, p, &CSTR); + int res = con._SSHLobby(ip, p, &CSTR); if(res != -1 && res != -2) { _saveSSH(ip, p, recd, CSTR.lowerBuff); @@ -2017,6 +2018,9 @@ int redirectReconnect(char *cookie, char *ip, int port, char *str, Lexems *ls, P strcat(mes, tempPath); strcat(mes, rbuff2); strcat(mes, tempIP); + strcat(mes, ":"); + char tbuff[16] = {0}; + strcat(mes, itoa(tempPort, tbuff, 10)); if(strlen(cookie) != 0) { strcat(mes, rbuff3); diff --git a/msgcheckerthread.cpp b/msgcheckerthread.cpp index 7cdd98d..71fd329 100644 --- a/msgcheckerthread.cpp +++ b/msgcheckerthread.cpp @@ -1,5 +1,6 @@ #include "msgcheckerthread.h" #include "externData.h" +#include "resource.h" void MSGCheckerThread::doEmitionShowNewMsg(QString str) { diff --git a/msgcheckerthread.h b/msgcheckerthread.h index 4e9a1fd..bb098ba 100644 --- a/msgcheckerthread.h +++ b/msgcheckerthread.h @@ -3,7 +3,6 @@ #pragma once #include "nesca_3.h" -#include "resource.h" class MSGCheckerThread : public QThread { diff --git a/nesca_3.cpp b/nesca_3.cpp index f971418..22628bb 100644 --- a/nesca_3.cpp +++ b/nesca_3.cpp @@ -17,7 +17,6 @@ #include "DrawerTh_ME2Scanner.h" #include "DrawerTh_VoiceScanner.h" #include "piestat.h" -#include "resource.h" #include #include #include diff --git a/oIRC_Th.h b/oIRC_Th.h index 61ca37f..9304430 100644 --- a/oIRC_Th.h +++ b/oIRC_Th.h @@ -3,7 +3,6 @@ #pragma once #include "nesca_3.h" -#include "resource.h" #include "irc_nmblinker.h" #include "IRCPinger_Th.h" diff --git a/piestat.h b/piestat.h index 0a57c31..74e6724 100644 --- a/piestat.h +++ b/piestat.h @@ -3,7 +3,6 @@ #pragma once #include "nesca_3.h" -#include "resource.h" class PieStat : public QThread { diff --git a/progressbardrawer.h b/progressbardrawer.h index 1d39cba..48b5f3b 100644 --- a/progressbardrawer.h +++ b/progressbardrawer.h @@ -3,7 +3,6 @@ #pragma once #include "nesca_3.h" -#include "resource.h" class ProgressbarDrawer : public QThread { diff --git a/resource.h b/resource.h index 79bd565..14ccdd4 100644 --- a/resource.h +++ b/resource.h @@ -102,10 +102,10 @@ class Connector lopaStr _BALobby(char *cookie, char *ip, int port, char *path, char *method, char *data); 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, conSTR *CSTR); int _EstablishConnection(char *ip, int port, char *request, conSTR *cstr, int force = 0); int _EstablishSSLConnection(char *ip, int port, char *request, conSTR *cstr); - //void _StartRangeFapping(int ipsstart[], int ipsend[], int &cons, char *argv2, ST *st); void _Connect(void *s); int _ConnectToPort(char *ip, const char *port, char *hl); }; diff --git a/vercheckerthread.cpp b/vercheckerthread.cpp index dc4f593..db02f55 100644 --- a/vercheckerthread.cpp +++ b/vercheckerthread.cpp @@ -1,5 +1,6 @@ #include "vercheckerthread.h" #include "externData.h" +#include "resource.h" void _checkVer() { diff --git a/vercheckerthread.h b/vercheckerthread.h index 56bb21c..cdb8af5 100644 --- a/vercheckerthread.h +++ b/vercheckerthread.h @@ -3,7 +3,6 @@ #pragma once #include "STh.h" -#include "resource.h" class VerCheckerThread : public QThread {