Success build in Ubuntu 15.10 linux 4.2.0-42-generic x86_64

pantyusha · Apr 1, 2017 · fad2243 · fad2243
1 parent eab26e4
commit fad2243
Show file tree

Hide file tree

Showing 83 changed files with 111 additions and 3,331 deletions.
diff --git a/.VISHNYA-16.exe b/.VISHNYA-16.exe
diff --git a/.VISHNYA-32.exe b/.VISHNYA-32.exe
diff --git a/.VISHNYA-64.exe b/.VISHNYA-64.exe
diff --git a/.VISHNYA-86.exe b/.VISHNYA-86.exe
diff --git a/.VISHNYA.exe b/.VISHNYA.exe
diff --git a/.gitignore b/.gitignore
@@ -26,7 +26,6 @@ result_files/*
 *.bmp
 *.bk
 
-
 tags.txt
 lisca.cpp
 main - копия.cpp
@@ -41,3 +40,5 @@ moc_*
 *~
 *.user
 Makefile
+tmp/*
+qrc_nesca_3.cpp
diff --git a/ActivityDrawerTh_HorNet.h b/ActivityDrawerTh_HorNet.h
@@ -1,7 +1,7 @@
+#pragma once
 #ifndef ACTIVITYDRAWERTH_HORNET_H
 #define ACTIVITYDRAWERTH_HORNET_H
 
-#pragma once
 #include "STh.h"
 
 class ActivityDrawerTh_HorNet : public QThread

diff --git a/BasicAuth.h b/BasicAuth.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef BASICAUTH_H
 #define BASICAUTH_H
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Connector.cpp b/Connector.cpp
@@ -1,6 +1,6 @@
 #include "Connector.h"
 #include "SSHAuth.h"
-#include "Filter.h"
+// #include "Filter.h" // Pantene: Где файл?
 
 //#if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__)
 //int _pingMyTarget(const char *ip)

diff --git a/DrawerTh_GridQoSScanner.h b/DrawerTh_GridQoSScanner.h
@@ -1,7 +1,7 @@
+#pragma once
 #ifndef DRAWERTH_GRIDQOSSCANNER_H
 #define DRAWERTH_GRIDQOSSCANNER_H
 
-#pragma once
 #include "STh.h"
 
 class DrawerTh_GridQoSScanner : public QThread

diff --git a/DrawerTh_HorNet.cpp b/DrawerTh_HorNet.cpp
@@ -14,7 +14,7 @@ void DrawerTh_HorNet::run()
 	{
 		if(widgetIsHidden == false && tray->isVisible() == false)
 		{
-			++factor > 9 ? factor = 0 : NULL;
+			if (++factor > 9) factor = 0;
 			dtHN->doEmitionDrawGrid();
 
 			for(int i = 0; i < gHeight; i += 10) 

diff --git a/DrawerTh_ME2Scanner.cpp b/DrawerTh_ME2Scanner.cpp
@@ -2,6 +2,7 @@
 #include "STh.h"
 #include "externData.h"
 #include "WebformWorker.h"
+#include "MainStarter.h"
 
 QList<QGraphicsPathItem*> DrawerTh_ME2Scanner::itmList;
 QVector<QPointF> DrawerTh_ME2Scanner::polyVect;

diff --git a/DrawerTh_QoSScanner.h b/DrawerTh_QoSScanner.h
@@ -1,7 +1,7 @@
+#pragma once
 #ifndef DRAWERTH_QOSSCANNER_H
 #define DRAWERTH_QOSSCANNER_H
 
-#pragma once
 #include "nesca_3.h"
 
 class DrawerTh_QoSScanner : public QThread

diff --git a/DrawerTh_VoiceScanner.h b/DrawerTh_VoiceScanner.h
@@ -1,7 +1,7 @@
+#pragma once
 #ifndef DRAWERTH_VOICESCANNER_H
 #define DRAWERTH_VOICESCANNER_H
 
-#pragma once
 #include "nesca_3.h"
 
 class DrawerTh_VoiceScanner : public QThread

diff --git a/EICAR.COM b/EICAR.COM
diff --git a/FileDownloader.cpp b/FileDownloader.cpp
@@ -1,4 +1,5 @@
 #include "FileDownloader.h"
+#include "mainResources.h"
 #include "fstream"
 #include <algorithm>
 

diff --git a/FileUpdater.cpp b/FileUpdater.cpp
@@ -2,6 +2,7 @@
 #include "externFunctions.h"
 #include "STh.h"
 #include "mainResources.h"
+#include "MainStarter.h"
 
 char **loginLst, **passLst;
 char **wfLoginLst, **wfPassLst;

diff --git a/HikvisionLogin.cpp b/HikvisionLogin.cpp
@@ -55,13 +55,13 @@ int recvWT(
 	FD_SET(socket, &ReadSet);
 	Time.tv_sec = Timeout;
 	Time.tv_usec = 0;
-	*bTimedOut = FALSE;
+	*bTimedOut = false;
 	n = select(socket + 1, &ReadSet, NULL, NULL, &Time);
 	if (n > 0) { /* got some data */
 		return recv(socket, Buffer, Len, 0);
 	}
 	if (n == 0) { /* timeout */
-		*bTimedOut = TRUE;
+		*bTimedOut = true;
 	}
 	return(n); /* trouble */
 }

