From 2ccf5f88298db4907c4c773bc49bcb9fe4149506 Mon Sep 17 00:00:00 2001 From: ChronosX Date: Fri, 17 Aug 2018 14:50:53 +0300 Subject: [PATCH] Fixed segmentation fault and removed the check for *Insufficient buffer/memory size...*. Also removed everything related to personal keys. --- .gitignore | 3 +- CheckKey_Th.cpp | 4 +- Connector.cpp | 96 +------------------ Connector.h | 1 + MainStarter.cpp | 7 +- finder.cpp | 9 +- mainResources.h | 2 +- nesca.pro.user | 133 ++++++++++++++++++++------ nesca_3.cpp | 138 ++++++--------------------- nesca_3.ui | 246 ++++-------------------------------------------- 10 files changed, 169 insertions(+), 470 deletions(-) diff --git a/.gitignore b/.gitignore index 5cbe0b5..86721df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.pro.user *.swo *.swp debugData.txt @@ -41,4 +42,4 @@ moc_* *.user Makefile tmp/* -qrc_nesca_3.cpp \ No newline at end of file +qrc_nesca_3.cpp diff --git a/CheckKey_Th.cpp b/CheckKey_Th.cpp index d2a6df5..8bc6b48 100644 --- a/CheckKey_Th.cpp +++ b/CheckKey_Th.cpp @@ -59,7 +59,7 @@ int KeyCheckerMain() std::string buffer; Connector con; - con.nConnect((std::string(trcSrv) + std::string(trcScr)).c_str(), std::stoi(trcSrvPortLine), &buffer, NULL, &headerVector); + con.nConnect((std::string(trcSrv) + std::string(trcScr)).c_str(), std::atoi(trcSrvPortLine), &buffer, NULL, &headerVector); int hostStringIndex = buffer.find("\r\n\r\n"); if(hostStringIndex != -1) { @@ -69,7 +69,7 @@ int KeyCheckerMain() std::string url = buffer.substr(s, e - s); Connector con; con.nConnect((url + std::string("/api/checkaccount?key=") + std::string(trcPersKey)).c_str(), - std::stoi(trcSrvPortLine), &buffer, NULL, &headerVector); + std::atoi(trcSrvPortLine), &buffer, NULL, &headerVector); if(Utils::ustrstr(buffer, std::string("202 Accepted")) != -1) { stt->doEmitionGreenFoundData("Key is valid."); diff --git a/Connector.cpp b/Connector.cpp index 7f8e067..f7c65f6 100644 --- a/Connector.cpp +++ b/Connector.cpp @@ -1,91 +1,5 @@ #include "Connector.h" #include "SSHAuth.h" -// #include "Filter.h" // Pantene: Где файл? - -//#if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__) -//int _pingMyTarget(const char *ip) -//{ -// HANDLE hIcmpFile; -// unsigned long ipaddr = INADDR_NONE; -// DWORD dwRetVal = 0; -// char SendData[32] = "Data Buffer"; -// LPVOID ReplyBuffer = NULL; -// DWORD ReplySize = 0; -// -// ipaddr = inet_addr(ip); -// -// if (ipaddr == INADDR_NONE) -// { -// stt->doEmitionRedFoundData("[Pinger] INADDR_NONE! [" + QString(ip) + "]"); -// return 0; -// } -// -// hIcmpFile = IcmpCreateFile(); -// if (hIcmpFile == INVALID_HANDLE_VALUE) -// { -// stt->doEmitionRedFoundData("[Pinger] Unable to open handle. [" + QString::number(GetLastError()) + "]"); -// return 0; -// } -// -// ReplySize = sizeof(ICMP_ECHO_REPLY) + sizeof(SendData); -// ReplyBuffer = (VOID*) malloc(ReplySize); -// if (ReplyBuffer == NULL) -// { -// stt->doEmitionRedFoundData("[Pinger] Unable to allocate memory."); -// return 0; -// } -// -// dwRetVal = IcmpSendEcho(hIcmpFile, ipaddr, SendData, sizeof(SendData), -// NULL, ReplyBuffer, ReplySize, gPingTimeout*1000); -// if (dwRetVal != 0) { -// PICMP_ECHO_REPLY pEchoReply = (PICMP_ECHO_REPLY)ReplyBuffer; -// struct in_addr ReplyAddr; -// ReplyAddr.S_un.S_addr = pEchoReply->Address; -// printf("\tSent icmp message to %s\n", "127.0.0.1"); -// if (dwRetVal > 1) -// { -// if(gDebugMode) stt->doEmitionYellowFoundData("[Pinger] Received " + QString::number(dwRetVal) + " icmp message responses."); -// } -// else -// { -// if(gDebugMode) stt->doEmitionYellowFoundData("[Pinger] Received " + QString::number(dwRetVal) + " icmp message responses."); -// } -// -// if(gDebugMode) stt->doEmitionYellowFoundData("[Pinger] Received from: " + QString(inet_ntoa( ReplyAddr )) + "; Status = " + QString::number(pEchoReply->Status) + "; Roundtrip time = " + QString::number(pEchoReply->RoundTripTime) + "ms."); -// return 1; -// } -// else -// { -// printf("\tCall to IcmpSendEcho failed.\n"); -// printf("\tIcmpSendEcho returned error: %ld\n", GetLastError() ); -// if(gDebugMode) stt->doEmitionRedFoundData("[Pinger] Call to IcmpSendEcho failed. IcmpSendEcho returned error: " + QString::number(GetLastError())); -// return 0; -// }; -//} -//#else -//int _pingMyTarget(const char *ip) -//{ -// FILE *pipe = popen(("ping -w " + std::to_string(gPingTimeout) + " " + ip).c_str(), "r"); -// if(!pipe) { -// stt->doEmitionRedFoundData("Ping pipe failed: cannot open pipe."); -// perror("pipe"); -// return 0; -// } -// -// char buffer[128] = {0}; -// std::string result; -// -// while(!feof(pipe)) { -// if(fgets(buffer, 128, pipe) != NULL){ -// result += buffer; -// } -// } -// pclose(pipe); -// -// if(strstr((char*)result.c_str(), "100% packet loss") != NULL) return 0; -// return 1; -//} -//#endif struct data { char trace_ascii; /* 1 or 0 */ @@ -146,7 +60,7 @@ int pConnect(const char* ip, const int port, std::string *buffer, { buffer->clear(); int res = 0; - CURL *curl = curl_easy_init(); + CURL *curl = curl_easy_init(); if (curl != NULL) { @@ -231,10 +145,10 @@ int pConnect(const char* ip, const int port, std::string *buffer, SOCKET eNobuffSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); shutdown(eNobuffSocket, SD_BOTH); closesocket(eNobuffSocket); - if (ENOBUFS == eNobuffSocket || ENOMEM == eNobuffSocket) { + /*if (ENOBUFS == eNobuffSocket || ENOMEM == eNobuffSocket) { stt->doEmitionRedFoundData("Insufficient buffer/memory space. Sleeping for 10 sec..."); Sleep(10000); - } + }*/ return -1; } else { @@ -519,10 +433,10 @@ bool portCheck(const char * sDVRIP, int wDVRPort) { SOCKET eNobuffSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); shutdown(eNobuffSocket, SD_BOTH); closesocket(eNobuffSocket); - if (ENOBUFS == eNobuffSocket || ENOMEM == eNobuffSocket) { + /*if (ENOBUFS == eNobuffSocket || ENOMEM == eNobuffSocket) { stt->doEmitionRedFoundData("Insufficient buffer/memory space. Sleeping for 10 sec..."); Sleep(10000); - } + }*/ } return false; } diff --git a/Connector.h b/Connector.h index 299371f..556d59b 100644 --- a/Connector.h +++ b/Connector.h @@ -43,4 +43,5 @@ public: int connectToPort(char *ip, int port); int checkIsDigestRTSP(const char *ip, std::string *buffer); }; + #endif // CONNECTOR_H diff --git a/MainStarter.cpp b/MainStarter.cpp index 3bc2f09..c50c22f 100644 --- a/MainStarter.cpp +++ b/MainStarter.cpp @@ -1000,10 +1000,9 @@ void MainStarter::startIPScan(){ unsigned long long curIP = i; while (curIP <= ip2) { - tAddr.s_addr = ntohl(curIP); + tAddr.s_addr = ntohl(curIP); ipVec.push_back(inet_ntoa(tAddr)); - - curIP += (long long)limit; + curIP += (long long)limit; } std::random_shuffle(ipVec.begin(), ipVec.end()); @@ -1504,4 +1503,4 @@ void MainStarter::start(const char* targets, const char* ports) { stt->doEmitionGreenFoundData("Done. Saved " + QString::number(saved) + " of " + QString::number(found) + " nodes."); stt->doEmitionKillSttThread(); -} \ No newline at end of file +} diff --git a/finder.cpp b/finder.cpp index edf63d8..906be31 100644 --- a/finder.cpp +++ b/finder.cpp @@ -113,7 +113,7 @@ char *_findLast(char *str, char *delim) return (char *)(str + savedPosition); } -char *getCodePage(const char *str) +char getCodePage(const char *str) { char cdpg[32] = {0}; char *ptr1 = strstri(str, "charset="); @@ -3566,8 +3566,11 @@ int Lexems::filler(char* ip, char *ipRaw, int port, std::string *buffcpy, int si const std::string &location = handleRedirects(buffcpy, ip, port); - char cp[32] = { 0 }; - strncpy(cp, getCodePage(buffcpy->c_str()), 32); + char cp[32] = { 0 }; + //int codePageSize = sizeof(getCodePage(buffcpy->c_str())); + char codePage = getCodePage(buffcpy->c_str()); + char *codePagePtr = &codePage; + strncpy(cp, codePagePtr, 32); int flag = contentFilter((const std::string *) buffcpy, port, (location.size() > 0 ? location.c_str() : ip), cp, size); if (flag != -1) { const std::string &header = getHeader((const std::string *) buffcpy, flag); diff --git a/mainResources.h b/mainResources.h index 1562b63..2fe63fd 100644 --- a/mainResources.h +++ b/mainResources.h @@ -1,6 +1,6 @@ #pragma once #include "base64.h" -#include +#include "libssh/libssh.h" #include #include #if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__) diff --git a/nesca.pro.user b/nesca.pro.user index 97ae6e7..1bd050e 100644 --- a/nesca.pro.user +++ b/nesca.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {09239471-2602-4d8c-98f8-d340993c53e4} + {aee19962-08ac-4166-8673-b467f0f0742d} ProjectExplorer.Project.ActiveTarget @@ -40,6 +40,7 @@ true false 0 + true true 0 8 @@ -53,33 +54,37 @@ ProjectExplorer.Project.PluginSettings - + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.3 GCC 64bit - Desktop Qt 5.3 GCC 64bit - qt.53.gcc_64_kit + Desktop Qt 5.10.1 GCC 64bit + Desktop Qt 5.10.1 GCC 64bit + qt.qt5.5101.gcc_64_kit 0 0 0 - /home/kvs/Documents/CProjects/build-nesca-Desktop_Qt_5_3_GCC_64bit-Debug + /home/chronosx/Documents/Development/Nesca-build true qmake QtProjectManager.QMakeBuildStep - false - true + true false + false + false true - Make + Сборка Qt4ProjectManager.MakeStep @@ -91,14 +96,14 @@ 2 - Build + Сборка ProjectExplorer.BuildSteps.Build true - Make + Сборка Qt4ProjectManager.MakeStep @@ -110,21 +115,21 @@ 1 - Clean + Очистка ProjectExplorer.BuildSteps.Clean 2 false - Debug - + Отладка + Отладка Qt4ProjectManager.Qt4BuildConfiguration 2 true - /home/kvs/Documents/CProjects/build-nesca-Desktop_Qt_5_3_GCC_64bit-Release + /home/chronosx/Documents/Development/build-nesca-Desktop_Qt_5_10_1_GCC_64bit-Release true @@ -132,13 +137,14 @@ QtProjectManager.QMakeBuildStep false - true false + false + false true - Make + Сборка Qt4ProjectManager.MakeStep @@ -150,14 +156,14 @@ 2 - Build + Сборка ProjectExplorer.BuildSteps.Build true - Make + Сборка Qt4ProjectManager.MakeStep @@ -169,35 +175,100 @@ 1 - Clean + Очистка ProjectExplorer.BuildSteps.Clean 2 false - Release - + Выпуск + Выпуск Qt4ProjectManager.Qt4BuildConfiguration 0 true - 2 + + /home/chronosx/Documents/Development/build-nesca-Desktop_Qt_5_10_1_GCC_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Сборка + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Сборка + + ProjectExplorer.BuildSteps.Build + + + + true + Сборка + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Очистка + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Профилирование + Профилирование + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 0 - Deploy + Установка ProjectExplorer.BuildSteps.Deploy 1 - Deploy locally + Конфигурация установки ProjectExplorer.DefaultDeployConfiguration 1 + false + false + 1000 + + true false false @@ -236,12 +307,12 @@ nesca - Qt4ProjectManager.Qt4RunConfiguration:/home/kvs/Documents/CProjects/nesca/nesca.pro + Qt4ProjectManager.Qt4RunConfiguration:/home/chronosx/Documents/Development/nesca/nesca.pro + true nesca.pro - false - false + /home/chronosx/Documents/Development/Nesca-build 3768 false true @@ -258,10 +329,10 @@ ProjectExplorer.Project.Updater.FileVersion - 16 + 18 Version - 16 + 18 diff --git a/nesca_3.cpp b/nesca_3.cpp index 2d24b75..790f130 100644 --- a/nesca_3.cpp +++ b/nesca_3.cpp @@ -158,77 +158,11 @@ int PekoWidget::m_yPos = 0; int PekoWidget::m_windowCounter = 0; int PekoWidget::offset = 0; -// -//int psh_lul(PIP_ADAPTER_INFO zzaza) -//{ -// int chc = 0; -// for (int i = 0; i < zzaza->AddressLength; i++) chc += (zzaza->Address[i] << ((i & 1) * 8)); -// return chc; -//} -//void hshjNune(int& mac1, int& mac2) -//{ -// IP_ADAPTER_INFO idrigenopho[32]; -// DWORD dwBufLen = sizeof(idrigenopho); -// DWORD dwStatus = GetAdaptersInfo(idrigenopho, &dwBufLen); -// if (dwStatus != ERROR_SUCCESS) return; -// PIP_ADAPTER_INFO pidrigenopho = idrigenopho; -// mac1 = psh_lul(pidrigenopho); -// if (pidrigenopho->Next) mac2 = psh_lul(pidrigenopho->Next); -//} -//int hsh_hsh() -//{ -// DWORD psm = 0; -// GetVolumeInformation("C:\\", NULL, 0, &psm, NULL, NULL, NULL, 0); -// int ypyp = (int)((psm + (psm >> 16)) & 0xFFFF); -// return ypyp; -//} -//const char* fds_gds() -//{ -// static char computerName[1024]; -// DWORD size = 1024; -// GetComputerName(computerName, &size); -// static char cn[1024]; -// for (int i = 0, j = 0; i < 512; i += 2, ++j) memset(cn + j, computerName[i], 1); -// return cn; -//} -//std::string grgNun() { -// DWORD Type; -// char value[64] = { 0 }; -// HKEY hkey; -// if (RegOpenKey(HKEY_LOCAL_MACHINE, -// TEXT("Software\\ISKOPASI\\nesca3\\jipjip"), &hkey) == ERROR_SUCCESS) -// { -// DWORD value_length = 256; -// RegQueryValueEx(hkey, "nepnep", 0, &Type, (BYTE*)&value, &value_length); -// RegCloseKey(hkey); -// } -// -// std::string rNepnep = std::string(value); -// return rNepnep; -//} -//std::string ypypNunu() -//{ -// int fafa1, faf2; -// hshjNune(fafa1, faf2); -// int d2 = hsh_hsh(); -// char fds[1024] = { 0 }; -// strcpy(fds, fds_gds()); -// const std::string resNunu = std::to_string(fafa1) + "-" -// + std::to_string(d2) + "-" + std::string(fds) + "-" -// + std::string(trcPersKey); -// -// std::ostringstream strNunu; -// strNunu << std::setw(2) << std::setfill('0') << std::hex << std::uppercase; -// std::copy(resNunu.begin(), resNunu.end(), std::ostream_iterator(strNunu, "")); -// return strNunu.str(); -//} -// -// void _LoadPersInfoToLocalVars(int savedTabIndex) { //ZeroMemory(trcPersKey, sizeof(trcPersKey)); - trcPersKey[0] = 0; - strncpy(trcPersKey, ui->linePersKey->text().toLocal8Bit().data(), 32); - memset(trcPersKey + 32, '\0', 1); + //trcPersKey[0] = 0; + //strncpy(trcPersKey, ui->linePersKey->text().toLocal8Bit().data(), 32); + //memset(trcPersKey + 32, '\0', 1); currentIP[0] = 0; finalIP[0] = 0; gPorts[0] = 0; @@ -286,15 +220,15 @@ void _LoadPersInfoToLocalVars(int savedTabIndex) { gPorts[ui->importPortLine->text().length() + 2] = '\0'; }; - strcpy(trcSrv, ui->lineTrackerSrv->text().toLocal8Bit().data()); - strcpy(trcScr, ui->lineTrackerScr->text().toLocal8Bit().data()); - strncpy(trcPersKey, ui->linePersKey->text().toLocal8Bit().data(), 32); - memset(trcPersKey + 32, '\0', 1); - strcpy(trcSrvPortLine, ui->trcSrvPortLine->text().toLocal8Bit().data()); + /*strcpy(trcSrv, ui->lineTrackerSrv->text().toLocal8Bit().data()); + strcpy(trcScr, ui->lineTrackerScr->text().toLocal8Bit().data()); + strncpy(trcPersKey, ui->linePersKey->text().toLocal8Bit().data(), 32); + memset(trcPersKey + 32, '\0', 1); + strcpy(trcSrvPortLine, ui->trcSrvPortLine->text().toLocal8Bit().data()); strncpy(gProxyIP, ui->systemProxyIP->text().toLocal8Bit().data(), 64); gProxyIP[ui->systemProxyIP->text().size()] = '\0'; strncpy(gProxyPort, ui->systemProxyPort->text().toLocal8Bit().data(), 8); - gProxyPort[ui->systemProxyPort->text().size()] = '\0'; + gProxyPort[ui->systemProxyPort->text().size()] = '\0';*/ } Ui::nesca_3Class *ui = new Ui::nesca_3Class; @@ -440,7 +374,7 @@ void setSceneArea() void setButtonStyleArea() { - ui->checkKeyBut->setStyleSheet( + /*ui->checkKeyBut->setStyleSheet( " #checkKeyBut {" "background-color: qlineargradient(spread:none, x1:1, y1:0, x2:1, y2:1, stop:0.681818 rgba(0, 0, 0, 250), stop:1 rgba(255, 255, 255, 130));" "color: #00b304;" @@ -452,7 +386,7 @@ void setButtonStyleArea() "color: #1efd00;" "border: 0.5px solid qlineargradient(spread:reflect, x1:0.54, y1:0.488591, x2:0.54, y2:0, stop:0 rgba(255, 255, 255, 130), stop:1 rgba(0, 0, 0, 255));" "}" - ); + );*/ ui->importButton->setStyleSheet( " #importButton {" "background-color: qlineargradient(spread:none, x1:1, y1:0, x2:1, y2:1, stop:0.681818 rgba(0, 0, 0, 250), stop:1 rgba(255, 255, 255, 130));" @@ -656,11 +590,11 @@ void SetValidators() validator = new QRegExpValidator(QRegExp("(\\w|-|\\.)+((\\w|-|\\.)+)+"), NULL); ui->lineILVL->setValidator(validator); - validator = new QRegExpValidator(QRegExp("\\d{1,5}"), NULL); - ui->trcSrvPortLine->setValidator(validator); + //validator = new QRegExpValidator(QRegExp("\\d{1,5}"), NULL); + //ui->trcSrvPortLine->setValidator(validator); - validator = new QRegExpValidator(QRegExp("[a-zA-Z0-9]{32}"), NULL); - ui->linePersKey->setValidator(validator); + //validator = new QRegExpValidator(QRegExp("[a-zA-Z0-9]{32}"), NULL); + //ui->linePersKey->setValidator(validator); } void nesca_3::slotDrawTextPlacers() @@ -2233,7 +2167,6 @@ void nesca_3::ConnectEvrthng() connect ( ui->secretMessageBut_7, SIGNAL( clicked() ), this, SLOT( smReaction() ) ); connect ( ui->secretMessageBut_8, SIGNAL( clicked() ), this, SLOT( smReaction() ) ); connect ( ui->dataText, SIGNAL( anchorClicked(QUrl) ), this, SLOT( onLinkClicked(QUrl) ) ); - connect ( ui->checkKeyBut, SIGNAL( clicked() ), this, SLOT( CheckPersKey() ) ); connect ( ui->DataflowModeBut, SIGNAL( clicked() ), this, SLOT( slotShowDataflow() ) ); connect ( ui->JobModeBut, SIGNAL( clicked() ), this, SLOT( switchToJobMode() ) ); connect ( ui->clearLogBut, SIGNAL( clicked() ), this, SLOT( slotClearLogs() ) ); @@ -2261,7 +2194,7 @@ void nesca_3::ConnectEvrthng() connect ( ui->restoreDefaultPorts1, SIGNAL( clicked() ), this, SLOT( slotRestoreDefPorts() ) ); connect ( ui->restoreDefaultPorts2, SIGNAL( clicked() ), this, SLOT( slotRestoreDefPorts() ) ); connect ( ui->restoreDefaultPorts3, SIGNAL( clicked() ), this, SLOT( slotRestoreDefPorts() ) ); - connect ( ui->dnsLine, SIGNAL(textChanged(QString)), this, SLOT(DNSLine_ValueChanged(QString))); + connect ( ui->dnsLine, SIGNAL(textChanged(QString)), this, SLOT(DNSLine_ValueChanged(QString))); connect ( ui->ipLine, SIGNAL( returnPressed() ), this, SLOT( startScanButtonClicked() ) ); connect ( ui->threadLine, SIGNAL( returnPressed() ), this, SLOT( startScanButtonClicked() ) ); @@ -2464,9 +2397,9 @@ void RestoreSession() }; }; - setUIText("[NDBSERVER]:", ui->lineTrackerSrv, resStr); + /*setUIText("[NDBSERVER]:", ui->lineTrackerSrv, resStr); setUIText("[NDBSCRIPT]:", ui->lineTrackerScr, resStr); - setUIText("[NDBPORT]:", ui->trcSrvPortLine, resStr); + setUIText("[NDBPORT]:", ui->trcSrvPortLine, resStr);*/ if (strstr(resStr, "[PING]:") != NULL) { lex = strstr(resStr, "[PING]:") + strlen("[PING]:"); @@ -2503,20 +2436,20 @@ void RestoreSession() } } setUIText("[MAXBTHR]:", ui->maxBrutingThrBox, resStr); - setUIText("[PERSKEY]:", ui->linePersKey, resStr); + //setUIText("[PERSKEY]:", ui->linePersKey, resStr); //ZeroMemory(trcPersKey, sizeof(trcPersKey)); trcPersKey[0] = 0; strncpy(trcPersKey, resStr, 32); memset(trcPersKey + 32, '\0', 1); - setUIText("[SYSTEMPROXYIP]:", ui->systemProxyIP, resStr); - setUIText("[SYSTEMPROXYPORT]:", ui->systemProxyPort, resStr); + /*setUIText("[SYSTEMPROXYIP]:", ui->systemProxyIP, resStr); + setUIText("[SYSTEMPROXYPORT]:", ui->systemProxyPort, resStr);*/ resStr[0] = 0; //ZeroMemory(resStr, sizeof(resStr)); }; fclose(resFile); - _LoadPersInfoToLocalVars(nesca_3::savedTabIndex); + //_LoadPersInfoToLocalVars(nesca_3::savedTabIndex); stt->doEmitionGreenFoundData("Previous session loaded."); }; } @@ -2690,21 +2623,6 @@ void nesca_3::startScanButtonClicked() if(startFlag == false) { stt->doEmitionStartScanIP(); - /*if(trackerOK) - { - if(ui->linePersKey->text().size() != 0) - { - CheckPersKey(); - } - else - { - stt->doEmitionRedFoundData("Empty \"Personal key\" field. "); - }; - } - else - { - stt->doEmitionStartScanIP(); - };*/ } else { @@ -2882,7 +2800,7 @@ void nesca_3::IPScanSeq() ui->tabMainWidget->setTabEnabled(1, false); ui->tabMainWidget->setTabEnabled(2, false); - saveOptions(); + saveOptions(); stt->setMode(0); stt->setTarget((ui->ipLine->text().indexOf("-") > 0 ? ui->ipLine->text() : @@ -2929,7 +2847,7 @@ void nesca_3::DNSScanSeq() ui->lineILVL->setText(topLevelDomainStr); }; - saveOptions(); + //saveOptions(); stt->setMode(1); stt->setTarget(ui->dnsLine->text()); @@ -2974,7 +2892,7 @@ void nesca_3::ImportScanSeq() ui->tabMainWidget->setTabEnabled(0, false); ui->tabMainWidget->setTabEnabled(1, false); - _LoadPersInfoToLocalVars(savedTabIndex); + //_LoadPersInfoToLocalVars(savedTabIndex); stt->setMode(-1); stt->setTarget(fileName); @@ -3175,7 +3093,7 @@ void nesca_3::finishLoading() { //fuThread.detach(); _startVerCheck(); - _startMsgCheck(); + //_startMsgCheck(); qrp.setMinimal(true); drawVerboseArcs(0); @@ -3412,7 +3330,7 @@ nesca_3::nesca_3(bool isWM, QWidget *parent = 0) : QMainWindow(parent) ui->tabMainWidget->setTabEnabled(0, true); ui->tabMainWidget->setTabEnabled(1, true); ui->tabMainWidget->setTabEnabled(2, true); - finishLoading(); + finishLoading(); /* FILE* pipe = NULL; @@ -3444,7 +3362,7 @@ nesca_3::nesca_3(bool isWM, QWidget *parent = 0) : QMainWindow(parent) nesca_3::~nesca_3() { - delete[] ui; + delete ui; } void nesca_3::STTTerminate() diff --git a/nesca_3.ui b/nesca_3.ui index 85f8478..298c357 100644 --- a/nesca_3.ui +++ b/nesca_3.ui @@ -97,7 +97,7 @@ QTabWidget::Rounded - 3 + 0 Qt::ElideMiddle @@ -966,10 +966,13 @@ color: rgb(214, 214, 0); Options + + false + 30 - 120 + 60 281 17 @@ -989,161 +992,18 @@ color: rgb(214, 214, 0); Send results to public NescaDatabase + + true + false - - - - 250 - 2 - 121 - 16 - - - - - Small Fonts - 7 - - - - color: rgb(216, 216, 216);background-color: rgb(56, 56, 56);border:none; - - - /go/ - - - 256 - - - Qt::AlignCenter - - - Balancer script - - - - - - 30 - 2 - 211 - 16 - - - - - Small Fonts - 7 - - - - color: rgb(216, 216, 216);background-color: rgb(56, 56, 56);border:none; - - - balancer.d3w.org - - - 256 - - - Qt::AlignCenter - - - Balancer url - - - - - - 30 - 22 - 341 - 12 - - - - - Small Fonts - 7 - - - - color: rgb(216, 216, 216);background-color: rgb(56, 56, 56); border:none; - - - - - - 32 - - - Qt::AlignCenter - - - Your personal key here - - - - - - 379 - 2 - 62 - 16 - - - - - Small Fonts - 7 - - - - color: rgb(216, 216, 216);background-color: rgb(56, 56, 56);border:none; - - - 80 - - - 5 - - - Qt::AlignCenter - - - Balancer port here - - - - - - 379 - 18 - 61 - 16 - - - - - Eurostile - 8 - - - - - - - Check key - - 30 - 84 + 40 75 17 @@ -1176,8 +1036,8 @@ color: rgb(214, 214, 0); - 108 - 86 + 110 + 40 51 15 @@ -1207,8 +1067,8 @@ color: rgb(214, 214, 0); - 163 - 85 + 160 + 40 31 16 @@ -1233,7 +1093,7 @@ color: rgb(214, 214, 0); 390 - 69 + 30 51 20 @@ -1264,7 +1124,7 @@ color: rgb(214, 214, 0); 320 - 69 + 30 68 16 @@ -1286,7 +1146,7 @@ color: rgb(214, 214, 0); 320 - 84 + 50 62 26 @@ -1312,7 +1172,7 @@ color: rgb(214, 214, 0); 390 - 90 + 60 51 20 @@ -1343,7 +1203,7 @@ color: rgb(214, 214, 0); 30 - 68 + 20 161 17 @@ -1370,71 +1230,6 @@ color: rgb(214, 214, 0); true - - - - 30 - 38 - 341 - 12 - - - - - Small Fonts - 7 - - - - - - - color: rgb(216, 216, 216);background-color: rgb(56, 56, 56); border:none; - - - - - - 32 - - - Qt::AlignCenter - - - Proxy here - - - - - - 379 - 38 - 62 - 12 - - - - - Small Fonts - 7 - - - - color: rgb(216, 216, 216);background-color: rgb(56, 56, 56);border:none; - - - 3128 - - - 5 - - - Qt::AlignCenter - - - Balancer port here - - @@ -1743,7 +1538,7 @@ p, li { white-space: pre-wrap; } 10 210 480 - 16 + 20 @@ -3273,9 +3068,6 @@ p, li { white-space: pre-wrap; } lineILVL dnsPortLine lineEditThread - lineTrackerSrv - lineTrackerScr - linePersKey trackerOnOff tabMainWidget startScanButton_3