Merge pull request #1246 from 3pdotsif/openssl

added NTCP2 to qt.pro ; fix for #1111

qt/i2pd_qt/TunnelConfig.cpp

@@ -31,16 +31,15 @@ void ClientTunnelConfig::saveToStringStream(std::stringstream& out) {
     out << "address=" << address << "\n"
         << "port=" << port << "\n"
         << "destination=" << dest << "\n"
-        << "keys=" << keys << "\n"
         << "destinationport=" << destinationPort << "\n"
         << "signaturetype=" << sigType << "\n";
+    if(!keys.empty()) out << "keys=" << keys << "\n";
 }
 
 
 void ServerTunnelConfig::saveToStringStream(std::stringstream& out) {
     out << "host=" << host << "\n"
         << "port=" << port << "\n"
-        << "keys=" << keys << "\n"
         << "signaturetype=" << sigType << "\n"
         << "inport=" << inPort << "\n"
         << "accesslist=" << accessList << "\n"
@@ -49,5 +48,6 @@ void ServerTunnelConfig::saveToStringStream(std::stringstream& out) {
         << "address=" << address << "\n"
         << "hostoverride=" << hostOverride << "\n"
         << "webircpassword=" << webircpass << "\n";
+    if(!keys.empty()) out << "keys=" << keys << "\n";
 }
 

qt/i2pd_qt/i2pd_qt.pro

@@ -97,7 +97,8 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \
     pagewithbackbutton.cpp \
     widgetlock.cpp \
     widgetlockregistry.cpp \
-    logviewermanager.cpp
+    logviewermanager.cpp \
+    ../../libi2pd/NTCP2.cpp
 
 #qt creator does not handle this well
 #SOURCES += $$files(../../libi2pd/*.cpp)

qt/i2pd_qt/mainwindow.h

@@ -726,8 +726,8 @@ private:
                     // mandatory params
                     std::string host = section.second.get<std::string> (I2P_SERVER_TUNNEL_HOST);
                     int port = section.second.get<int> (I2P_SERVER_TUNNEL_PORT);
-                    std::string keys = section.second.get<std::string> (I2P_SERVER_TUNNEL_KEYS);
                     // optional params
+                    std::string keys = section.second.get<std::string> (I2P_SERVER_TUNNEL_KEYS, "");
                     int inPort = section.second.get (I2P_SERVER_TUNNEL_INPORT, 0);
                     std::string accessList = section.second.get (I2P_SERVER_TUNNEL_ACCESS_LIST, "");
                     std::string hostOverride = section.second.get (I2P_SERVER_TUNNEL_HOST_OVERRIDE, "");