From 179ee222650d2cda67ae91aee7640b52c64e619c Mon Sep 17 00:00:00 2001 From: Ming Rui Zhang Date: Tue, 13 Aug 2019 12:45:25 -0400 Subject: [PATCH] advancedSISettings: add SDP session negotiation sector to control SDP port range Change-Id: Iaa9c70e9d71aa6de2eb6fe849e5fac59db3fa8e1 --- advancedsipsettingwidget.cpp | 60 +++++++++ advancedsipsettingwidget.h | 6 + advancedsipsettingwidget.ui | 230 ++++++++++++++++++++++++++++++++++- 3 files changed, 294 insertions(+), 2 deletions(-) diff --git a/advancedsipsettingwidget.cpp b/advancedsipsettingwidget.cpp index 42d69e5..bdc1305 100644 --- a/advancedsipsettingwidget.cpp +++ b/advancedsipsettingwidget.cpp @@ -221,6 +221,18 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings() ui->btnRingtoneSIP->setEnabled(config.Ringtone.ringtoneEnabled); ui->btnRingtoneSIP->setText(QFileInfo(QString::fromStdString(config.Ringtone.ringtonePath)).fileName()); ui->lineEditSTUNAddressSIP->setEnabled(config.STUN.enable); + + // SDP session negotiation ports + ui->audioRTPMinPortSpinBox->setValue(config.Audio.audioPortMin); + ui->audioRTPMaxPortSpinBox->setValue(config.Audio.audioPortMax); + ui->videoRTPMinPortSpinBox->setValue(config.Video.videoPortMin); + ui->videoRTPMaxPortSpinBox->setValue(config.Video.videoPortMax); + + connect(ui->audioRTPMinPortSpinBox, &QSpinBox::editingFinished, this, &AdvancedSIPSettingsWidget::audioRTPMinPortSpinBoxEditFinished); + connect(ui->audioRTPMaxPortSpinBox, &QSpinBox::editingFinished, this, &AdvancedSIPSettingsWidget::audioRTPMaxPortSpinBoxEditFinished); + connect(ui->videoRTPMinPortSpinBox, &QSpinBox::editingFinished, this, &AdvancedSIPSettingsWidget::videoRTPMinPortSpinBoxEditFinished); + connect(ui->videoRTPMaxPortSpinBox, &QSpinBox::editingFinished, this, &AdvancedSIPSettingsWidget::videoRTPMaxPortSpinBoxEditFinished); + } // call settings @@ -617,3 +629,51 @@ AdvancedSIPSettingsWidget::customPortSIPSpinBoxValueChanged(const int& value) confProps.publishedPort = value; LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); } + +void +AdvancedSIPSettingsWidget::audioRTPMinPortSpinBoxEditFinished() +{ + auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); + if (confProps.Audio.audioPortMax < ui->audioRTPMinPortSpinBox->value()) { + ui->audioRTPMinPortSpinBox->setValue(confProps.Audio.audioPortMin); + return; + } + confProps.Audio.audioPortMin = ui->audioRTPMinPortSpinBox->value(); + LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); +} + +void +AdvancedSIPSettingsWidget::audioRTPMaxPortSpinBoxEditFinished() +{ + auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); + if (ui->audioRTPMaxPortSpinBox->value() < confProps.Audio.audioPortMin) { + ui->audioRTPMaxPortSpinBox->setValue(confProps.Audio.audioPortMax); + return; + } + confProps.Audio.audioPortMax = ui->audioRTPMaxPortSpinBox->value(); + LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); +} + +void +AdvancedSIPSettingsWidget::videoRTPMinPortSpinBoxEditFinished() +{ + auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); + if (confProps.Video.videoPortMax < ui->videoRTPMinPortSpinBox->value()) { + ui->videoRTPMinPortSpinBox->setValue(confProps.Video.videoPortMin); + return; + } + confProps.Video.videoPortMin = ui->videoRTPMinPortSpinBox->value(); + LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); +} + +void +AdvancedSIPSettingsWidget::videoRTPMaxPortSpinBoxEditFinished() +{ + auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); + if (ui->videoRTPMaxPortSpinBox->value() < confProps.Video.videoPortMin) { + ui->videoRTPMaxPortSpinBox->setValue(confProps.Video.videoPortMax); + return; + } + confProps.Video.videoPortMax = ui->videoRTPMaxPortSpinBox->value(); + LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); +} diff --git a/advancedsipsettingwidget.h b/advancedsipsettingwidget.h index 7d05704..1d8f5e3 100644 --- a/advancedsipsettingwidget.h +++ b/advancedsipsettingwidget.h @@ -105,4 +105,10 @@ private slots: void increaseVideoCodecPriority(); void setVideoState(int state); + + // SDP session negotiation ports + void audioRTPMinPortSpinBoxEditFinished(); + void audioRTPMaxPortSpinBoxEditFinished(); + void videoRTPMinPortSpinBoxEditFinished(); + void videoRTPMaxPortSpinBoxEditFinished(); }; diff --git a/advancedsipsettingwidget.ui b/advancedsipsettingwidget.ui index eb51766..db2c2eb 100644 --- a/advancedsipsettingwidget.ui +++ b/advancedsipsettingwidget.ui @@ -7,7 +7,7 @@ 0 0 731 - 1532 + 1775 @@ -1231,7 +1231,7 @@ - 65536 + 65535 @@ -1704,6 +1704,232 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + 0 + + + + + + 13 + + + + SDP Session Negotiation (ICE Fallback) + + + + + + + + 10 + + + + Only used during SDP negotiation in case ICE is not supported + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + + + + + 20 + + + 0 + + + + + 0 + + + + + + + + 10 + + + + Audio RTP Max Port + + + + + + + + + + + + 10 + + + + Video RTP Max Port + + + + + + + + + + 10 + + + + 65535 + + + + + + + + 300 + 0 + + + + + 10 + + + + 65535 + + + + + + + + 10 + + + + 65535 + + + + + + + + + + 10 + + + + Video RTP Min Port + + + + + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + + 10 + + + + Audio RTP Min Port + + + + + + + + + + 10 + + + + 65535 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 40 + 20 + + + + + + + + + + -- 2.22.0