From ce9994193ea2a4ff2b8db678b4cc80eb97fe4e30 Mon Sep 17 00:00:00 2001 From: cora32 Date: Fri, 27 Feb 2015 20:40:12 +0300 Subject: [PATCH] -- --- .gitignore | 30 ++++++++++++++++++++++++++++++ connector.cpp | 26 +++++++++++++------------- mainResources.h | 31 +++++++++++++++++-------------- nesca.ico | Bin 0 -> 1150 bytes nesca_3.pri | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ nesca_3.pro | 20 ++++++++++++++++++++ nesca_3.qrc | 7 ++++--- nesca_3.ui | 18 ++++++++++-------- oIRC_Th.cpp | 2 +- 9 files changed, 143 insertions(+), 39 deletions(-) create mode 100644 nesca.ico create mode 100644 nesca_3.pri create mode 100644 nesca_3.pro diff --git a/.gitignore b/.gitignore index 1651965..882c851 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,33 @@ *.swo *.swp debugData.txt +*.png +adns_dll.dll +changelog +*.obj +*.res +*.log +*.tlog +*.lastbuildstate +*.pdb +GeneratedFiles/* +imp.txt +imp2.txt +*.dll +logs/* +*.vcxproj.* +*.vcxproj +*.aps +*.svg +Release/* +Debug/* +restore +result_files/* +*.bmp +*.bk + + +tags.txt +version +lisca.cpp +main - копия.cpp diff --git a/connector.cpp b/connector.cpp index e43fbd5..6f3dd91 100644 --- a/connector.cpp +++ b/connector.cpp @@ -672,9 +672,9 @@ lopaStr _BABrute(char *cookie, char *ip, int port, char *pathT, char *method) if(cCode == SOCKET_ERROR) { int errorCode = WSAGetLastError(); - if(errorCode == ENOTSOCK) { + if(errorCode == WSAENOTSOCK) { - while(errorCode == ENOTSOCK) + while(errorCode == WSAENOTSOCK) { if(gDebugMode) stt->doEmitionDebugFoundData("[BA][ENOTSOCK] - [" + QString(ip) + ":" + QString::number(port) + "]"); CSSOCKET(sock); @@ -686,7 +686,7 @@ lopaStr _BABrute(char *cookie, char *ip, int port, char *pathT, char *method) CSSOCKET(sock); - if(errorCode != ETIMEDOUT) + if(errorCode != WSAETIMEDOUT) { stt->doEmitionRedFoundData("[BA] Cannot connect to " + QString(ip) + "[" + QString::number(errorCode) + "]"); }; @@ -918,7 +918,7 @@ lopaStr _FTPBrute(char *ip, int port, PathStr *ps) sockFTP = socket( AF_INET, SOCK_STREAM, IPPROTO_TCP ); connectionResult = connect(sockFTP, (sockaddr*)&sockAddr, sizeof(sockAddr)); - while(WSAGetLastError() == ENOTSOCK) + while(WSAGetLastError() == WSAENOTSOCK) { if(gDebugMode) stt->doEmitionDebugFoundData("[FTP][ENOTSOCK] [" + QString(ip) + ":" + QString::number(port) + "]"); CSSOCKET(sockFTP); @@ -1249,13 +1249,13 @@ lopaStr _FTPBrute(char *ip, int port, PathStr *ps) { int WSAerr; if(connectionResult == -1) WSAerr = WSAGetLastError(); - else WSAerr = ETIMEDOUT; + else WSAerr = WSAETIMEDOUT; if(gThreads > 1 - && WSAerr != ETIMEDOUT/*Timeout*/ - && WSAerr != ENOBUFS/*POOLOVERFLOW*/ - && WSAerr != ECONNREFUSED/*WSAECONNREFUSED*/ - && WSAerr != ECONNRESET/*WSAECONNRESET*/ + && WSAerr != WSAETIMEDOUT/*Timeout*/ + && WSAerr != WSAENOBUFS/*POOLOVERFLOW*/ + && WSAerr != WSAECONNREFUSED/*WSAECONNREFUSED*/ + && WSAerr != WSAECONNRESET/*WSAECONNRESET*/ && WSAerr != 0) { stt->doEmitionRedFoundData("[FTPBrute] Cannot connect to " + QString(ip) + " " + QString(std::to_string(WSAerr).c_str())); @@ -1524,7 +1524,7 @@ int Connector::_EstablishConnection(char *ip, int port, char *request, conSTR *C if(iResult == SOCKET_ERROR) { iError = WSAGetLastError(); - if(iError == EINPROGRESS) + if (iError == WSAEWOULDBLOCK) { fd_set read_fs; FD_ZERO(&read_fs); @@ -1635,11 +1635,11 @@ int Connector::_EstablishConnection(char *ip, int port, char *request, conSTR *C else { ++offlines; - if(iError == ENOBUFS) + if (iError == WSAENOBUFS) { stt->doEmitionRedFoundData("[ENOBUFS] Connection pool depleted " + QString(ip) + ":" + QString::number(port)); } - else if(iError == EADDRNOTAVAIL) + else if (iError == WSAEADDRNOTAVAIL) { stt->doEmitionRedFoundData("[EADDRNOTAVAIL] " + QString(ip) + ":" + QString::number(port) + @@ -2157,7 +2157,7 @@ int _webLoginSeq(char *request, char *login, char *pass, char *ip, int port, int int cCode = connect(sock, (sockaddr*)&sockAddr, sizeof(sockAddr)); int cErrCode = WSAGetLastError(); - while(cErrCode == ENOTSOCK) + while(cErrCode == WSAENOTSOCK) { CSSOCKET(sock); sock = socket( AF_INET, SOCK_STREAM, IPPROTO_TCP ); diff --git a/mainResources.h b/mainResources.h index fdcb7f1..a7cce76 100644 --- a/mainResources.h +++ b/mainResources.h @@ -55,26 +55,29 @@ typedef int BOOL; #ifndef SOCKET_ERROR #define SOCKET_ERROR (-1) #endif -#ifndef EINPROGRESS -#define EINPROGRESS WSAEINPROGRESS //10036 +#ifndef WSAEWOULDBLOCK +#define WSAEWOULDBLOCK EWOULDBLOCK //10035 #endif -#ifndef ENOTSOCK -#define ENOTSOCK WSAENOTSOCK //10038 +#ifndef WSAEINPROGRESS +#define WSAEINPROGRESS EINPROGRESS //10036 #endif -#ifndef EADDRNOTAVAIL -#define EADDRNOTAVAIL WSAEADDRNOTAVAIL //10049 +#ifndef WSAENOTSOCK +#define WSAENOTSOCK ENOTSOCK //10038 #endif -#ifndef ECONNRESET -#define ECONNRESET WSAECONNRESET //10054 +#ifndef WSAEADDRNOTAVAIL +#define WSAEADDRNOTAVAIL EADDRNOTAVAIL //10049 #endif -#ifndef ENOBUFS -#define ENOBUFS WSAENOBUFS //10055 +#ifndef WSAECONNRESET +#define WSAECONNRESET ECONNRESET //10054 #endif -#ifndef ETIMEDOUT -#define ETIMEDOUT WSAETIMEDOUT //10060 +#ifndef WSAENOBUFS +#define WSAENOBUFS ENOBUFS //10055 #endif -#ifndef ECONNREFUSED -#define ECONNREFUSED WSAECONNREFUSED //10061 +#ifndef WSAETIMEDOUT +#define WSAETIMEDOUT ETIMEDOUT //10060 +#endif +#ifndef WSAECONNREFUSED +#define WSAECONNREFUSED ECONNREFUSED //10061 #endif #endif diff --git a/nesca.ico b/nesca.ico new file mode 100644 index 0000000000000000000000000000000000000000..0bbfe73ef6fab06e84689c37b84ddd44c3b873fc GIT binary patch literal 1150 zcmb`DF%H5o3`Kth5(7&mBvu$X8pq&7oS{eI7;M2#@{3~}r30>9yWjsgQGrRGd4{~N zxbJ~8fSaU9q7+?9j?)p)97K|Nlmjeew(e=0gtJqU1WRC)vJuMAHcA`Z~y=R literal 0 HcmV?d00001 diff --git a/nesca_3.pri b/nesca_3.pri new file mode 100644 index 0000000..ae2c3d0 --- /dev/null +++ b/nesca_3.pri @@ -0,0 +1,48 @@ +# ---------------------------------------------------- +# This file is generated by the Qt Visual Studio Add-in. +# ------------------------------------------------------ + +# This is a reminder that you are using a generated .pro file. +# Remove it when you are finished editing this file. +message("You are running qmake on a generated .pro file. This may not work!") + + +HEADERS += ./base64.h \ + ./resource.h \ + ./nesca_3.h \ + ./ActivityDrawerTh_HorNet.h \ + ./STh.h \ + ./CheckKey_Th.h \ + ./DrawerTh_QoSScanner.h \ + ./CheckProxy_Th.h \ + ./DrawerTh_HorNet.h \ + ./DrawerTh_GridQoSScanner.h \ + ./DrawerTh_VoiceScanner.h \ + ./DrawerTh_ME2Scanner.h \ + ./darkmap.h \ + ./IRCPinger_Th.h \ + ./oIRC_Th.h \ + ./irc_nmblinker.h \ + ./msgpopup.h +SOURCES += ./ActivityDrawerTh_HorNet.cpp \ + ./base64.cpp \ + ./CheckKey_Th.cpp \ + ./CheckProxy_Th.cpp \ + ./connector.cpp \ + ./darkmap.cpp \ + ./DrawerTh_GridQoSScanner.cpp \ + ./DrawerTh_HorNet.cpp \ + ./DrawerTh_ME2Scanner.cpp \ + ./DrawerTh_QoSScanner.cpp \ + ./DrawerTh_VoiceScanner.cpp \ + ./finder.cpp \ + ./IRCPinger_Th.cpp \ + ./irc_nmblinker.cpp \ + ./main.cpp \ + ./msgpopup.cpp \ + ./nesca_3.cpp \ + ./nesca_startModule.cpp \ + ./oIRC_Th.cpp \ + ./STh.cpp +FORMS += ./nesca_3.ui +RESOURCES += nesca_3.qrc diff --git a/nesca_3.pro b/nesca_3.pro new file mode 100644 index 0000000..cc8aa1d --- /dev/null +++ b/nesca_3.pro @@ -0,0 +1,20 @@ +# ---------------------------------------------------- +# This file is generated by the Qt Visual Studio Add-in. +# ------------------------------------------------------ + +TEMPLATE = app +TARGET = nesca_3 +DESTDIR = ../Win32/Release +QT += core widgets gui qml +CONFIG += release +DEFINES += QT_DLL QT_WIDGETS_LIB QT_QML_LIB +INCLUDEPATH += ./GeneratedFiles \ + . \ + ../../../../../../../../Qt/Qt5.0.0/5.0.0/msvc2010/bin +DEPENDPATH += . +MOC_DIR += C:/Qt/Qt5.0.0/5.0.0/msvc2010/bin +OBJECTS_DIR += release +UI_DIR += ./GeneratedFiles +RCC_DIR += ./GeneratedFiles +include(nesca_3.pri) +win32:RC_FILE = nesca_3.rc diff --git a/nesca_3.qrc b/nesca_3.qrc index 3d860f6..b9ec00b 100644 --- a/nesca_3.qrc +++ b/nesca_3.qrc @@ -1,5 +1,6 @@ - - Eurostile.ttf - + + Eurostile.ttf + nesca.ico + diff --git a/nesca_3.ui b/nesca_3.ui index a30cf90..e764841 100644 --- a/nesca_3.ui +++ b/nesca_3.ui @@ -1678,7 +1678,7 @@ border-radius: 3px; <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Consolas'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Consolas'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p></body></html> @@ -2180,8 +2180,8 @@ p, li { white-space: pre-wrap; } - - :/nesca_3/Z:/nesca.ico:/nesca_3/Z:/nesca.ico + + :/nesca_3/nesca.ico:/nesca_3/nesca.ico @@ -2433,7 +2433,7 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Eurostile'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Eurostile'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> @@ -2930,7 +2930,7 @@ background-color: #000000; Eurostile - 9 + 8 @@ -3415,7 +3415,7 @@ background-color: #000000; <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Eurostile'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Eurostile'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> @@ -3551,7 +3551,7 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Eurostile'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Eurostile'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:2px; margin-bottom:2px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> @@ -4012,6 +4012,8 @@ color: rgb(71, 71, 71); exitButton dataText - + + + diff --git a/oIRC_Th.cpp b/oIRC_Th.cpp index 4a0ee84..ea1c411 100644 --- a/oIRC_Th.cpp +++ b/oIRC_Th.cpp @@ -114,7 +114,7 @@ void _blinkNLine(QString tempData = "", QString senderNick = "") int sendS(int lSock, char *msg, int len, int mode) { - if(lSock == ENOTSOCK || lSock <= 0 || !connectedToIRC) { + if(lSock == WSAENOTSOCK || lSock <= 0 || !connectedToIRC) { ircTh->doEmitChangeRedIRCData("Not connected."); return -1; }