diff --git a/ip_sacaner/.qmake.stash b/ip_sacaner/.qmake.stash deleted file mode 100644 index bd40df5..0000000 --- a/ip_sacaner/.qmake.stash +++ /dev/null @@ -1,20 +0,0 @@ -QMAKE_CXX.QT_COMPILER_STDCXX = 199711L -QMAKE_CXX.QMAKE_MSC_VER = 1930 -QMAKE_CXX.QMAKE_MSC_FULL_VER = 193030706 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_MSC_VER \ - QMAKE_MSC_FULL_VER -QMAKE_CXX.INCDIRS = \ - "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.30.30705\\ATLMFC\\include" \ - "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.30.30705\\include" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.19041.0\\ucrt" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.19041.0\\\\shared" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.19041.0\\\\um" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.19041.0\\\\winrt" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.19041.0\\\\cppwinrt" -QMAKE_CXX.LIBDIRS = \ - "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.30.30705\\ATLMFC\\lib\\x64" \ - "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.30.30705\\lib\\x64" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.19041.0\\ucrt\\x64" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\\\lib\\10.0.19041.0\\\\um\\x64" diff --git a/ip_sacaner/ip_sacaner.pro.user b/ip_sacaner/ip_sacaner.pro.user index ef283e5..3abe385 100644 --- a/ip_sacaner/ip_sacaner.pro.user +++ b/ip_sacaner/ip_sacaner.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -91,16 +91,16 @@ ProjectExplorer.Project.Target.0 Desktop - Desktop Qt 6.2.2 MSVC2019 64bit - Desktop Qt 6.2.2 MSVC2019 64bit - qt.qt6.622.win64_msvc2019_64_kit + Desktop Qt 6.2.2 MinGW 64-bit + Desktop Qt 6.2.2 MinGW 64-bit + qt.qt6.622.win64_mingw_kit 0 0 0 0 - C:\Users\wuwen\Desktop\tcp_ip_scan\build-ip_sacaner-Desktop_Qt_6_2_2_MSVC2019_64bit-Debug - C:/Users/wuwen/Desktop/tcp_ip_scan/build-ip_sacaner-Desktop_Qt_6_2_2_MSVC2019_64bit-Debug + C:\Users\wuwen\Desktop\tcp_ip_scan\build-ip_sacaner-Desktop_Qt_6_2_2_MinGW_64_bit-Debug + C:/Users/wuwen/Desktop/tcp_ip_scan/build-ip_sacaner-Desktop_Qt_6_2_2_MinGW_64_bit-Debug true @@ -138,8 +138,8 @@ 2 - C:\Users\wuwen\Desktop\tcp_ip_scan\build-ip_sacaner-Desktop_Qt_6_2_2_MSVC2019_64bit-Release - C:/Users/wuwen/Desktop/tcp_ip_scan/build-ip_sacaner-Desktop_Qt_6_2_2_MSVC2019_64bit-Release + C:\Users\wuwen\Desktop\tcp_ip_scan\build-ip_sacaner-Desktop_Qt_6_2_2_MinGW_64_bit-Release + C:/Users/wuwen/Desktop/tcp_ip_scan/build-ip_sacaner-Desktop_Qt_6_2_2_MinGW_64_bit-Release true @@ -179,8 +179,8 @@ 0 - C:\Users\wuwen\Desktop\tcp_ip_scan\build-ip_sacaner-Desktop_Qt_6_2_2_MSVC2019_64bit-Profile - C:/Users/wuwen/Desktop/tcp_ip_scan/build-ip_sacaner-Desktop_Qt_6_2_2_MSVC2019_64bit-Profile + C:\Users\wuwen\Desktop\tcp_ip_scan\build-ip_sacaner-Desktop_Qt_6_2_2_MinGW_64_bit-Profile + C:/Users/wuwen/Desktop/tcp_ip_scan/build-ip_sacaner-Desktop_Qt_6_2_2_MinGW_64_bit-Profile true diff --git a/ip_sacaner/scan_run.cpp b/ip_sacaner/scan_run.cpp index aa62879..57c7750 100644 --- a/ip_sacaner/scan_run.cpp +++ b/ip_sacaner/scan_run.cpp @@ -28,8 +28,8 @@ quint32 ipv4str_to_int(const QString& ipstr) void trytry::run() { - qDebug() << ipstr<<":"<< ipint; - *now_thread_num+=1; + //qDebug() << ipstr<<":"<< ipint; + QTcpSocket m_socket; m_socket.connectToHost(ipstr, ipint, QTcpSocket::ReadWrite); @@ -43,6 +43,10 @@ void trytry::run() } m_socket.disconnectFromHost(); m_socket.disconnect(); + + //msleep(timeout);//test + + *now_thread_num-=1; *nt_bar+=1; @@ -64,14 +68,20 @@ void dispatch::tray(const QString& ipstr, quint32 ipint) if (ipint != 0 && ipstr != "") { - //qDebug()<<"thread "< set_thread_num); + + //qDebug()<<"thread "< set_thread_num) + { + //qDebug()<<"while "<ipstr = ipstr; try_telnet->ipint = ipint; try_telnet->timeout = timeout; try_telnet->output_list = output_list; + + try_telnet->now_thread_num = &now_thread_num; try_telnet->t_bar=&t_bar; @@ -84,6 +94,7 @@ void dispatch::tray(const QString& ipstr, quint32 ipint) //try_telnet->moveToThread(main_thread); try_telnet->start(); + now_thread_num+=1; } } diff --git a/ip_sacaner/scan_run.h b/ip_sacaner/scan_run.h index e05c127..27f9145 100644 --- a/ip_sacaner/scan_run.h +++ b/ip_sacaner/scan_run.h @@ -20,7 +20,7 @@ public: quint16 timeout; QString ipstr; quint32 ipint; - quint16 *now_thread_num; + int *now_thread_num; QTextEdit* output_list; quint64 *t_bar; @@ -38,8 +38,8 @@ public: dispatch(); - quint16 set_thread_num; - quint16 now_thread_num; + int set_thread_num; + int now_thread_num; quint16 timeout; quint64 t_bar=0; quint64 nt_bar=0; diff --git a/ip_sacaner/widget.cpp b/ip_sacaner/widget.cpp index 878050c..8934db8 100644 --- a/ip_sacaner/widget.cpp +++ b/ip_sacaner/widget.cpp @@ -57,6 +57,12 @@ Widget::Widget(QWidget *parent) dispatch_thread->start(); connect(dispatch_thread, &dispatch::dispatch_finish, [=]() { + ui->IP_list->setReadOnly(false); + ui->port_list->setReadOnly(false); + ui->timeout->setReadOnly(false); + ui->threads->setReadOnly(false); + ui->stard_scan->setText("开始扫描"); + scan_flag=0; qDebug() << "dispatch_finish"; disconnect(dispatch_thread); //delete dispatch_thread; @@ -64,12 +70,7 @@ Widget::Widget(QWidget *parent) }else { //dispatch_thread->exit(); - ui->IP_list->setReadOnly(false); - ui->port_list->setReadOnly(false); - ui->timeout->setReadOnly(false); - ui->threads->setReadOnly(false); - ui->stard_scan->setText("开始扫描"); - scan_flag=0; + } });//'scan button pass'