This commit is contained in:
cora32 2015-12-11 13:51:03 +03:00
parent ce0f411729
commit 90d94b8a3a
3 changed files with 13 additions and 12 deletions

View File

@ -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())); if (MapWidgetOpened) stt->doEmitionAddIncData(QString(ip), QString(buffer->c_str()));
return sz; return sz;
} else { } else {
stt->doEmitionRedFoundData("Curl error."); stt->doEmitionRedFoundData("Curl error.");
@ -312,11 +313,11 @@ int Connector::connectToPort(char* ip, int port)
} }
else if (size == -2) return -2; else if (size == -2) return -2;
} else { } else {
if (portCheck(tempIp, port)) { if (portCheck(ip, port)) {
++Alive;//ME2 ++Alive;//ME2
++found;//PieStat ++found;//PieStat
Lexems lx; Lexems lx;
lx.filler(tempIp, port, &buffer, size, &lx); lx.filler(ip, port, &buffer, size, &lx);
}; };
} }
return 0; return 0;

View File

@ -79,8 +79,8 @@ int MainStarter::fileLoader(const char *fileName) {
ipsstartfl = new unsigned int*[importFileSize + 1]; ipsstartfl = new unsigned int*[importFileSize + 1];
ipsendfl = new unsigned int*[importFileSize + 1]; ipsendfl = new unsigned int*[importFileSize + 1];
ipsstartfl[0] = 0; //ipsstartfl[0] = 0;
ipsendfl[0] = 0; //ipsendfl[0] = 0;
/*ZeroMemory(ipsstartfl, sizeof(ipsstartfl)); /*ZeroMemory(ipsstartfl, sizeof(ipsstartfl));
ZeroMemory(ipsendfl, sizeof(ipsendfl));*/ ZeroMemory(ipsendfl, sizeof(ipsendfl));*/
@ -91,8 +91,8 @@ int MainStarter::fileLoader(const char *fileName) {
//ZeroMemory(ipsstartfl[i], sizeof(ipsstartfl[i])); //ZeroMemory(ipsstartfl[i], sizeof(ipsstartfl[i]));
//ZeroMemory(ipsendfl[i], sizeof(ipsendfl[i])); //ZeroMemory(ipsendfl[i], sizeof(ipsendfl[i]));
ipsstartfl[i] = 0; //ipsstartfl[i] = 0;
ipsendfl[i] = 0; //ipsendfl[i] = 0;
}; };
std::vector<std::string> shuffleArray; std::vector<std::string> shuffleArray;

View File

@ -2831,9 +2831,9 @@ void parseFlag(int flag, char* ip, int port, int size, const std::string &header
lopaStr lps = hv.HVLobby(ip, port); lopaStr lps = hv.HVLobby(ip, port);
if (strstr(lps.login, "UNKNOWN") == NULL && strlen(lps.other) == 0) if (strstr(lps.login, "UNKNOWN") == NULL && strlen(lps.other) == 0)
{ {
_specFillerBA(ip, port, "[Hikvision] iVMS client required.", lps.login, lps.pass, 0); _specFillerBA(ip, port, "[Hikvision IVMS].", lps.login, lps.pass, 0);
fillGlobalLogData(ip, port, std::to_string(size).c_str(), "[Hikvision] iVMS client required ().", fillGlobalLogData(ip, port, std::to_string(size).c_str(), "[Hikvision IVMS] ().",
lps.login, lps.pass, "[Hikvision] iVMS", "UTF-8", "Basic Authorization"); lps.login, lps.pass, "[Hikvision IVMS]", "UTF-8", "Basic Authorization");
while (hikkaStop) Sleep(10); while (hikkaStop) Sleep(10);
hikkaStop = true; 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); lopaStr lps = hv.RVILobby(ip, port);
if (strstr(lps.login, "UNKNOWN") == NULL && strlen(lps.other) == 0) if (strstr(lps.login, "UNKNOWN") == NULL && strlen(lps.other) == 0)
{ {
_specFillerBA(ip, port, "[RVI] RVI VSS client required.", lps.login, lps.pass, 0); _specFillerBA(ip, port, "[RVI].", lps.login, lps.pass, 0);
fillGlobalLogData(ip, port, std::to_string(size).c_str(), "[RVI] RVI VSS client required ().", fillGlobalLogData(ip, port, std::to_string(size).c_str(), "[RVI] ().",
lps.login, lps.pass, "[RVI] RVI", "UTF-8", "Basic Authorization"); lps.login, lps.pass, "[RVI]", "UTF-8", "Basic Authorization");
while (rviStop) Sleep(10); while (rviStop) Sleep(10);
rviStop = true; rviStop = true;