Merge pull request #59 from nonlin-lin-chaos-order-etc-etal/patch1

ui ssu2 options ( #57 related ) + default sigtype fix ( fixes #46 )

src/generalsettingswidget.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>679</width>
-    <height>4152</height>
+    <height>8152</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -584,7 +584,7 @@ QGroupBox::title {
          <x>0</x>
          <y>20</y>
          <width>661</width>
-         <height>397</height>
+         <height>488</height>
         </rect>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -623,6 +623,47 @@ QGroupBox::title {
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QCheckBox" name="ssu2enabledCheckBox">
+          <property name="text">
+           <string>Enable SSU2</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="ssu2publishedCheckBox">
+          <property name="text">
+           <string>Publish SSU2</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="ssu2horizontalLayout">
+          <item>
+           <widget class="QLabel" name="ssu2portLabel">
+            <property name="text">
+             <string>Port to listen for incoming SSU2 packets (0 means auto-assign):</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="ssu2portLineEdit"/>
+          </item>
+          <item>
+           <spacer name="ssu2horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
         <item>
          <widget class="QCheckBox" name="natCheckBox">
           <property name="text">

src/mainwindow.cpp

@@ -325,6 +325,10 @@ 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
     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","published",[]{return "false";}), 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)"));
+
     initCheckBox(       OPTION("nettime","enabled",[]{return "false";}), uiSettings->checkBoxNettimeEnable); //Enable NTP sync. Disabled by default
     initStringBox(      OPTION("nettime","ntpservers",[]{return "pool.ntp.org";}), uiSettings->lineEditNetTimeNtpServers); //Comma-separated list of NTP servers. pool.ntp.org by default
     initIntegerBox(     OPTION("nettime","ntpsyncinterval",[]{return "72";}), uiSettings->nettimeNtpSyncIntervalNumberLineEdit, tr("nettimeNtpSyncInterval")); //NTP time sync interval in hours. 72 by default

src/mainwindow.h

@@ -681,7 +681,7 @@ private:
         std::string address = "127.0.0.1";
         int destinationPort = 0;
         int cryptoType = 0;
-        i2p::data::SigningKeyType sigType = i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA256_P256;
+        i2p::data::SigningKeyType sigType = i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519;
         // I2CP
         I2CPParameters i2cpParameters;
         CreateDefaultI2CPOptions (i2cpParameters);
@@ -709,7 +709,7 @@ private:
         std::string hostOverride = "";
         std::string webircpass = "";
         bool gzip = true;
-        i2p::data::SigningKeyType sigType = i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA256_P256;
+        i2p::data::SigningKeyType sigType = i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519;
         std::string address = "127.0.0.1";
         bool isUniqueLocal = true;
         int cryptoType = 0;