diff --git a/HikvisionLogin.h b/HikvisionLogin.h
@@ -25,4 +25,4 @@ private: lopaStr hikLogin(const char * sDVRIP, int wDVRPort);
 	lopaStr RVILobby(const char *ip, const int port);
 };
 
-#endif // UTILS_H
+#endif // HIKVISIONLOGIN_H
diff --git a/IPCAuth.cpp b/IPCAuth.cpp
@@ -220,8 +220,8 @@ lopaStr IPC::IPCBrute(const char *ip, int port, char *SPEC, const std::string *c
 			}
 			else if (strcmp(SPEC, "JUAN") == 0)
 			{
-				std::string &encodedLogin = urlEncode(std::string(login));
-				std::string &encodedPass = urlEncode(std::string(pass));
+				std::string encodedLogin = urlEncode(std::string(login));
+				std::string encodedPass = urlEncode(std::string(pass));
 				sprintf(request, "%s/cgi-bin/gw.cgi?xml=%%3Cjuan%%20ver=%%22%%22%%20squ=%%22%%22%%20dir=%%22%%22%%3E%%3Cenvload%%20type=%%220%%22%%20usr=%%22%s%%22%%20pwd=%%22%s%%22/%%3E%%3C/juan%%3E&_=1450923182693",
 					ip, encodedLogin.c_str(), encodedPass.c_str());
 			}

diff --git a/IPRandomizer.h b/IPRandomizer.h
@@ -1,5 +1,4 @@
 #pragma once
-
 #ifndef RAND_H
 #define RAND_H
 

diff --git a/MainStarter.cpp b/MainStarter.cpp
@@ -1,14 +1,4 @@
-#include "STh.h"
 #include "MainStarter.h"
-#include "Connector.h"
-#include "Utils.h"
-#include <qjsonobject.h>
-#include <qjsonvalue.h>
-#include <qjsonarray.h>
-#include <qjsondocument.h>
-#include "IPRandomizer.h"
-#include "HikvisionLogin.h"
-#include <ctime>
 
 int gTimeOut = 3;
 int gPingTimeout = 1;
@@ -50,7 +40,6 @@ char metaOffline[256]	= { 0 };
 
 bool saveBackup;
 
-
 void MainStarter::unBlockButtons(){
 	stt->doEmitionBlockButton(false);
 }

diff --git a/MainStarter.h b/MainStarter.h
@@ -1,11 +1,21 @@
 #ifndef MAINSTARTER_H
 #define MAINSTARTER_H
 
+#include <ctime>
 #include <string>
+#include <qjsonobject.h>
+#include <qjsonvalue.h>
+#include <qjsonarray.h>
+#include <qjsondocument.h>
 #include "externData.h"
 #include "mainResources.h"
+#include "STh.h"
 #include "Threader.h"
 #include "FileUpdater.h"
+#include "Connector.h"
+#include "Utils.h"
+#include "IPRandomizer.h"
+#include "HikvisionLogin.h"
 
 class MainStarter {
 private: char dnsTarget[256];