From 8eae8f17af2cdebfca07f75fa03a2e5b1b537a3e Mon Sep 17 00:00:00 2001
From: kevin <kevin@lmve.net>
Date: Wed, 5 Jan 2022 20:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B3=E5=B0=86GBK=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E6=94=B9=E6=88=90UTF8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ip_sacaner/ip_sacaner.pro.user        |  2 +-
 ip_sacaner/ip_sacaner.vcxproj         |  2 +-
 ip_sacaner/ip_sacaner.vcxproj.filters |  8 +++---
 ip_sacaner/scan_run.cpp               | 36 +++++++++++++--------------
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/ip_sacaner/ip_sacaner.pro.user b/ip_sacaner/ip_sacaner.pro.user
index 2cdc3c4..26ae179 100644
--- a/ip_sacaner/ip_sacaner.pro.user
+++ b/ip_sacaner/ip_sacaner.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 6.0.1, 2022-01-05T20:33:03. -->
+<!-- Written by QtCreator 6.0.1, 2022-01-05T20:39:42. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/ip_sacaner/ip_sacaner.vcxproj b/ip_sacaner/ip_sacaner.vcxproj
index f5b2384..3e6f7af 100644
--- a/ip_sacaner/ip_sacaner.vcxproj
+++ b/ip_sacaner/ip_sacaner.vcxproj
@@ -14,7 +14,7 @@
     <ProjectGuid>{E4D3F595-9CE6-39DE-ADBA-848B14D35E3F}</ProjectGuid>
     <RootNamespace>ip_sacaner</RootNamespace>
     <Keyword>QtVS_v304</Keyword>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
     <QtMsBuild Condition="'$(QtMsBuild)'=='' or !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
   </PropertyGroup>
diff --git a/ip_sacaner/ip_sacaner.vcxproj.filters b/ip_sacaner/ip_sacaner.vcxproj.filters
index cfc0597..a29f606 100644
--- a/ip_sacaner/ip_sacaner.vcxproj.filters
+++ b/ip_sacaner/ip_sacaner.vcxproj.filters
@@ -51,6 +51,9 @@
     <QtMoc Include="widget.h">
       <Filter>Header Files</Filter>
     </QtMoc>
+    <QtMoc Include="scan_run.h">
+      <Filter>Generated Files</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="debug\moc_predefs.h.cbt">
@@ -65,9 +68,4 @@
       <Filter>Form Files</Filter>
     </QtUic>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="scan_run.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ip_sacaner/scan_run.cpp b/ip_sacaner/scan_run.cpp
index fe1d62b..aa62879 100644
--- a/ip_sacaner/scan_run.cpp
+++ b/ip_sacaner/scan_run.cpp
@@ -96,13 +96,13 @@ void dispatch::run()
 
     //QTcpSocket* m_socket = new QTcpSocket;
 
-    QStringList str_ip_list = ip_list->toPlainText().split("\n");     //先以行分割
-    QStringList str_ips_list;                                              //再以段分割
+    QStringList str_ip_list = ip_list->toPlainText().split("\n");
+    QStringList str_ips_list;
 
     QStringList str_port_list = port_list->toPlainText().split("\n");
     QStringList str_ports_list;
 
-    //扫描之前先计算一共需要扫描的ip数量
+
 
     quint32 ips_num=0;
     quint32 ports_num=0;
@@ -112,28 +112,28 @@ void dispatch::run()
         str_ips_list = str_ip_list.at(i).split("-");
         if (str_ips_list.size() > 1)
         {
-        //ip段模式
+
             ips_num=ipv4str_to_int(str_ips_list.at(str_ips_list.size() - 1))-ipv4str_to_int(str_ips_list.at(0))+1;
         }else
         {
-            //单ip或域名模式
+
             ips_num+=1;
 
         }
      }
 
 
-    for (quint32 ii = 0; ii < str_port_list.size(); ii++)//分离端口
+    for (quint32 ii = 0; ii < str_port_list.size(); ii++)
     {
         str_ports_list = str_port_list.at(ii).split("-");
         if (str_ports_list.size() > 1)
         {
-            //端口段模式
+
             ports_num=str_ports_list.at(str_ports_list.size() - 1).toInt() -str_ports_list.at(0).toInt()+1;
         }
         else
         {
-            //单端口模式
+
             ports_num+=1;
         }
     }
@@ -151,16 +151,16 @@ void dispatch::run()
         str_ips_list = str_ip_list.at(i).split("-");
         if (str_ips_list.size() > 1)
         {
-            //ip段模式
-            for (quint32 ips = ipv4str_to_int(str_ips_list.at(0)); ips < ipv4str_to_int(str_ips_list.at(str_ips_list.size() - 1)) + 1; ips++)//取出每一个ip
+
+            for (quint32 ips = ipv4str_to_int(str_ips_list.at(0)); ips < ipv4str_to_int(str_ips_list.at(str_ips_list.size() - 1)) + 1; ips++)
             {
                 //qDebug() << ipv4int_to_str(ips);
-                for (quint32 ii = 0; ii < str_port_list.size(); ii++)//分离端口
+                for (quint32 ii = 0; ii < str_port_list.size(); ii++)
                 {
                     str_ports_list = str_port_list.at(ii).split("-");
                     if (str_ports_list.size() > 1)
                     {
-                        //端口段模式
+
                         for (quint32 prots = str_ports_list.at(0).toInt(); prots < str_ports_list.at(str_ports_list.size() - 1).toInt() + 1; prots++)
                         {
                             dispatch::tray(ipv4int_to_str(ips), prots);
@@ -168,7 +168,7 @@ void dispatch::run()
                     }
                     else
                     {
-                        //单端口模式
+
                         dispatch::tray(ipv4int_to_str(ips), str_ports_list.at(0).toInt());
                     }
                 }
@@ -176,13 +176,13 @@ void dispatch::run()
         }
         else
         {
-            //单ip或域名模式
-            for (quint32 ii = 0; ii < str_port_list.size(); ii++)//分离端口
+
+            for (quint32 ii = 0; ii < str_port_list.size(); ii++)
             {
                 str_ports_list = str_port_list.at(ii).split("-");
                 if (str_ports_list.size() > 1)
                 {
-                    //端口段模式
+
                     for (quint32 prots = str_ports_list.at(0).toInt(); prots < str_ports_list.at(str_ports_list.size() - 1).toInt() + 1; prots++)
                     {
                         dispatch::tray(str_ips_list.at(0), prots);
@@ -190,7 +190,7 @@ void dispatch::run()
                 }
                 else
                 {
-                    //单端口模式
+
                     dispatch::tray(str_ips_list.at(0), str_ports_list.at(0).toInt());
 
                 }
@@ -207,7 +207,7 @@ void dispatch::run()
 
     }
 
-    sleep(1);//稍微等一下其他线程完成
+    sleep(1);
     emit dispatch_finish();
 }