diff --git a/Connector.cpp b/Connector.cpp index 54a648d..63d2808 100644 --- a/Connector.cpp +++ b/Connector.cpp @@ -250,6 +250,7 @@ int Connector::nConnect(const char* ip, const int port, std::string *buffer, } if (MapWidgetOpened) stt->doEmitionAddIncData(QString(ip), QString(buffer->c_str())); + return sz; } else { stt->doEmitionRedFoundData("Curl error."); @@ -312,11 +313,11 @@ int Connector::connectToPort(char* ip, int port) } else if (size == -2) return -2; } else { - if (portCheck(tempIp, port)) { + if (portCheck(ip, port)) { ++Alive;//ME2 ++found;//PieStat Lexems lx; - lx.filler(tempIp, port, &buffer, size, &lx); + lx.filler(ip, port, &buffer, size, &lx); }; } return 0; diff --git a/MainStarter.cpp b/MainStarter.cpp index d328136..28afdf8 100644 --- a/MainStarter.cpp +++ b/MainStarter.cpp @@ -79,8 +79,8 @@ int MainStarter::fileLoader(const char *fileName) { ipsstartfl = new unsigned int*[importFileSize + 1]; ipsendfl = new unsigned int*[importFileSize + 1]; - ipsstartfl[0] = 0; - ipsendfl[0] = 0; + //ipsstartfl[0] = 0; + //ipsendfl[0] = 0; /*ZeroMemory(ipsstartfl, sizeof(ipsstartfl)); ZeroMemory(ipsendfl, sizeof(ipsendfl));*/ @@ -91,8 +91,8 @@ int MainStarter::fileLoader(const char *fileName) { //ZeroMemory(ipsstartfl[i], sizeof(ipsstartfl[i])); //ZeroMemory(ipsendfl[i], sizeof(ipsendfl[i])); - ipsstartfl[i] = 0; - ipsendfl[i] = 0; + //ipsstartfl[i] = 0; + //ipsendfl[i] = 0; }; std::vector shuffleArray; diff --git a/finder.cpp b/finder.cpp index dfc31e2..448c56c 100644 --- a/finder.cpp +++ b/finder.cpp @@ -2831,9 +2831,9 @@ void parseFlag(int flag, char* ip, int port, int size, const std::string &header lopaStr lps = hv.HVLobby(ip, port); if (strstr(lps.login, "UNKNOWN") == NULL && strlen(lps.other) == 0) { - _specFillerBA(ip, port, "[Hikvision] iVMS client required.", lps.login, lps.pass, 0); - fillGlobalLogData(ip, port, std::to_string(size).c_str(), "[Hikvision] iVMS client required ().", - lps.login, lps.pass, "[Hikvision] iVMS", "UTF-8", "Basic Authorization"); + _specFillerBA(ip, port, "[Hikvision IVMS].", lps.login, lps.pass, 0); + fillGlobalLogData(ip, port, std::to_string(size).c_str(), "[Hikvision IVMS] ().", + lps.login, lps.pass, "[Hikvision IVMS]", "UTF-8", "Basic Authorization"); while (hikkaStop) Sleep(10); hikkaStop = true; @@ -2865,9 +2865,9 @@ void parseFlag(int flag, char* ip, int port, int size, const std::string &header lopaStr lps = hv.RVILobby(ip, port); if (strstr(lps.login, "UNKNOWN") == NULL && strlen(lps.other) == 0) { - _specFillerBA(ip, port, "[RVI] RVI VSS client required.", lps.login, lps.pass, 0); - fillGlobalLogData(ip, port, std::to_string(size).c_str(), "[RVI] RVI VSS client required ().", - lps.login, lps.pass, "[RVI] RVI", "UTF-8", "Basic Authorization"); + _specFillerBA(ip, port, "[RVI].", lps.login, lps.pass, 0); + fillGlobalLogData(ip, port, std::to_string(size).c_str(), "[RVI] ().", + lps.login, lps.pass, "[RVI]", "UTF-8", "Basic Authorization"); while (rviStop) Sleep(10); rviStop = true;