mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-01-22 08:14:15 +00:00
Merge pull request #1606 from nonlinear-chaos-order-etc-etal/openssl-custom
fixes many i2pd_qt issues
This commit is contained in:
orignal
GitHub
commit
b4d1e89696
@ -532,7 +532,7 @@ namespace http {
|
||||
}
|
||||
}
|
||||
|
||||
static void ShowI2CPLocalDestination (std::stringstream& s, const std::string& id)
|
||||
void ShowI2CPLocalDestination (std::stringstream& s, const std::string& id)
|
||||
{
|
||||
auto i2cpServer = i2p::client::context.GetI2CPServer ();
|
||||
if (i2cpServer)
|
||||
@ -820,7 +820,7 @@ namespace http {
|
||||
s << "<b>SAM Sessions:</b> no sessions currently running.<br>\r\n";
|
||||
}
|
||||
|
||||
static void ShowSAMSession (std::stringstream& s, const std::string& id)
|
||||
void ShowSAMSession (std::stringstream& s, const std::string& id)
|
||||
{
|
||||
auto sam = i2p::client::context.GetSAMBridge ();
|
||||
if (!sam) {
|
||||
|
||||
@ -98,6 +98,8 @@ namespace http
|
||||
void ShowSAMSessions (std::stringstream& s);
|
||||
void ShowI2PTunnels (std::stringstream& s);
|
||||
void ShowLocalDestination (std::stringstream& s, const std::string& b32, uint32_t token);
|
||||
void ShowSAMSession (std::stringstream& s, const std::string& id);
|
||||
void ShowI2CPLocalDestination (std::stringstream& s, const std::string& id);
|
||||
} // http
|
||||
} // i2p
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
#define DELAYEDSAVEMANAGER_H
|
||||
|
||||
#include "Saver.h"
|
||||
#include "I2pdQtTypes.h"
|
||||
|
||||
class DelayedSaveManager
|
||||
{
|
||||
@ -12,13 +13,14 @@ public:
|
||||
|
||||
typedef unsigned int DATA_SERIAL_TYPE;
|
||||
|
||||
virtual void delayedSave(DATA_SERIAL_TYPE dataSerial, bool needsTunnelFocus, std::string tunnelNameToFocus)=0;
|
||||
virtual void delayedSave(bool reloadAfterSave, DATA_SERIAL_TYPE dataSerial, FocusEnum focusOn, std::string tunnelNameToFocus, QWidget* widgetToFocus)=0;
|
||||
|
||||
//returns false iff save failed
|
||||
virtual bool appExiting()=0;
|
||||
|
||||
virtual bool needsFocusOnTunnel()=0;
|
||||
virtual FocusEnum getFocusOn()=0;
|
||||
virtual std::string& getTunnelNameToFocus()=0;
|
||||
virtual QWidget* getWidgetToFocus()=0;
|
||||
};
|
||||
|
||||
#endif // DELAYEDSAVEMANAGER_H
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
#include "DelayedSaveManagerImpl.h"
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
DelayedSaveManagerImpl::DelayedSaveManagerImpl() :
|
||||
widgetToFocus(nullptr),
|
||||
saver(nullptr),
|
||||
lastDataSerialSeen(DelayedSaveManagerImpl::INITIAL_DATA_SERIAL),
|
||||
lastSaveStartedTimestamp(A_VERY_OBSOLETE_TIMESTAMP),
|
||||
@ -21,10 +24,12 @@ bool DelayedSaveManagerImpl::isSaverValid() {
|
||||
return saver != nullptr;
|
||||
}
|
||||
|
||||
void DelayedSaveManagerImpl::delayedSave(DATA_SERIAL_TYPE dataSerial, bool focusOnTunnel, std::string tunnelNameToFocus_) {
|
||||
void DelayedSaveManagerImpl::delayedSave(bool reloadAfterSave, DATA_SERIAL_TYPE dataSerial, FocusEnum focusOn, std::string tunnelNameToFocus, QWidget* widgetToFocus) {
|
||||
if(lastDataSerialSeen==dataSerial)return;
|
||||
this->focusOnTunnel = focusOnTunnel;
|
||||
tunnelNameToFocus = tunnelNameToFocus_;
|
||||
this->reloadAfterSave = reloadAfterSave;
|
||||
this->focusOn = focusOn;
|
||||
this->tunnelNameToFocus = tunnelNameToFocus;
|
||||
this->widgetToFocus = widgetToFocus;
|
||||
lastDataSerialSeen=dataSerial;
|
||||
assert(isSaverValid());
|
||||
TIMESTAMP_TYPE now = getTime();
|
||||
@ -42,7 +47,7 @@ bool DelayedSaveManagerImpl::appExiting() {
|
||||
exiting=true;
|
||||
thread->wakeThreadAndJoinThread();
|
||||
assert(isSaverValid());
|
||||
saver->save(false, "");
|
||||
saver->save(false, FocusEnum::noFocus);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -71,9 +76,10 @@ void DelayedSaveThread::run() {
|
||||
assert(saver!=nullptr);
|
||||
if(saveNow) {
|
||||
saveNow = false;
|
||||
const bool focusOnTunnel = delayedSaveManagerImpl->needsFocusOnTunnel();
|
||||
const FocusEnum focusOn = delayedSaveManagerImpl->getFocusOn();
|
||||
const std::string tunnelNameToFocus = delayedSaveManagerImpl->getTunnelNameToFocus();
|
||||
saver->save(focusOnTunnel, tunnelNameToFocus);
|
||||
QWidget* widgetToFocus = delayedSaveManagerImpl->getWidgetToFocus();
|
||||
saver->save(delayedSaveManagerImpl->isReloadAfterSave(), focusOn, tunnelNameToFocus, widgetToFocus);
|
||||
continue;
|
||||
}
|
||||
if(defer) {
|
||||
@ -87,9 +93,10 @@ void DelayedSaveThread::run() {
|
||||
if(delayedSaveManagerImpl->isExiting())return;
|
||||
continue;
|
||||
}
|
||||
const bool focusOnTunnel = delayedSaveManagerImpl->needsFocusOnTunnel();
|
||||
const FocusEnum focusOn = delayedSaveManagerImpl->getFocusOn();
|
||||
const std::string tunnelNameToFocus = delayedSaveManagerImpl->getTunnelNameToFocus();
|
||||
saver->save(focusOnTunnel, tunnelNameToFocus);
|
||||
QWidget* widgetToFocus = delayedSaveManagerImpl->getWidgetToFocus();
|
||||
saver->save(delayedSaveManagerImpl->isReloadAfterSave(), focusOn, tunnelNameToFocus, widgetToFocus);
|
||||
break; //break inner loop
|
||||
}
|
||||
}
|
||||
@ -131,10 +138,3 @@ Saver* DelayedSaveManagerImpl::getSaver() {
|
||||
return saver;
|
||||
}
|
||||
|
||||
bool DelayedSaveManagerImpl::needsFocusOnTunnel() {
|
||||
return focusOnTunnel;
|
||||
}
|
||||
|
||||
std::string& DelayedSaveManagerImpl::getTunnelNameToFocus() {
|
||||
return tunnelNameToFocus;
|
||||
}
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
#include <QMutex>
|
||||
#include <QDateTime>
|
||||
|
||||
#include "mainwindow.h"
|
||||
#include "I2pdQtTypes.h"
|
||||
#include "DelayedSaveManager.h"
|
||||
#include "Saver.h"
|
||||
|
||||
class DelayedSaveManagerImpl;
|
||||
class Saver;
|
||||
|
||||
class DelayedSaveThread : public QThread
|
||||
{
|
||||
class DelayedSaveThread : public QThread {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
@ -42,14 +42,17 @@ private:
|
||||
volatile TIMESTAMP_TYPE wakeTime;
|
||||
};
|
||||
|
||||
class DelayedSaveManagerImpl : public DelayedSaveManager
|
||||
{
|
||||
class DelayedSaveManagerImpl : public DelayedSaveManager {
|
||||
FocusEnum focusOn;
|
||||
std::string tunnelNameToFocus;
|
||||
QWidget* widgetToFocus;
|
||||
bool reloadAfterSave;
|
||||
public:
|
||||
DelayedSaveManagerImpl();
|
||||
virtual ~DelayedSaveManagerImpl();
|
||||
virtual void setSaver(Saver* saver);
|
||||
virtual void start();
|
||||
virtual void delayedSave(DATA_SERIAL_TYPE dataSerial, bool focusOnTunnel, std::string tunnelNameToFocus);
|
||||
virtual void delayedSave(bool reloadAfterSave, DATA_SERIAL_TYPE dataSerial, FocusEnum focusOn, std::string tunnelNameToFocus, QWidget* widgetToFocus);
|
||||
virtual bool appExiting();
|
||||
|
||||
typedef DelayedSaveThread::TIMESTAMP_TYPE TIMESTAMP_TYPE;
|
||||
@ -59,8 +62,10 @@ public:
|
||||
Saver* getSaver();
|
||||
static TIMESTAMP_TYPE getTime();
|
||||
|
||||
bool needsFocusOnTunnel();
|
||||
std::string& getTunnelNameToFocus();
|
||||
bool isReloadAfterSave() { return reloadAfterSave; }
|
||||
FocusEnum getFocusOn() { return focusOn; }
|
||||
std::string& getTunnelNameToFocus() { return tunnelNameToFocus; }
|
||||
QWidget* getWidgetToFocus() { return widgetToFocus; }
|
||||
|
||||
private:
|
||||
Saver* saver;
|
||||
@ -74,9 +79,6 @@ private:
|
||||
bool exiting;
|
||||
DelayedSaveThread* thread;
|
||||
void wakeThreadAndJoinThread();
|
||||
|
||||
bool focusOnTunnel;
|
||||
std::string tunnelNameToFocus;
|
||||
};
|
||||
|
||||
#endif // DELAYEDSAVEMANAGERIMPL_H
|
||||
|
||||
7
qt/i2pd_qt/I2pdQtTypes.h
Normal file
7
qt/i2pd_qt/I2pdQtTypes.h
Normal file
@ -0,0 +1,7 @@
|
||||
#ifndef I2PDQTTYPES_H
|
||||
#define I2PDQTTYPES_H
|
||||
|
||||
enum WrongInputPageEnum { generalSettingsPage, tunnelsSettingsPage };
|
||||
enum FocusEnum { noFocus, focusOnTunnelName, focusOnWidget };
|
||||
|
||||
#endif // I2PDQTTYPES_H
|
||||
@ -4,6 +4,9 @@
|
||||
#include <string>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
class QWidget;
|
||||
|
||||
#include "I2pdQtTypes.h"
|
||||
|
||||
class Saver : public QObject
|
||||
{
|
||||
@ -11,8 +14,8 @@ class Saver : public QObject
|
||||
|
||||
public:
|
||||
Saver();
|
||||
//false iff failures
|
||||
virtual bool save(const bool focusOnTunnel, const std::string& tunnelNameToFocus)=0;
|
||||
//FocusEnum::focusNone iff failures //??? wtf
|
||||
virtual bool save(bool reloadAfterSave, const FocusEnum focusOn, const std::string& tunnelNameToFocus="", QWidget* widgetToFocus=nullptr)=0;
|
||||
|
||||
signals:
|
||||
void reloadTunnelsConfigAndUISignal(const QString);
|
||||
|
||||
@ -15,7 +15,7 @@ SaverImpl::SaverImpl(MainWindow *mainWindowPtr_, QList<MainWindowItem*> * config
|
||||
|
||||
SaverImpl::~SaverImpl() {}
|
||||
|
||||
bool SaverImpl::save(const bool focusOnTunnel, const std::string& tunnelNameToFocus) {
|
||||
bool SaverImpl::save(bool reloadAfterSave, const FocusEnum focusOn, const std::string& tunnelNameToFocus, QWidget* widgetToFocus) {
|
||||
//save main config
|
||||
{
|
||||
std::stringstream out;
|
||||
@ -59,12 +59,14 @@ bool SaverImpl::save(const bool focusOnTunnel, const std::string& tunnelNameToFo
|
||||
outfile.close();
|
||||
}
|
||||
|
||||
//reload saved configs
|
||||
if(reloadAfterSave) {
|
||||
//reload saved configs
|
||||
#if 0
|
||||
i2p::client::context.ReloadConfig();
|
||||
i2p::client::context.ReloadConfig();
|
||||
#endif
|
||||
|
||||
if(focusOnTunnel) emit reloadTunnelsConfigAndUISignal(QString::fromStdString(tunnelNameToFocus));
|
||||
if(reloadAfterSave) emit reloadTunnelsConfigAndUISignal(focusOn==FocusEnum::focusOnTunnelName?QString::fromStdString(tunnelNameToFocus):"");
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ class SaverImpl : public Saver
|
||||
public:
|
||||
SaverImpl(MainWindow *mainWindowPtr_, QList<MainWindowItem*> * configItems_, std::map<std::string,TunnelConfig*>* tunnelConfigs_);
|
||||
virtual ~SaverImpl();
|
||||
virtual bool save(const bool focusOnTunnel, const std::string& tunnelNameToFocus);
|
||||
virtual bool save(bool reloadAfterSave, const FocusEnum focusOn, const std::string& tunnelNameToFocus, QWidget* widgetToFocus);
|
||||
void setConfPath(QString& confpath_);
|
||||
void setTunnelsConfPath(QString& tunconfpath_);
|
||||
private:
|
||||
|
||||
@ -9,10 +9,15 @@ CONFIG += strict_c++ c++11
|
||||
|
||||
CONFIG(debug, debug|release) {
|
||||
message(Debug build)
|
||||
|
||||
# do not redirect logging to std::ostream and to Log pane
|
||||
DEFINES += DEBUG_WITH_DEFAULT_LOGGING
|
||||
|
||||
DEFINES += I2PD_QT_DEBUG
|
||||
I2PDMAKE += DEBUG=yes
|
||||
} else {
|
||||
message(Release build)
|
||||
DEFINES += I2PD_QT_RELEASE
|
||||
I2PDMAKE += DEBUG=no
|
||||
}
|
||||
|
||||
@ -64,7 +69,8 @@ HEADERS += DaemonQT.h mainwindow.h \
|
||||
../../daemon/UPnP.h \
|
||||
AboutDialog.h \
|
||||
BuildDateTimeQt.h \
|
||||
I2pdQtUtil.h
|
||||
I2pdQtUtil.h \
|
||||
I2pdQtTypes.h
|
||||
|
||||
INCLUDEPATH += ../../libi2pd
|
||||
INCLUDEPATH += ../../libi2pd_client
|
||||
|
||||
@ -45,6 +45,7 @@ std::string programOptionsWriterCurrentSection;
|
||||
|
||||
MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *parent) :
|
||||
QMainWindow(parent)
|
||||
,currentLocalDestinationB32("")
|
||||
,logStream(logStream_)
|
||||
,delayedSaveManagerPtr(new DelayedSaveManagerImpl())
|
||||
,dataSerial(DelayedSaveManagerImpl::INITIAL_DATA_SERIAL)
|
||||
@ -135,6 +136,7 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
|
||||
//childTextBrowser->setOpenExternalLinks(false);
|
||||
childTextBrowser->setOpenLinks(false);
|
||||
connect(textBrowser, SIGNAL(anchorClicked(const QUrl&)), this, SLOT(anchorClickedHandler(const QUrl&)));
|
||||
connect(childTextBrowser, SIGNAL(anchorClicked(const QUrl&)), this, SLOT(anchorClickedHandler(const QUrl&)));
|
||||
pageWithBackButton = new PageWithBackButton(this, childTextBrowser);
|
||||
ui->verticalLayout_2->addWidget(pageWithBackButton);
|
||||
pageWithBackButton->hide();
|
||||
@ -177,9 +179,9 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
|
||||
|
||||
# define OPTION(section,option,defaultValueGetter) ConfigOption(QString(section),QString(option))
|
||||
|
||||
initFileChooser( OPTION("","conf",[](){return "";}), uiSettings->configFileLineEdit, uiSettings->configFileBrowsePushButton);
|
||||
initFileChooser( OPTION("","tunconf",[](){return "";}), uiSettings->tunnelsConfigFileLineEdit, uiSettings->tunnelsConfigFileBrowsePushButton);
|
||||
initFileChooser( OPTION("","pidfile",[]{return "";}), uiSettings->pidFileLineEdit, uiSettings->pidFileBrowsePushButton);
|
||||
initFileChooser( OPTION("","conf",[](){return "";}), uiSettings->configFileLineEdit, uiSettings->configFileBrowsePushButton, false, true);
|
||||
initFileChooser( OPTION("","tunconf",[](){return "";}), uiSettings->tunnelsConfigFileLineEdit, uiSettings->tunnelsConfigFileBrowsePushButton, false);
|
||||
initFileChooser( OPTION("","pidfile",[]{return "";}), uiSettings->pidFileLineEdit, uiSettings->pidFileBrowsePushButton, false);
|
||||
|
||||
uiSettings->logDestinationComboBox->clear();
|
||||
uiSettings->logDestinationComboBox->insertItems(0, QStringList()
|
||||
@ -188,8 +190,11 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
|
||||
<< QApplication::translate("MainWindow", "file", 0)
|
||||
);
|
||||
initLogDestinationCombobox( OPTION("","log",[]{return "";}), uiSettings->logDestinationComboBox);
|
||||
#ifdef I2PD_QT_RELEASE
|
||||
uiSettings->logDestinationComboBox->setEnabled(false); // #1593
|
||||
#endif
|
||||
|
||||
logFileNameOption=initFileChooser( OPTION("","logfile",[]{return "";}), uiSettings->logFileLineEdit, uiSettings->logFileBrowsePushButton);
|
||||
logFileNameOption=initFileChooser( OPTION("","logfile",[]{return "";}), uiSettings->logFileLineEdit, uiSettings->logFileBrowsePushButton, false);
|
||||
initLogLevelCombobox(OPTION("","loglevel",[]{return "";}), uiSettings->logLevelComboBox);
|
||||
initCheckBox( OPTION("","logclftime",[]{return "false";}), uiSettings->logclftimeCheckBox);//"Write full CLF-formatted date and time to log (default: write only time)"
|
||||
initFolderChooser( OPTION("","datadir",[]{return "";}), uiSettings->dataFolderLineEdit, uiSettings->dataFolderBrowsePushButton);
|
||||
@ -232,7 +237,7 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
|
||||
initIPAddressBox( OPTION("httpproxy","address",[]{return "";}), uiSettings->httpProxyAddressLineEdit, tr("HTTP proxy -> IP address"));
|
||||
initTCPPortBox( OPTION("httpproxy","port",[]{return "4444";}), uiSettings->httpProxyPortLineEdit, tr("HTTP proxy -> Port"));
|
||||
initCheckBox( OPTION("httpproxy","addresshelper",[]{return "true";}), uiSettings->httpProxyAddressHelperCheckBox);//Enable address helper (jump). true by default
|
||||
initFileChooser( OPTION("httpproxy","keys",[]{return "";}), uiSettings->httpProxyKeyFileLineEdit, uiSettings->httpProxyKeyFilePushButton);
|
||||
initFileChooser( OPTION("httpproxy","keys",[]{return "";}), uiSettings->httpProxyKeyFileLineEdit, uiSettings->httpProxyKeyFilePushButton, false);
|
||||
initSignatureTypeCombobox(OPTION("httpproxy","signaturetype",[]{return "7";}), uiSettings->comboBox_httpPorxySignatureType);
|
||||
initStringBox( OPTION("httpproxy","inbound.length",[]{return "3";}), uiSettings->httpProxyInboundTunnelsLenLineEdit);
|
||||
initStringBox( OPTION("httpproxy","inbound.quantity",[]{return "5";}), uiSettings->httpProxyInboundTunnQuantityLineEdit);
|
||||
@ -245,7 +250,7 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
|
||||
initCheckBox( OPTION("socksproxy","enabled",[]{return "";}), uiSettings->socksProxyEnabledCheckBox);
|
||||
initIPAddressBox( OPTION("socksproxy","address",[]{return "";}), uiSettings->socksProxyAddressLineEdit, tr("Socks proxy -> IP address"));
|
||||
initTCPPortBox( OPTION("socksproxy","port",[]{return "4447";}), uiSettings->socksProxyPortLineEdit, tr("Socks proxy -> Port"));
|
||||
initFileChooser( OPTION("socksproxy","keys",[]{return "";}), uiSettings->socksProxyKeyFileLineEdit, uiSettings->socksProxyKeyFilePushButton);
|
||||
initFileChooser( OPTION("socksproxy","keys",[]{return "";}), uiSettings->socksProxyKeyFileLineEdit, uiSettings->socksProxyKeyFilePushButton, false);
|
||||
initSignatureTypeCombobox(OPTION("socksproxy","signaturetype",[]{return "7";}), uiSettings->comboBox_socksProxySignatureType);
|
||||
initStringBox( OPTION("socksproxy","inbound.length",[]{return "";}), uiSettings->socksProxyInboundTunnelsLenLineEdit);
|
||||
initStringBox( OPTION("socksproxy","inbound.quantity",[]{return "";}), uiSettings->socksProxyInboundTunnQuantityLineEdit);
|
||||
@ -275,8 +280,8 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
|
||||
initIPAddressBox( OPTION("i2pcontrol","address",[]{return "";}), uiSettings->i2pControlAddressLineEdit, tr("I2PControl -> IP address"));
|
||||
initTCPPortBox( OPTION("i2pcontrol","port",[]{return "7650";}), uiSettings->i2pControlPortLineEdit, tr("I2PControl -> Port"));
|
||||
initStringBox( OPTION("i2pcontrol","password",[]{return "";}), uiSettings->i2pControlPasswordLineEdit);
|
||||
initFileChooser( OPTION("i2pcontrol","cert",[]{return "i2pcontrol.crt.pem";}), uiSettings->i2pControlCertFileLineEdit, uiSettings->i2pControlCertFileBrowsePushButton);
|
||||
initFileChooser( OPTION("i2pcontrol","key",[]{return "i2pcontrol.key.pem";}), uiSettings->i2pControlKeyFileLineEdit, uiSettings->i2pControlKeyFileBrowsePushButton);
|
||||
initFileChooser( OPTION("i2pcontrol","cert",[]{return "i2pcontrol.crt.pem";}), uiSettings->i2pControlCertFileLineEdit, uiSettings->i2pControlCertFileBrowsePushButton, true);
|
||||
initFileChooser( OPTION("i2pcontrol","key",[]{return "i2pcontrol.key.pem";}), uiSettings->i2pControlKeyFileLineEdit, uiSettings->i2pControlKeyFileBrowsePushButton, true);
|
||||
|
||||
initCheckBox( OPTION("upnp","enabled",[]{return "true";}), uiSettings->enableUPnPCheckBox);
|
||||
initStringBox( OPTION("upnp","name",[]{return "I2Pd";}), uiSettings->upnpNameLineEdit);
|
||||
@ -284,9 +289,9 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
|
||||
initCheckBox( OPTION("precomputation","elgamal",[]{return "false";}), uiSettings->useElGamalPrecomputedTablesCheckBox);
|
||||
|
||||
initCheckBox( OPTION("reseed","verify",[]{return "";}), uiSettings->reseedVerifyCheckBox);
|
||||
initFileChooser( OPTION("reseed","file",[]{return "";}), uiSettings->reseedFileLineEdit, uiSettings->reseedFileBrowsePushButton);
|
||||
initFileChooser( OPTION("reseed","file",[]{return "";}), uiSettings->reseedFileLineEdit, uiSettings->reseedFileBrowsePushButton, true);
|
||||
initStringBox( OPTION("reseed","urls",[]{return "";}), uiSettings->reseedURLsLineEdit);
|
||||
initFileChooser( OPTION("reseed","zipfile",[]{return "";}), uiSettings->reseedZipFileLineEdit, uiSettings->reseedZipFileBrowsePushButton); //Path to local .zip file to reseed from
|
||||
initFileChooser( OPTION("reseed","zipfile",[]{return "";}), uiSettings->reseedZipFileLineEdit, uiSettings->reseedZipFileBrowsePushButton, true); //Path to local .zip file to reseed from
|
||||
initUInt16Box( OPTION("reseed","threshold",[]{return "25";}), uiSettings->reseedThresholdNumberLineEdit, tr("reseedThreshold")); //Minimum number of known routers before requesting reseed. 25 by default
|
||||
initStringBox( OPTION("reseed","proxy",[]{return "";}), uiSettings->reseedProxyLineEdit);//URL for https/socks reseed proxy
|
||||
|
||||
@ -325,7 +330,15 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
|
||||
# undef OPTION
|
||||
|
||||
//widgetlocks.add(new widgetlock(widget,lockbtn));
|
||||
|
||||
|
||||
// #1593
|
||||
#ifdef I2PD_QT_RELEASE
|
||||
uiSettings->logDestComboEditPushButton->setEnabled(false);
|
||||
#else
|
||||
widgetlocks.add(new widgetlock(uiSettings->logDestinationComboBox,uiSettings->logDestComboEditPushButton));
|
||||
#endif
|
||||
|
||||
widgetlocks.add(new widgetlock(uiSettings->logLevelComboBox,uiSettings->logLevelComboEditPushButton));
|
||||
widgetlocks.add(new widgetlock(uiSettings->comboBox_httpPorxySignatureType,uiSettings->httpProxySignTypeComboEditPushButton));
|
||||
widgetlocks.add(new widgetlock(uiSettings->comboBox_socksProxySignatureType,uiSettings->socksProxySignTypeComboEditPushButton));
|
||||
@ -649,15 +662,15 @@ MainWindow::~MainWindow()
|
||||
//QMessageBox::information(0, "Debug", "mw destructor 2");
|
||||
}
|
||||
|
||||
FileChooserItem* MainWindow::initFileChooser(ConfigOption option, QLineEdit* fileNameLineEdit, QPushButton* fileBrowsePushButton){
|
||||
FileChooserItem* MainWindow::initFileChooser(ConfigOption option, QLineEdit* fileNameLineEdit, QPushButton* fileBrowsePushButton, bool requireExistingFile, bool readOnly){
|
||||
FileChooserItem* retVal;
|
||||
retVal=new FileChooserItem(option, fileNameLineEdit, fileBrowsePushButton, this);
|
||||
retVal=new FileChooserItem(option, fileNameLineEdit, fileBrowsePushButton, this, requireExistingFile, readOnly);
|
||||
MainWindowItem* super=retVal;
|
||||
configItems.append(super);
|
||||
return retVal;
|
||||
}
|
||||
void MainWindow::initFolderChooser(ConfigOption option, QLineEdit* folderLineEdit, QPushButton* folderBrowsePushButton){
|
||||
configItems.append(new FolderChooserItem(option, folderLineEdit, folderBrowsePushButton, this));
|
||||
configItems.append(new FolderChooserItem(option, folderLineEdit, folderBrowsePushButton, this, true));
|
||||
}
|
||||
/*void MainWindow::initCombobox(ConfigOption option, QComboBox* comboBox){
|
||||
configItems.append(new ComboBoxItem(option, comboBox));
|
||||
@ -783,7 +796,7 @@ void MainWindow::deleteTunnelFromUI(std::string tunnelName, TunnelConfig* cnf) {
|
||||
}
|
||||
|
||||
/** returns false iff not valid items present and save was aborted */
|
||||
bool MainWindow::saveAllConfigs(bool focusOnTunnel, std::string tunnelNameToFocus){
|
||||
bool MainWindow::saveAllConfigs(bool reloadAfterSave, FocusEnum focusOn, std::string tunnelNameToFocus, QWidget* widgetToFocus){
|
||||
QString cannotSaveSettings = QApplication::tr("Cannot save settings.");
|
||||
programOptionsWriterCurrentSection="";
|
||||
/*if(!logFileNameOption->lineEdit->text().trimmed().isEmpty())logOption->optionValue=boost::any(std::string("file"));
|
||||
@ -803,7 +816,7 @@ bool MainWindow::saveAllConfigs(bool focusOnTunnel, std::string tunnelNameToFocu
|
||||
return false;
|
||||
}
|
||||
}
|
||||
delayedSaveManagerPtr->delayedSave(++dataSerial, focusOnTunnel, tunnelNameToFocus);//TODO does dataSerial work? //FIXME
|
||||
delayedSaveManagerPtr->delayedSave(reloadAfterSave, ++dataSerial, focusOn, tunnelNameToFocus, widgetToFocus);//TODO does dataSerial work? //FIXME
|
||||
|
||||
//onLoggingOptionsChange();
|
||||
return true;
|
||||
@ -811,11 +824,14 @@ bool MainWindow::saveAllConfigs(bool focusOnTunnel, std::string tunnelNameToFocu
|
||||
|
||||
void FileChooserItem::pushButtonReleased() {
|
||||
QString fileName = lineEdit->text().trimmed();
|
||||
fileName = QFileDialog::getOpenFileName(nullptr, tr("Open File"), fileName, tr("All Files (*.*)"));
|
||||
fileName = requireExistingFile ?
|
||||
QFileDialog::getOpenFileName(nullptr, tr("Open File"), fileName, tr("All Files (*.*)")) :
|
||||
QFileDialog::getSaveFileName(nullptr, tr("Open File"), fileName, tr("All Files (*.*)"));
|
||||
if(fileName.length()>0)lineEdit->setText(fileName);
|
||||
}
|
||||
void FolderChooserItem::pushButtonReleased() {
|
||||
QString fileName = lineEdit->text().trimmed();
|
||||
assert(requireExistingFile);
|
||||
fileName = QFileDialog::getExistingDirectory(nullptr, tr("Open Folder"), fileName);
|
||||
if(fileName.length()>0)lineEdit->setText(fileName);
|
||||
}
|
||||
@ -841,7 +857,7 @@ void MainWindow::updated() {
|
||||
|
||||
bool correct = applyTunnelsUiToConfigs();
|
||||
if(!correct) return;
|
||||
saveAllConfigs(false);
|
||||
saveAllConfigs(false, FocusEnum::noFocus);
|
||||
}
|
||||
|
||||
void MainWindowItem::installListeners(MainWindow *mainWindow) {}
|
||||
@ -916,11 +932,11 @@ bool MainWindow::applyTunnelsUiToConfigs() {
|
||||
return true;
|
||||
}
|
||||
|
||||
void MainWindow::reloadTunnelsConfigAndUI_QString(const QString tunnelNameToFocus) {
|
||||
reloadTunnelsConfigAndUI(tunnelNameToFocus.toStdString());
|
||||
void MainWindow::reloadTunnelsConfigAndUI_QString(QString tunnelNameToFocus) {
|
||||
reloadTunnelsConfigAndUI(tunnelNameToFocus.toStdString(), nullptr);
|
||||
}
|
||||
|
||||
void MainWindow::reloadTunnelsConfigAndUI(std::string tunnelNameToFocus) {
|
||||
void MainWindow::reloadTunnelsConfigAndUI(std::string tunnelNameToFocus, QWidget* widgetToFocus) {
|
||||
deleteTunnelForms();
|
||||
for (std::map<std::string,TunnelConfig*>::iterator it=tunnelConfigs.begin(); it!=tunnelConfigs.end(); ++it) {
|
||||
TunnelConfig* tunconf = it->second;
|
||||
@ -937,8 +953,10 @@ void MainWindow::TunnelsPageUpdateListenerMainWindowImpl::updated(std::string ol
|
||||
std::map<std::string,TunnelConfig*>::const_iterator it=mainWindow->tunnelConfigs.find(oldName);
|
||||
if(it!=mainWindow->tunnelConfigs.end())mainWindow->tunnelConfigs.erase(it);
|
||||
mainWindow->tunnelConfigs[tunConf->getName()]=tunConf;
|
||||
mainWindow->saveAllConfigs(true, FocusEnum::focusOnTunnelName, tunConf->getName());
|
||||
}
|
||||
mainWindow->saveAllConfigs(true, tunConf->getName());
|
||||
else
|
||||
mainWindow->saveAllConfigs(false, FocusEnum::noFocus);
|
||||
}
|
||||
|
||||
void MainWindow::TunnelsPageUpdateListenerMainWindowImpl::needsDeleting(std::string oldName){
|
||||
@ -976,20 +994,71 @@ void MainWindow::anchorClickedHandler(const QUrl & link) {
|
||||
qDebug()<<debugStr;
|
||||
//QMessageBox::information(this, "", debugStr);
|
||||
|
||||
/* /?page=local_destination&b32=xx...xx */
|
||||
QString str=link.toString();
|
||||
#define LOCAL_DEST_B32_PREFIX "/?page=local_destination&b32="
|
||||
static size_t LOCAL_DEST_B32_PREFIX_SZ=QString(LOCAL_DEST_B32_PREFIX).size();
|
||||
if(str.startsWith(LOCAL_DEST_B32_PREFIX)) {
|
||||
str = str.right(str.size()-LOCAL_DEST_B32_PREFIX_SZ);
|
||||
qDebug () << "b32:" << str;
|
||||
std::map<std::string, std::string> params;
|
||||
i2p::http::URL url;
|
||||
url.parse(str.toStdString());
|
||||
url.parse_query(params);
|
||||
const std::string page = params["page"];
|
||||
const std::string cmd = params["cmd"];
|
||||
if (page == "sam_session") {
|
||||
pageWithBackButton->show();
|
||||
textBrowser->hide();
|
||||
std::stringstream s;
|
||||
std::string strstd = str.toStdString();
|
||||
i2p::http::ShowSAMSession (s, params["sam_id"]);
|
||||
childTextBrowser->setHtml(QString::fromStdString(s.str()));
|
||||
} else if (page == "local_destination") {
|
||||
std::string b32 = params["b32"];
|
||||
currentLocalDestinationB32 = b32;
|
||||
pageWithBackButton->show();
|
||||
textBrowser->hide();
|
||||
std::stringstream s;
|
||||
std::string strstd = currentLocalDestinationB32;
|
||||
i2p::http::ShowLocalDestination(s,strstd,0);
|
||||
childTextBrowser->setHtml(QString::fromStdString(s.str()));
|
||||
}
|
||||
} else if (page == "i2cp_local_destination") {
|
||||
pageWithBackButton->show();
|
||||
textBrowser->hide();
|
||||
std::stringstream s;
|
||||
i2p::http::ShowI2CPLocalDestination (s, params["i2cp_id"]);
|
||||
childTextBrowser->setHtml(QString::fromStdString(s.str()));
|
||||
} else if(cmd == "closestream") {
|
||||
std::string b32 = params["b32"];
|
||||
uint32_t streamID = std::stoul(params["streamID"], nullptr);
|
||||
|
||||
i2p::data::IdentHash ident;
|
||||
ident.FromBase32 (b32);
|
||||
auto dest = i2p::client::context.FindLocalDestination (ident);
|
||||
|
||||
if (streamID) {
|
||||
if (dest) {
|
||||
if(dest->DeleteStream (streamID))
|
||||
QMessageBox::information(
|
||||
this,
|
||||
QApplication::tr("Success"),
|
||||
QApplication::tr("<HTML><b>SUCCESS</b>: Stream closed"));
|
||||
else
|
||||
QMessageBox::critical(
|
||||
this,
|
||||
QApplication::tr("Error"),
|
||||
QApplication::tr("<HTML><b>ERROR</b>: Stream not found or already was closed"));
|
||||
}
|
||||
else
|
||||
QMessageBox::critical(
|
||||
this,
|
||||
QApplication::tr("Error"),
|
||||
QApplication::tr("<HTML><b>ERROR</b>: Destination not found"));
|
||||
}
|
||||
else
|
||||
QMessageBox::critical(
|
||||
this,
|
||||
QApplication::tr("Error"),
|
||||
QApplication::tr("<HTML><b>ERROR</b>: StreamID is null"));
|
||||
std::stringstream s;
|
||||
std::string strstd = currentLocalDestinationB32;
|
||||
i2p::http::ShowLocalDestination(s,strstd,0);
|
||||
childTextBrowser->setHtml(QString::fromStdString(s.str()));
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::backClickedFromChild() {
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
#ifndef MAINWINDOW_H
|
||||
#define MAINWINDOW_H
|
||||
|
||||
enum WrongInputPageEnum { generalSettingsPage, tunnelsSettingsPage };
|
||||
|
||||
#include <QObject>
|
||||
#include <QMainWindow>
|
||||
#include <QPushButton>
|
||||
@ -104,12 +102,14 @@ class MainWindow;
|
||||
|
||||
class MainWindowItem : public QObject {
|
||||
Q_OBJECT
|
||||
private:
|
||||
ConfigOption option;
|
||||
QWidget* widgetToFocus;
|
||||
QString requirementToBeValid;
|
||||
const bool readOnly;
|
||||
public:
|
||||
MainWindowItem(ConfigOption option_, QWidget* widgetToFocus_, QString requirementToBeValid_) :
|
||||
option(option_), widgetToFocus(widgetToFocus_), requirementToBeValid(requirementToBeValid_) {}
|
||||
MainWindowItem(ConfigOption option_, QWidget* widgetToFocus_, QString requirementToBeValid_, bool readOnly_=false) :
|
||||
option(option_), widgetToFocus(widgetToFocus_), requirementToBeValid(requirementToBeValid_), readOnly(readOnly_) {}
|
||||
QWidget* getWidgetToFocus(){return widgetToFocus;}
|
||||
QString& getRequirementToBeValid() { return requirementToBeValid; }
|
||||
ConfigOption& getConfigOption() { return option; }
|
||||
@ -120,13 +120,14 @@ public:
|
||||
std::string optName="";
|
||||
if(!option.section.isEmpty())optName=option.section.toStdString()+std::string(".");
|
||||
optName+=option.option.toStdString();
|
||||
qDebug() << "loadFromConfigOption[" << optName.c_str() << "]";
|
||||
//qDebug() << "loadFromConfigOption[" << optName.c_str() << "]";
|
||||
boost::any programOption;
|
||||
i2p::config::GetOptionAsAny(optName, programOption);
|
||||
optionValue=programOption.empty()?boost::any(std::string(""))
|
||||
:boost::any_cast<boost::program_options::variable_value>(programOption).value();
|
||||
}
|
||||
virtual void saveToStringStream(std::stringstream& out){
|
||||
if(readOnly)return; //should readOnly items (conf=) error somewhere, instead of silently skipping save?
|
||||
if(isType<std::string>(optionValue)) {
|
||||
std::string v = boost::any_cast<std::string>(optionValue);
|
||||
if(v.empty())return;
|
||||
@ -136,7 +137,7 @@ public:
|
||||
std::string optName="";
|
||||
if(!option.section.isEmpty())optName=option.section.toStdString()+std::string(".");
|
||||
optName+=option.option.toStdString();
|
||||
qDebug() << "Writing option" << optName.c_str() << "of type" << rtti.c_str();
|
||||
//qDebug() << "Writing option" << optName.c_str() << "of type" << rtti.c_str();
|
||||
std::string sectionAsStdStr = option.section.toStdString();
|
||||
if(!option.section.isEmpty() &&
|
||||
sectionAsStdStr!=programOptionsWriterCurrentSection) {
|
||||
@ -172,8 +173,8 @@ class BaseStringItem : public MainWindowItem {
|
||||
public:
|
||||
QLineEdit* lineEdit;
|
||||
MainWindow *mainWindow;
|
||||
BaseStringItem(ConfigOption option_, QLineEdit* lineEdit_, QString requirementToBeValid_, MainWindow* mainWindow_):
|
||||
MainWindowItem(option_, lineEdit_, requirementToBeValid_),
|
||||
BaseStringItem(ConfigOption option_, QLineEdit* lineEdit_, QString requirementToBeValid_, MainWindow* mainWindow_, bool readOnly=false):
|
||||
MainWindowItem(option_, lineEdit_, requirementToBeValid_, readOnly),
|
||||
lineEdit(lineEdit_),
|
||||
mainWindow(mainWindow_)
|
||||
{};
|
||||
@ -195,10 +196,12 @@ public:
|
||||
virtual bool isValid(bool & alreadyDisplayedIfWrong);
|
||||
};
|
||||
class FileOrFolderChooserItem : public BaseStringItem {
|
||||
protected:
|
||||
const bool requireExistingFile;
|
||||
public:
|
||||
QPushButton* browsePushButton;
|
||||
FileOrFolderChooserItem(ConfigOption option_, QLineEdit* lineEdit_, QPushButton* browsePushButton_, MainWindow* mw) :
|
||||
BaseStringItem(option_, lineEdit_, QString(), mw), browsePushButton(browsePushButton_) {}
|
||||
FileOrFolderChooserItem(ConfigOption option_, QLineEdit* lineEdit_, QPushButton* browsePushButton_, MainWindow* mw, bool requireExistingFile_, bool readOnly) :
|
||||
BaseStringItem(option_, lineEdit_, QString(), mw, readOnly), requireExistingFile(requireExistingFile_), browsePushButton(browsePushButton_) {}
|
||||
virtual ~FileOrFolderChooserItem(){}
|
||||
};
|
||||
class FileChooserItem : public FileOrFolderChooserItem {
|
||||
@ -206,8 +209,8 @@ class FileChooserItem : public FileOrFolderChooserItem {
|
||||
private slots:
|
||||
void pushButtonReleased();
|
||||
public:
|
||||
FileChooserItem(ConfigOption option_, QLineEdit* lineEdit_, QPushButton* browsePushButton_, MainWindow* mw) :
|
||||
FileOrFolderChooserItem(option_, lineEdit_, browsePushButton_, mw) {
|
||||
FileChooserItem(ConfigOption option_, QLineEdit* lineEdit_, QPushButton* browsePushButton_, MainWindow* mw, bool requireExistingFile, bool readOnly) :
|
||||
FileOrFolderChooserItem(option_, lineEdit_, browsePushButton_, mw, requireExistingFile, readOnly) {
|
||||
QObject::connect(browsePushButton, SIGNAL(released()), this, SLOT(pushButtonReleased()));
|
||||
}
|
||||
};
|
||||
@ -216,8 +219,8 @@ class FolderChooserItem : public FileOrFolderChooserItem{
|
||||
private slots:
|
||||
void pushButtonReleased();
|
||||
public:
|
||||
FolderChooserItem(ConfigOption option_, QLineEdit* lineEdit_, QPushButton* browsePushButton_, MainWindow* mw) :
|
||||
FileOrFolderChooserItem(option_, lineEdit_, browsePushButton_, mw) {
|
||||
FolderChooserItem(ConfigOption option_, QLineEdit* lineEdit_, QPushButton* browsePushButton_, MainWindow* mw, bool requireExistingFolder) :
|
||||
FileOrFolderChooserItem(option_, lineEdit_, browsePushButton_, mw, requireExistingFolder, false) {
|
||||
QObject::connect(browsePushButton, SIGNAL(released()), this, SLOT(pushButtonReleased()));
|
||||
}
|
||||
};
|
||||
@ -290,7 +293,7 @@ public:
|
||||
virtual void installListeners(MainWindow *mainWindow);
|
||||
virtual void loadFromConfigOption(){
|
||||
MainWindowItem::loadFromConfigOption();
|
||||
qDebug() << "setting value for checkbox " << checkBox->text();
|
||||
//qDebug() << "setting value for checkbox " << checkBox->text();
|
||||
checkBox->setChecked(boost::any_cast<bool>(optionValue));
|
||||
}
|
||||
virtual void saveToStringStream(std::stringstream& out){
|
||||
@ -407,6 +410,7 @@ class DelayedSaveManagerImpl;
|
||||
class MainWindow : public QMainWindow {
|
||||
Q_OBJECT
|
||||
private:
|
||||
std::string currentLocalDestinationB32;
|
||||
std::shared_ptr<std::iostream> logStream;
|
||||
DelayedSaveManagerImpl* delayedSaveManagerPtr;
|
||||
DelayedSaveManager::DATA_SERIAL_TYPE dataSerial;
|
||||
@ -521,7 +525,7 @@ protected:
|
||||
//LogDestinationComboBoxItem* logOption;
|
||||
FileChooserItem* logFileNameOption;
|
||||
|
||||
FileChooserItem* initFileChooser(ConfigOption option, QLineEdit* fileNameLineEdit, QPushButton* fileBrowsePushButton);
|
||||
FileChooserItem* initFileChooser(ConfigOption option, QLineEdit* fileNameLineEdit, QPushButton* fileBrowsePushButton, bool requireExistingFile, bool readOnly=false);
|
||||
void initFolderChooser(ConfigOption option, QLineEdit* folderLineEdit, QPushButton* folderBrowsePushButton);
|
||||
//void initCombobox(ConfigOption option, QComboBox* comboBox);
|
||||
void initLogDestinationCombobox(ConfigOption option, QComboBox* comboBox);
|
||||
@ -541,12 +545,12 @@ protected:
|
||||
|
||||
public slots:
|
||||
/** returns false iff not valid items present and save was aborted */
|
||||
bool saveAllConfigs(bool focusOnTunnel, std::string tunnelNameToFocus="");
|
||||
void reloadTunnelsConfigAndUI(std::string tunnelNameToFocus);
|
||||
bool saveAllConfigs(bool reloadAfterSave, FocusEnum focusOn, std::string tunnelNameToFocus="", QWidget* widgetToFocus=nullptr);
|
||||
void reloadTunnelsConfigAndUI(std::string tunnelNameToFocus, QWidget* widgetToFocus);
|
||||
void reloadTunnelsConfigAndUI() { reloadTunnelsConfigAndUI("", nullptr); }
|
||||
|
||||
//focus none
|
||||
void reloadTunnelsConfigAndUI() { reloadTunnelsConfigAndUI(""); }
|
||||
void reloadTunnelsConfigAndUI_QString(const QString tunnelNameToFocus);
|
||||
void reloadTunnelsConfigAndUI_QString(QString tunnelNameToFocus);
|
||||
void addServerTunnelPushButtonReleased();
|
||||
void addClientTunnelPushButtonReleased();
|
||||
|
||||
@ -651,7 +655,7 @@ private:
|
||||
tunnelConfigs.erase(it);
|
||||
delete tc;
|
||||
}
|
||||
saveAllConfigs(false);
|
||||
saveAllConfigs(true, FocusEnum::noFocus);
|
||||
}
|
||||
|
||||
std::string GenerateNewTunnelName() {
|
||||
@ -688,7 +692,7 @@ private:
|
||||
sigType,
|
||||
cryptoType);
|
||||
|
||||
saveAllConfigs(true, name);
|
||||
saveAllConfigs(true, FocusEnum::focusOnTunnelName, name);
|
||||
}
|
||||
|
||||
void CreateDefaultServerTunnel() {//TODO dedup default values with ReadTunnelsConfig() and with ClientContext.cpp::ReadTunnels ()
|
||||
@ -726,7 +730,7 @@ private:
|
||||
cryptoType);
|
||||
|
||||
|
||||
saveAllConfigs(true, name);
|
||||
saveAllConfigs(true, FocusEnum::focusOnTunnelName, name);
|
||||
}
|
||||
|
||||
void ReadTunnelsConfig() //TODO deduplicate the code with ClientContext.cpp::ReadTunnels ()
|
||||
@ -769,16 +773,13 @@ private:
|
||||
std::string dest;
|
||||
if (type == I2P_TUNNELS_SECTION_TYPE_CLIENT || type == I2P_TUNNELS_SECTION_TYPE_UDPCLIENT) {
|
||||
dest = section.second.get<std::string> (I2P_CLIENT_TUNNEL_DESTINATION);
|
||||
std::cout << "had read tunnel dest: " << dest << std::endl;
|
||||
}
|
||||
int port = section.second.get<int> (I2P_CLIENT_TUNNEL_PORT);
|
||||
std::cout << "had read tunnel port: " << port << std::endl;
|
||||
// optional params
|
||||
std::string keys = section.second.get (I2P_CLIENT_TUNNEL_KEYS, "");
|
||||
std::string address = section.second.get (I2P_CLIENT_TUNNEL_ADDRESS, "127.0.0.1");
|
||||
int cryptoType = section.second.get<int>(I2P_CLIENT_TUNNEL_CRYPTO_TYPE, 0);
|
||||
int destinationPort = section.second.get<int>(I2P_CLIENT_TUNNEL_DESTINATION_PORT, 0);
|
||||
std::cout << "had read tunnel destinationPort: " << destinationPort << std::endl;
|
||||
i2p::data::SigningKeyType sigType = section.second.get (I2P_CLIENT_TUNNEL_SIGNATURE_TYPE, i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA256_P256);
|
||||
// I2CP
|
||||
std::map<std::string, std::string> options;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user