Verbose codepage fixed.

FileDownloader.cpp

@@ -36,7 +36,6 @@ void checkWeb(const char *fileName, std::string *oldLM) {
     if(lm.compare(*oldLM) != 0) {
         *oldLM = lm;
         std::string res(buffer.substr(buffer.find("\r\n\r\n") + 4).c_str());
-		//std::replace(res.begin(), res.end(), '\r', '\n');
 		res.erase(std::remove(res.begin(), res.end(), '\r'), res.end());
         std::ofstream out(fileName);
         out << std::string(res);

Threader.cpp

@@ -22,10 +22,13 @@ void Threader::fireThread(std::string ip, void *func(void)) {
 }
 
 void Threader::cleanUp() {
+	ready = true;
+	cv.notify_one();
 	std::unique_lock<std::mutex> lk(m);
 	lk.unlock();
 	lk.release();
     threadId = 0;
     std::queue<std::string> empty = {};
 	std::swap(ipQueue, empty);
+	ready = false;
 }

connector_old.cpp

@@ -1 +0,0 @@
-

main.cpp

@@ -7,7 +7,7 @@ int main(int argc, char *argv[])
 	QApplication a(argc, argv);
 
 	QStringList list;
-	list << "Eurostile.ttf";
+	list << "small_font.ttf";
 	int fontID(-1);
 	bool fontWarningShown(false);
 	for (QStringList::const_iterator constIterator = list.constBegin(); constIterator != list.constEnd(); ++constIterator) {

nesca_3.qrc

@@ -1,6 +1,6 @@
 <RCC>
   <qresource prefix="/nesca_3">
-    <file>Eurostile.ttf</file>
+    <file>small_font.ttf</file>
     <file>nesca.ico</file>
   </qresource>
 </RCC>

nesca_startModule.cpp

@@ -88,7 +88,8 @@ std::string toLowerStr(const char *str)
 		std::string tstr = std::string(strr);
 		delete[]strr;
 		return tstr;
-    } else return "";
+	}
+	else return "";
 }
 
 void SaveErrorLog(char *sender, char *MesSent, char *ReplRecv)
@@ -716,7 +717,7 @@ unsigned long int numOfIps(int ipsstart[], int ipsend[]) {
 	gTargets += 65536 * (ipsend[1] - ipsstart[1]);
 	gTargets += 256 * (ipsend[2] - ipsstart[2]);
 	gTargets += (ipsend[3] - ipsstart[3]);
-	gTargetsOverall = gTargets - 1;
+	gTargetsOverall = gTargets;
 
 	//unsigned long ip1 = (ipsstart[0] * 16777216) + (ipsstart[1] * 65536) + (ipsstart[2] * 256) + ipsstart[3];
 	//unsigned long ip2 = (ipsend[0] * 16777216) + (ipsend[1] * 65536) + (ipsend[2] * 256) + ipsend[3];
@@ -1725,7 +1726,7 @@ int _GetDNSFromMask(char *mask, char *saveMask, char *saveMaskEnder) {
 
 		++indexIP;
 		sprintf(currentIP, "%s%s", mask, gTLD);
-        verboseProgress(--gTargets);
+		verboseProgress(gTargets--);
 
 		Threader::fireThread(currentIP, (void*(*)(void))_connect);
 	};
@@ -1832,7 +1833,7 @@ int startScan(char* args) {
 								   strcpy(currentIP, ipVec[0].c_str());
 								   ipVec.erase(ipVec.begin());
 
-                                   verboseProgress(--gTargets);
+								   verboseProgress(gTargets--);
 
 								   Threader::fireThread(currentIP, (void*(*)(void))_connect);
 							   }
@@ -1853,7 +1854,7 @@ int startScan(char* args) {
 
 							tAddr.s_addr = ntohl(i);
 							strcpy(currentIP, inet_ntoa(tAddr));
-                            verboseProgress(--gTargets);
+							verboseProgress(gTargets--);
 
 							Threader::fireThread(currentIP, (void*(*)(void))_connect);
 						}
@@ -2035,7 +2036,7 @@ int startScan(char* args) {
 									   ++indexIP;
 									   strcpy(currentIP, ipVec[0].c_str());
 									   ipVec.erase(ipVec.begin());
-                                       verboseProgress(--gTargets);
+									   verboseProgress(gTargets--);
 
 									   Threader::fireThread(currentIP, (void*(*)(void))_connect);
 								   }
@@ -2055,7 +2056,7 @@ int startScan(char* args) {
 
 								tAddr.s_addr = ntohl(i);
 								strcpy(currentIP, inet_ntoa(tAddr));
-                                verboseProgress(--gTargets);
+								verboseProgress(gTargets--);
 								Threader::fireThread(currentIP, (void*(*)(void))_connect);
 							}
 							break;

version

@@ -1 +1 @@
-24B82-836
+24B82-89C