software/x-tools
1
0
Fork 0
mirror of https://github.com/x-tools-author/x-tools.git synced 2025-09-15 15:28:40 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

bug修复，包括添加数据转发实例时造成程序崩溃，及回传转发实例收到数据使能失效

Browse Source
This commit is contained in:
wuuhii 2019-09-15 02:37:59 +08:00
parent c4c2f03b6e
commit cf465bfa8c
4 changed files with 49 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Common/SAKDebugPage/Other/TransmissionSettings/TcpTransmissionItemWidget.cc
View File

@ -36,12 +36,14 @@ TcpTransmissionItemWidget::TcpTransmissionItemWidget(SAKDebugPage *debugPage, QW
void TcpTransmissionItemWidget::write(QByteArray data)
{
if (tcpSocket){
if (!tcpSocket->write(data)){
#ifdef QT_DEBUG
qDebug() << "发送取数据失败" << tcpSocket->errorString();
#endif
}
}
}
void TcpTransmissionItemWidget::on_enableCheckBox_clicked()
{

31
Src/Common/SAKDebugPage/Other/TransmissionSettings/UdpTransmissionItemWidget.cc
View File

@ -35,8 +35,17 @@ UdpTransmissionItemWidget::UdpTransmissionItemWidget(SAKDebugPage *debugPage, QW
SAKBase::instance()->initIpComboBox(addressComboBox);
}
UdpTransmissionItemWidget::~UdpTransmissionItemWidget()
{
delete ui;
if (udpSocket){
delete udpSocket;
}
}
void UdpTransmissionItemWidget::write(QByteArray data)
{
if (udpSocket){
QHostAddress targetAddress(targetAddressLineEdit->text());
quint16 targetPort = static_cast<quint16>(targetPortLineEdit->text().toInt());
if (!udpSocket->writeDatagram(data, targetAddress, targetPort)){
@ -45,18 +54,26 @@ void UdpTransmissionItemWidget::write(QByteArray data)
#endif
}
}
}
void UdpTransmissionItemWidget::on_enableCheckBox_clicked()
{
auto closeDev = [&](QUdpSocket *dev){
disconnect(dev, &QUdpSocket::readyRead, this, &UdpTransmissionItemWidget::read);
dev->deleteLater();
delete dev;
dev = nullptr;
this->setUiEnable(true);
};
auto bindDev = [&](QHostAddress address, quint16 port){
if (udpSocket->bind(address, port)){
auto bindDev = [&](QHostAddress address, quint16 port, bool customAddressAndPort){
bool bindResult = false;
if (customAddressAndPort){
bindResult = udpSocket->bind(address, port);
}else{
bindResult = udpSocket->bind();
}
if (bindResult){
if (udpSocket->open(QUdpSocket::ReadWrite)){
connect(udpSocket, &QUdpSocket::readyRead, this, &UdpTransmissionItemWidget::read);
this->setUiEnable(false);
@ -72,9 +89,9 @@ void UdpTransmissionItemWidget::on_enableCheckBox_clicked()
if (enableCheckBox->isChecked()){
udpSocket = new QUdpSocket;
if (customAddressCheckBox->isChecked()){
bindDev(QHostAddress(addressComboBox->currentText()), static_cast<quint16>(portLineEdit->text().toInt()));
bindDev(QHostAddress(addressComboBox->currentText()), static_cast<quint16>(portLineEdit->text().toInt()), true);
}else{
bindDev(QHostAddress::Any, 0);
bindDev(QHostAddress(addressComboBox->currentText()), static_cast<quint16>(portLineEdit->text().toInt()), false);
}
}else{
closeDev(udpSocket);
@ -83,6 +100,10 @@ void UdpTransmissionItemWidget::on_enableCheckBox_clicked()
void UdpTransmissionItemWidget::read()
{
if (!handleReceiveDataCheckBox->isChecked()){
return;
}
if (udpSocket){
while (udpSocket->hasPendingDatagrams()) {
QByteArray data;

1
Src/Common/SAKDebugPage/Other/TransmissionSettings/UdpTransmissionItemWidget.hh
View File

@ -33,6 +33,7 @@ class UdpTransmissionItemWidget:public BaseTransmissionItemWidget
Q_OBJECT
public:
UdpTransmissionItemWidget(SAKDebugPage *debugPage, QWidget *parent);
~UdpTransmissionItemWidget();
virtual void write(QByteArray data);
private:

18
Src/Common/SAKDebugPage/Other/TransmissionSettings/UdpTransmissionItemWidget.ui
View File

@ -15,7 +15,11 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="6">
<widget class="QLineEdit" name="targetPortLineEdit"/>
<widget class="QLineEdit" name="targetPortLineEdit">
<property name="text">
<string>55555</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QLabel" name="label">
@ -25,10 +29,18 @@
</widget>
</item>
<item row="0" column="6">
<widget class="QLineEdit" name="portLineEdit"/>
<widget class="QLineEdit" name="portLineEdit">
<property name="text">
<string>44444</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QLineEdit" name="targetAddressLineEdit"/>
<widget class="QLineEdit" name="targetAddressLineEdit">
<property name="text">
<string>127.0.0.1</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="customAddressCheckBox">