Browse Source

Merge pull request #64 from nonlin-lin-chaos-order-etc-etal/patch4

Truly enabled UPnP when compile-time; ssu+ssu2 defaults
pull/68/head
orignal 2 years ago committed by GitHub
parent
commit
6fbc0365f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      i2pd_qt.pro
  2. 6
      src/mainwindow.cpp

2
i2pd_qt.pro

@ -19,6 +19,8 @@ CONFIG += strict_c++ c++11
# suppress OpenSSL deprecation warnings # suppress OpenSSL deprecation warnings
DEFINES += OPENSSL_SUPPRESS_DEPRECATED DEFINES += OPENSSL_SUPPRESS_DEPRECATED
DEFINES += USE_UPNP
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
message(Debug build) message(Debug build)

6
src/mainwindow.cpp

@ -216,7 +216,7 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
initIntegerBox( OPTION("","share",[]{return "100";}), uiSettings->shareLineEdit, tr("Share"));//Max % of bandwidth limit for transit. 0-100. 100 by default initIntegerBox( OPTION("","share",[]{return "100";}), uiSettings->shareLineEdit, tr("Share"));//Max % of bandwidth limit for transit. 0-100. 100 by default
initStringBox( OPTION("","family",[]{return "";}), uiSettings->familyLineEdit); initStringBox( OPTION("","family",[]{return "";}), uiSettings->familyLineEdit);
initIntegerBox( OPTION("","netid",[]{return "2";}), uiSettings->netIdLineEdit, tr("NetID")); initIntegerBox( OPTION("","netid",[]{return "2";}), uiSettings->netIdLineEdit, tr("NetID"));
initCheckBox( OPTION("","ssu",[]{return "true";}), uiSettings->ssuCheckBox);//Enable SSU transport protocol (use UDP). true by default initCheckBox( OPTION("","ssu",[]{return "false";}), uiSettings->ssuCheckBox);//Enable SSU transport protocol (use UDP). true by default
initCheckBox( OPTION("","reservedrange",[]{return "true";}), uiSettings->reservedrange_checkbox); initCheckBox( OPTION("","reservedrange",[]{return "true";}), uiSettings->reservedrange_checkbox);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
@ -325,8 +325,8 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
initIPAddressBox( OPTION("ntcp2","addressv6",[]{return "::";}), uiSettings->ntcp2AddressV6LineEdit, tr("NTCP2 -> IPv6 address")); //External IPv6 for incoming connections initIPAddressBox( OPTION("ntcp2","addressv6",[]{return "::";}), uiSettings->ntcp2AddressV6LineEdit, tr("NTCP2 -> IPv6 address")); //External IPv6 for incoming connections
initStringBox( OPTION("ntcp2","proxy",[]{return "";}), uiSettings->lineEditNtcp2Proxy); //Specify proxy server for NTCP2. Should be http://address:port or socks://address:port initStringBox( OPTION("ntcp2","proxy",[]{return "";}), uiSettings->lineEditNtcp2Proxy); //Specify proxy server for NTCP2. Should be http://address:port or socks://address:port
initCheckBox( OPTION("ssu2","enabled",[]{return "false";}), uiSettings->ssu2enabledCheckBox); initCheckBox( OPTION("ssu2","enabled",[]{return "true";}), uiSettings->ssu2enabledCheckBox);
initCheckBox( OPTION("ssu2","published",[]{return "false";}), uiSettings->ssu2publishedCheckBox); initCheckBox( OPTION("ssu2","published",[]{return "true";}), uiSettings->ssu2publishedCheckBox);
initTCPPortBox( OPTION("ssu2","port",[]{return "0";}), uiSettings->ssu2portLineEdit, tr("Port to listen for incoming SSU2 packets (set 0 to auto-assign the port)")); initTCPPortBox( OPTION("ssu2","port",[]{return "0";}), uiSettings->ssu2portLineEdit, tr("Port to listen for incoming SSU2 packets (set 0 to auto-assign the port)"));
initCheckBox( OPTION("nettime","enabled",[]{return "false";}), uiSettings->checkBoxNettimeEnable); //Enable NTP sync. Disabled by default initCheckBox( OPTION("nettime","enabled",[]{return "false";}), uiSettings->checkBoxNettimeEnable); //Enable NTP sync. Disabled by default

Loading…
Cancel
Save