diff --git a/libretroshare/src/pqi/pqissllistener.cc b/libretroshare/src/pqi/pqissllistener.cc index 189eb5dce..9fadc092d 100644 --- a/libretroshare/src/pqi/pqissllistener.cc +++ b/libretroshare/src/pqi/pqissllistener.cc @@ -214,7 +214,6 @@ int pqissllistenbase::setuplisten() if (!mPeerMgr->isHidden()) std::cerr << "Zeroed tmpaddr: " << sockaddr_storage_tostring(tmpaddr) << std::endl; #endif - exit(1); return -1; } else diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp index c80a56bbe..0aaac99cc 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.cpp +++ b/retroshare-gui/src/gui/settings/ServerPage.cpp @@ -70,19 +70,6 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags) ui.whiteListIpsTable->setColumnHidden(COLUMN_STATUS,true) ; ui.whiteListIpsTable->verticalHeader()->hide() ; - QObject::connect(ui.filteredIpsTable,SIGNAL(customContextMenuRequested(const QPoint&)),this,SLOT(ipFilterContextMenu(const QPoint&))) ; - QObject::connect(ui.whiteListIpsTable,SIGNAL(customContextMenuRequested(const QPoint&)),this,SLOT(ipWhiteListContextMenu(const QPoint&))) ; - QObject::connect(ui.denyAll_CB,SIGNAL(toggled(bool)),this,SLOT(toggleIpFiltering(bool))); - QObject::connect(ui.includeFromDHT_CB,SIGNAL(toggled(bool)),this,SLOT(toggleAutoIncludeDHT(bool))); - QObject::connect(ui.includeFromFriends_CB,SIGNAL(toggled(bool)),this,SLOT(toggleAutoIncludeFriends(bool))); - QObject::connect(ui.groupIPRanges_CB,SIGNAL(toggled(bool)),this,SLOT(toggleGroupIps(bool))); - QObject::connect(ui.groupIPRanges_SB,SIGNAL(valueChanged(int)),this,SLOT(setGroupIpLimit(int))); - QObject::connect(ui.ipInputAddBlackList_PB,SIGNAL(clicked()),this,SLOT(addIpRangeToBlackList())); - QObject::connect(ui.ipInputAddWhiteList_PB,SIGNAL(clicked()),this,SLOT(addIpRangeToWhiteList())); - QObject::connect(ui.ipInput_LE,SIGNAL(textChanged(const QString&)),this,SLOT(checkIpRange(const QString&))); - QObject::connect(ui.filteredIpsTable,SIGNAL(currentCellChanged(int,int,int,int)),this,SLOT(updateSelectedBlackListIP(int,int,int,int))); - QObject::connect(ui.whiteListIpsTable,SIGNAL(currentCellChanged(int,int,int,int)),this,SLOT(updateSelectedWhiteListIP(int,int,int,int))); - QTimer *timer = new QTimer(this); timer->connect(timer, SIGNAL(timeout()), this, SLOT(updateStatus())); timer->start(1000); @@ -102,6 +89,22 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags) ui.hiddenpage_incoming->setVisible(false); + QObject::connect(ui.filteredIpsTable,SIGNAL(customContextMenuRequested(const QPoint&)),this,SLOT(ipFilterContextMenu(const QPoint&))) ; + QObject::connect(ui.whiteListIpsTable,SIGNAL(customContextMenuRequested(const QPoint&)),this,SLOT(ipWhiteListContextMenu(const QPoint&))) ; + QObject::connect(ui.denyAll_CB,SIGNAL(toggled(bool)),this,SLOT(toggleIpFiltering(bool))); + QObject::connect(ui.includeFromDHT_CB,SIGNAL(toggled(bool)),this,SLOT(toggleAutoIncludeDHT(bool))); + QObject::connect(ui.includeFromFriends_CB,SIGNAL(toggled(bool)),this,SLOT(toggleAutoIncludeFriends(bool))); + QObject::connect(ui.groupIPRanges_CB,SIGNAL(toggled(bool)),this,SLOT(toggleGroupIps(bool))); + QObject::connect(ui.groupIPRanges_SB,SIGNAL(valueChanged(int)),this,SLOT(setGroupIpLimit(int))); + QObject::connect(ui.ipInputAddBlackList_PB,SIGNAL(clicked()),this,SLOT(addIpRangeToBlackList())); + QObject::connect(ui.ipInputAddWhiteList_PB,SIGNAL(clicked()),this,SLOT(addIpRangeToWhiteList())); + QObject::connect(ui.ipInput_LE,SIGNAL(textChanged(const QString&)),this,SLOT(checkIpRange(const QString&))); + QObject::connect(ui.filteredIpsTable,SIGNAL(currentCellChanged(int,int,int,int)),this,SLOT(updateSelectedBlackListIP(int,int,int,int))); + QObject::connect(ui.whiteListIpsTable,SIGNAL(currentCellChanged(int,int,int,int)),this,SLOT(updateSelectedWhiteListIP(int,int,int,int))); + + QObject::connect(ui.localPort,SIGNAL(valueChanged(int)),this,SLOT(saveAddresses())); + QObject::connect(ui.extPort,SIGNAL(valueChanged(int)),this,SLOT(saveAddresses())); + connect( ui.netModeComboBox, SIGNAL( activated ( int ) ), this, SLOT( toggleUPnP( ) ) ); connect( ui.allowIpDeterminationCB, SIGNAL( toggled( bool ) ), this, SLOT( toggleIpDetermination(bool) ) ); connect( ui.cleanKnownIPs_PB, SIGNAL( clicked( ) ), this, SLOT( clearKnownAddressList() ) ); @@ -225,20 +228,28 @@ void ServerPage::load() return; } - loadFilteredIps() ; - - ui.netModeComboBox->show() ; - ui.textlabel_upnp->show(); - ui.iconlabel_upnp->show(); - ui.label_nat->show(); - - ui.textlabel_hiddenMode->hide() ; - ui.iconlabel_hiddenMode->hide() ; - - /* set net mode */ - int netIndex = 0; - switch(detail.netMode) + // (csoler) Disabling some signals in this block in order to avoid + // some nasty feedback. { + ui.localPort->blockSignals(true); + ui.extPort->blockSignals(true); + ui.localAddress->blockSignals(true); + ui.extAddress->blockSignals(true); + + loadFilteredIps() ; + + ui.netModeComboBox->show() ; + ui.textlabel_upnp->show(); + ui.iconlabel_upnp->show(); + ui.label_nat->show(); + + ui.textlabel_hiddenMode->hide() ; + ui.iconlabel_hiddenMode->hide() ; + + /* set net mode */ + int netIndex = 0; + switch(detail.netMode) + { case RS_NETMODE_EXT: netIndex = 2; break; @@ -249,80 +260,77 @@ void ServerPage::load() case RS_NETMODE_UPNP: netIndex = 0; break; - } - ui.netModeComboBox->setCurrentIndex(netIndex); + } + ui.netModeComboBox->setCurrentIndex(netIndex); - /* DHT + Discovery: (public) + /* DHT + Discovery: (public) * Discovery only: (private) * DHT only: (inverted) * None: (dark net) */ - netIndex = 3; // NONE. - if (detail.vs_dht != RS_VS_DHT_OFF) - { - if (detail.vs_disc != RS_VS_DISC_OFF) + netIndex = 3; // NONE. + if (detail.vs_dht != RS_VS_DHT_OFF) { - netIndex = 0; // PUBLIC + if (detail.vs_disc != RS_VS_DISC_OFF) + netIndex = 0; // PUBLIC + else + netIndex = 2; // INVERTED } else { - netIndex = 2; // INVERTED + if (detail.vs_disc != RS_VS_DISC_OFF) + netIndex = 1; // PRIVATE + else + netIndex = 3; // NONE } - } - else - { - if (detail.vs_disc != RS_VS_DISC_OFF) - { - netIndex = 1; // PRIVATE - } - else - { - netIndex = 3; // NONE - } - } - ui.discComboBox->setCurrentIndex(netIndex); + ui.discComboBox->setCurrentIndex(netIndex); - int dlrate = 0; - int ulrate = 0; - rsConfig->GetMaxDataRates(dlrate, ulrate); - ui.totalDownloadRate->setValue(dlrate); - ui.totalUploadRate->setValue(ulrate); + int dlrate = 0; + int ulrate = 0; + rsConfig->GetMaxDataRates(dlrate, ulrate); + ui.totalDownloadRate->setValue(dlrate); + ui.totalUploadRate->setValue(ulrate); - toggleUPnP(); + toggleUPnP(); - - /* Addresses must be set here - otherwise can't edit it */ + /* Addresses must be set here - otherwise can't edit it */ /* set local address */ - ui.localAddress->setText(QString::fromStdString(detail.localAddr)); - ui.localPort -> setValue(detail.localPort); + ui.localAddress->setText(QString::fromStdString(detail.localAddr)); + ui.localPort -> setValue(detail.localPort); /* set the server address */ - ui.extAddress->setText(QString::fromStdString(detail.extAddr)); - ui.extPort -> setValue(detail.extPort); - /* set DynDNS */ - ui.dynDNS -> setText(QString::fromStdString(detail.dyndns)); + ui.extAddress->setText(QString::fromStdString(detail.extAddr)); + ui.extPort -> setValue(detail.extPort); + /* set DynDNS */ + ui.dynDNS -> setText(QString::fromStdString(detail.dyndns)); - ui.showDiscStatusBar->setChecked(Settings->getStatusBarFlags() & STATUSBAR_DISC); + ui.showDiscStatusBar->setChecked(Settings->getStatusBarFlags() & STATUSBAR_DISC); ui.ipAddressList->clear(); for(std::list::const_iterator it(detail.ipAddressList.begin());it!=detail.ipAddressList.end();++it) ui.ipAddressList->addItem(QString::fromStdString(*it)); - /* HIDDEN PAGE SETTINGS - only Proxy (outgoing) */ - std::string proxyaddr; - uint16_t proxyport; - uint32_t status ; - // Tor - rsPeers->getProxyServer(RS_HIDDEN_TYPE_TOR, proxyaddr, proxyport, status); - ui.hiddenpage_proxyAddress_tor -> setText(QString::fromStdString(proxyaddr)); - ui.hiddenpage_proxyPort_tor -> setValue(proxyport); - // I2P - rsPeers->getProxyServer(RS_HIDDEN_TYPE_I2P, proxyaddr, proxyport, status); - ui.hiddenpage_proxyAddress_i2p -> setText(QString::fromStdString(proxyaddr)); - ui.hiddenpage_proxyPort_i2p -> setValue(proxyport); + /* HIDDEN PAGE SETTINGS - only Proxy (outgoing) */ + std::string proxyaddr; + uint16_t proxyport; + uint32_t status ; + // Tor + rsPeers->getProxyServer(RS_HIDDEN_TYPE_TOR, proxyaddr, proxyport, status); + ui.hiddenpage_proxyAddress_tor -> setText(QString::fromStdString(proxyaddr)); + ui.hiddenpage_proxyPort_tor -> setValue(proxyport); + // I2P + rsPeers->getProxyServer(RS_HIDDEN_TYPE_I2P, proxyaddr, proxyport, status); + ui.hiddenpage_proxyAddress_i2p -> setText(QString::fromStdString(proxyaddr)); + ui.hiddenpage_proxyPort_i2p -> setValue(proxyport); - updateOutProxyIndicator(); + updateOutProxyIndicator(); + + ui.localPort->blockSignals(false); + ui.extPort->blockSignals(false); + ui.localAddress->blockSignals(false); + ui.extAddress->blockSignals(false); + } } void ServerPage::toggleAutoIncludeFriends(bool b) diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui index 1893bdc7e..fe2a638e2 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.ui +++ b/retroshare-gui/src/gui/settings/ServerPage.ui @@ -7,7 +7,7 @@ 0 0 1220 - 884 + 896 @@ -26,7 +26,7 @@ - 2 + 0