From 8fe554db1942dbc1ce0a7e7d90b246752551705e Mon Sep 17 00:00:00 2001
From: fong <wuwenfengmi@outlook.com>
Date: Tue, 30 Jan 2024 19:19:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=A5=E6=9F=84=E4=B8=8D=E8=B6=B3=E7=9A=84bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: fong <wuwenfengmi@outlook.com>
---
 ip_sacaner/scan_run.cpp | 32 +++++++++++++++++++-------------
 ip_sacaner/widget.cpp   |  8 +++++++-
 ip_sacaner/widget.ui    | 30 +++++++++++++++---------------
 3 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/ip_sacaner/scan_run.cpp b/ip_sacaner/scan_run.cpp
index 695dd98..b0e0949 100644
--- a/ip_sacaner/scan_run.cpp
+++ b/ip_sacaner/scan_run.cpp
@@ -39,17 +39,23 @@ void trytry::run()
     emit try_one(1);
     QString temp = QString("%1:%2").arg(ipstr).arg(ipint);
 
-    QTcpSocket m_socket;
-    m_socket.connectToHost(ipstr, ipint, QTcpSocket::ReadWrite);
-    if (m_socket.waitForConnected(timeout))
-    {
-        emit connect_ok(temp);
-    }
-    m_socket.disconnectFromHost();
-    m_socket.disconnect();
-    m_socket.deleteLater();
 
-    qDebug()<<temp;
+    QTcpSocket *m_socket=new QTcpSocket;
+
+    connect(m_socket,&QTcpSocket::disconnected,[=]{
+        qDebug()<<temp<<"Disconnected";
+        //m_socket->disconnect();
+        m_socket->deleteLater();
+        delete m_socket;
+    });
+    connect(m_socket,&QTcpSocket::connected,[=]{
+        emit connect_ok(temp);
+        qDebug()<<temp;
+    });
+
+    m_socket->connectToHost(ipstr, ipint, QTcpSocket::ReadWrite);
+    m_socket->waitForConnected(timeout);
+    m_socket->disconnectFromHost();
 
     emit try_one(-1);
 
@@ -211,7 +217,7 @@ void dispatch::run()
 
             //qDebug() <<str_ips_list.at(ii)<<":"<< ports_list.at(iii);
 
-            qDebug()<<"now:"<<this->now_thread_num<<" - set:"<<this->set_thread_num;
+            //qDebug()<<"now:"<<this->now_thread_num<<" - set:"<<this->set_thread_num;
 
 
             connecttry=new trytry;
@@ -222,13 +228,13 @@ void dispatch::run()
 
             connect(connecttry,&trytry::try_one,this,&dispatch::f_one);
             connect(connecttry,&trytry::connect_ok,[=](QString temp){emit connect_ok(temp);});
-
+/*
             connect(connecttry,&trytry::finished,[=]{
                 connecttry->disconnect();
                 connecttry->quit();
                 connecttry->wait();
             });
-
+*/
             connecttry->start();
 
             jindu=(quint16)(((qfloat16)(now_scan)/(qfloat16)(scantimes))*100);
diff --git a/ip_sacaner/widget.cpp b/ip_sacaner/widget.cpp
index 0e72fe1..5ea110a 100644
--- a/ip_sacaner/widget.cpp
+++ b/ip_sacaner/widget.cpp
@@ -58,7 +58,7 @@ Widget::Widget(QWidget *parent)
         ui->threads->setReadOnly(false);
         ui->stard_scan->setText("start scan");
 
-        dispatch_thread->disconnect();
+        //dispatch_thread->disconnect();
         dispatch_thread->quit();
         dispatch_thread->wait();
         //delete dispatch_thread;
@@ -320,6 +320,12 @@ Widget::Widget(QWidget *parent)
 
      });
 
+    connect(ui->clearoutput, &QPushButton::pressed, [=]()
+    {
+
+        ui->outputlist->clear();
+
+     });
 }
 
 Widget::~Widget()
diff --git a/ip_sacaner/widget.ui b/ip_sacaner/widget.ui
index 20c4865..0f4248c 100644
--- a/ip_sacaner/widget.ui
+++ b/ip_sacaner/widget.ui
@@ -97,25 +97,12 @@
     <string>线程</string>
    </property>
   </widget>
-  <widget class="QLabel" name="label_5">
+  <widget class="QPushButton" name="pushButton">
    <property name="geometry">
     <rect>
      <x>10</x>
      <y>240</y>
-     <width>53</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>扫描结果</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="pushButton">
-   <property name="geometry">
-    <rect>
-     <x>60</x>
-     <y>240</y>
-     <width>91</width>
+     <width>81</width>
      <height>24</height>
     </rect>
    </property>
@@ -776,6 +763,19 @@ domain.com</string>
     <string>;</string>
    </property>
   </widget>
+  <widget class="QPushButton" name="clearoutput">
+   <property name="geometry">
+    <rect>
+     <x>90</x>
+     <y>240</y>
+     <width>71</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>clear output</string>
+   </property>
+  </widget>
  </widget>
  <resources/>
  <connections/>