From cd4ac3137235ce63084abdaacbaea7bef99b1267 Mon Sep 17 00:00:00 2001 From: feiyangqingyun Date: Sat, 18 May 2024 13:34:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tool/nettool/api/appdata.cpp | 41 ------------------------------ tool/nettool/api/appdata.h | 3 --- tool/nettool/api/qthelper.cpp | 2 +- tool/nettool/form/frmtcpclient.cpp | 2 +- tool/nettool/form/frmtcpserver.cpp | 2 +- tool/nettool/form/frmudpclient.cpp | 2 +- tool/nettool/form/frmudpserver.cpp | 2 +- tool/nettool/form/frmwebserver.cpp | 2 +- 8 files changed, 6 insertions(+), 50 deletions(-) diff --git a/tool/nettool/api/appdata.cpp b/tool/nettool/api/appdata.cpp index 5376711..2ee5d76 100644 --- a/tool/nettool/api/appdata.cpp +++ b/tool/nettool/api/appdata.cpp @@ -79,44 +79,3 @@ void AppData::saveData(const QString &data) file.close(); } } - -void AppData::loadIP(QComboBox *cbox) -{ - //获取本机所有IP - static QStringList ips; - if (ips.count() == 0) { -#ifdef Q_OS_WASM - ips << "127.0.0.1"; -#else - QList netInterfaces = QNetworkInterface::allInterfaces(); - foreach (const QNetworkInterface &netInterface, netInterfaces) { - //移除虚拟机和抓包工具的虚拟网卡 - QString humanReadableName = netInterface.humanReadableName().toLower(); - if (humanReadableName.startsWith("vmware network adapter") || humanReadableName.startsWith("npcap loopback adapter")) { - continue; - } - - //过滤当前网络接口 - bool flag = (netInterface.flags() == (QNetworkInterface::IsUp | QNetworkInterface::IsRunning | QNetworkInterface::CanBroadcast | QNetworkInterface::CanMulticast)); - if (flag) { - QList addrs = netInterface.addressEntries(); - foreach (QNetworkAddressEntry addr, addrs) { - //只取出IPV4的地址 - if (addr.ip().protocol() == QAbstractSocket::IPv4Protocol) { - QString ip4 = addr.ip().toString(); - if (ip4 != "127.0.0.1") { - ips << ip4; - } - } - } - } - } -#endif - } - - cbox->clear(); - cbox->addItems(ips); - if (!ips.contains("127.0.0.1")) { - cbox->addItem("127.0.0.1"); - } -} diff --git a/tool/nettool/api/appdata.h b/tool/nettool/api/appdata.h index 13091c7..5fbb2dc 100644 --- a/tool/nettool/api/appdata.h +++ b/tool/nettool/api/appdata.h @@ -22,9 +22,6 @@ public: //保存数据到文件 static void saveData(const QString &data); - - //添加网卡IP地址到下拉框 - static void loadIP(QComboBox *cbox); }; #endif // APPDATA_H diff --git a/tool/nettool/api/qthelper.cpp b/tool/nettool/api/qthelper.cpp index 4eadd4d..dcde629 100644 --- a/tool/nettool/api/qthelper.cpp +++ b/tool/nettool/api/qthelper.cpp @@ -266,7 +266,7 @@ void QtHelper::initLocalIPs(QComboBox *cbox, const QString &defaultIP, bool loca { QStringList ips; if (local127) { - ips << "127.0.0.1"; + ips << "0.0.0.0" << "127.0.0.1"; } //添加本地网卡地址集合 diff --git a/tool/nettool/form/frmtcpclient.cpp b/tool/nettool/form/frmtcpclient.cpp index 92f475f..d69a7b0 100644 --- a/tool/nettool/form/frmtcpclient.cpp +++ b/tool/nettool/form/frmtcpclient.cpp @@ -54,7 +54,7 @@ void frmTcpClient::initForm() //填充数据到下拉框 ui->cboxInterval->addItems(AppData::Intervals); ui->cboxData->addItems(AppData::Datas); - AppData::loadIP(ui->cboxBindIP); + QtHelper::initLocalIPs(ui->cboxBindIP, AppConfig::TcpBindIP); } void frmTcpClient::initConfig() diff --git a/tool/nettool/form/frmtcpserver.cpp b/tool/nettool/form/frmtcpserver.cpp index 79dc5a0..c9e404a 100644 --- a/tool/nettool/form/frmtcpserver.cpp +++ b/tool/nettool/form/frmtcpserver.cpp @@ -53,7 +53,7 @@ void frmTcpServer::initForm() //填充数据到下拉框 ui->cboxInterval->addItems(AppData::Intervals); ui->cboxData->addItems(AppData::Datas); - AppData::loadIP(ui->cboxListenIP); + QtHelper::initLocalIPs(ui->cboxListenIP, AppConfig::TcpListenIP); } void frmTcpServer::initConfig() diff --git a/tool/nettool/form/frmudpclient.cpp b/tool/nettool/form/frmudpclient.cpp index 89ba991..4487b87 100644 --- a/tool/nettool/form/frmudpclient.cpp +++ b/tool/nettool/form/frmudpclient.cpp @@ -50,7 +50,7 @@ void frmUdpClient::initForm() //填充数据到下拉框 ui->cboxInterval->addItems(AppData::Intervals); ui->cboxData->addItems(AppData::Datas); - AppData::loadIP(ui->cboxBindIP); + QtHelper::initLocalIPs(ui->cboxBindIP, AppConfig::UdpBindIP); } void frmUdpClient::initConfig() diff --git a/tool/nettool/form/frmudpserver.cpp b/tool/nettool/form/frmudpserver.cpp index cbecfc2..a4a820d 100644 --- a/tool/nettool/form/frmudpserver.cpp +++ b/tool/nettool/form/frmudpserver.cpp @@ -51,7 +51,7 @@ void frmUdpServer::initForm() //填充数据到下拉框 ui->cboxInterval->addItems(AppData::Intervals); ui->cboxData->addItems(AppData::Datas); - AppData::loadIP(ui->cboxListenIP); + QtHelper::initLocalIPs(ui->cboxListenIP, AppConfig::UdpListenIP); } void frmUdpServer::initConfig() diff --git a/tool/nettool/form/frmwebserver.cpp b/tool/nettool/form/frmwebserver.cpp index 433d183..43f2d6d 100644 --- a/tool/nettool/form/frmwebserver.cpp +++ b/tool/nettool/form/frmwebserver.cpp @@ -51,7 +51,7 @@ void frmWebServer::initForm() //填充数据到下拉框 ui->cboxInterval->addItems(AppData::Intervals); ui->cboxData->addItems(AppData::Datas); - AppData::loadIP(ui->cboxListenIP); + QtHelper::initLocalIPs(ui->cboxListenIP, AppConfig::WebListenIP); } void frmWebServer::initConfig()