diff --git a/.gitignore b/.gitignore
index 2b880085b..6f9356d05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ Thumbs.db
*.pro.user
.kdev4
*.kdev4
+
+!supportlibs/libsam3/Makefile
diff --git a/.gitmodules b/.gitmodules
index c35876fc6..2f69bb7b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,3 +14,6 @@
[submodule "supportlibs/rapidjson"]
path = supportlibs/rapidjson
url = https://github.com/Tencent/rapidjson.git
+[submodule "supportlibs/libsam3"]
+ path = supportlibs/libsam3
+ url = https://github.com/i2p/libsam3.git
diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index da5f25ba4..30aee9671 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -156,7 +156,7 @@ rs_webui {
HEADERS += plugins/pluginmanager.h \
plugins/dlfcn_win32.h \
- rsitems/rspluginitems.h \
+ rsitems/rspluginitems.h \
util/i2pcommon.h \
util/rsinitedptr.h
@@ -393,7 +393,6 @@ HEADERS += pqi/authssl.h \
pqi/pqissl.h \
pqi/pqissllistener.h \
pqi/pqisslpersongrp.h \
- pqi/pqissli2pbob.h \
pqi/pqisslproxy.h \
pqi/pqistore.h \
pqi/pqistreamer.h \
@@ -454,7 +453,7 @@ HEADERS += rsitems/rsitem.h \
rsitems/rsgxsupdateitems.h \
rsitems/rsserviceinfoitems.h \
-HEADERS += services/autoproxy/p3i2pbob.h \
+HEADERS += \
services/rseventsservice.h \
services/autoproxy/rsautoproxymonitor.h \
services/p3msgservice.h \
@@ -558,7 +557,6 @@ SOURCES += pqi/authgpg.cc \
pqi/pqissl.cc \
pqi/pqissllistener.cc \
pqi/pqisslpersongrp.cc \
- pqi/pqissli2pbob.cpp \
pqi/pqisslproxy.cc \
pqi/pqistore.cc \
pqi/pqistreamer.cc \
@@ -616,7 +614,6 @@ SOURCES += serialiser/rsbaseserial.cc \
SOURCES += services/autoproxy/rsautoproxymonitor.cc \
services/rseventsservice.cc \
- services/autoproxy/p3i2pbob.cc \
services/p3msgservice.cc \
services/p3service.cc \
services/p3statusservice.cc \
@@ -1012,6 +1009,34 @@ rs_broadcast_discovery {
}
}
+rs_sam3 {
+ SOURCES += \
+ services/autoproxy/p3i2psam3.cpp \
+ pqi/pqissli2psam3.cpp \
+
+ HEADERS += \
+ services/autoproxy/p3i2psam3.h \
+ pqi/pqissli2psam3.h \
+}
+
+rs_sam3_libsam3 {
+ DUMMYQMAKECOMPILERINPUT = FORCE
+ libsam3.name = Generating libsam3.
+ libsam3.input = DUMMYQMAKECOMPILERINPUT
+ libsam3.output = $$clean_path($${LIBSAM3_BUILD_PATH}/libsam3.a)
+ libsam3.CONFIG += target_predeps combine
+ libsam3.variable_out = PRE_TARGETDEPS
+ libsam3.commands = \
+ cd $${RS_SRC_PATH} && ( \
+ git submodule update --init supportlibs/libsam3 || \
+ true ) && \
+ mkdir -p $${UDP_DISCOVERY_BUILD_PATH} && \
+ cp -r $${LIBSAM3_SRC_PATH}/* $${LIBSAM3_BUILD_PATH} && \
+ cd $${LIBSAM3_BUILD_PATH} && \
+ $(MAKE) build
+ QMAKE_EXTRA_COMPILERS += libsam3
+}
+
###########################################################################################################
# OLD CONFIG OPTIONS.
# Not used much - but might be useful one day.
diff --git a/libretroshare/src/pqi/pqissl.cc b/libretroshare/src/pqi/pqissl.cc
index 76d447cc8..1cfff8fbd 100644
--- a/libretroshare/src/pqi/pqissl.cc
+++ b/libretroshare/src/pqi/pqissl.cc
@@ -1742,6 +1742,13 @@ bool pqissl::moretoread(uint32_t usec)
{
rslog(RSL_ALERT, pqisslzone,
"pqissl::moretoread() Select ERROR!");
+ RS_WARN(strerror(errno));
+
+ if (errno == EBADF) {
+ // happens when SAM is shut down
+ rslog(RSL_ALERT, pqisslzone, "pqissl::moretoread() -> calling reset()");
+ reset_locked();
+ }
return 0;
}
diff --git a/libretroshare/src/pqi/pqissli2pbob.cpp b/libretroshare/src/pqi/pqissli2pbob.cpp
deleted file mode 100644
index 5551ce788..000000000
--- a/libretroshare/src/pqi/pqissli2pbob.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * libretroshare/src/pqi: pqissli2pbob.cc *
- * *
- * libretroshare: retroshare core library *
- * *
- * Copyright 2016 by Sehraf *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public License *
- * along with this program. If not, see . *
- * *
- *******************************************************************************/
-#include "pqissli2pbob.h"
-
-bool pqissli2pbob::connect_parameter(uint32_t type, const std::string &value)
-{
- if (type == NET_PARAM_CONNECT_DOMAIN_ADDRESS)
- {
- RS_STACK_MUTEX(mSslMtx);
- // a new line must be appended!
- mI2pAddr = value + '\n';
- return true;
- }
-
- return pqissl::connect_parameter(type, value);
-}
-
-int pqissli2pbob::Basic_Connection_Complete()
-{
- int ret;
-
- if ((ret = pqissl::Basic_Connection_Complete()) != 1)
- {
- // basic connection not complete.
- return ret;
- }
-
- // send addr. (new line is already appended)
- ret = send(sockfd, mI2pAddr.c_str(), mI2pAddr.length(), 0);
- if (ret != (int)mI2pAddr.length())
- return -1;
- return 1;
-}
diff --git a/libretroshare/src/pqi/pqissli2pbob.h b/libretroshare/src/pqi/pqissli2pbob.h
deleted file mode 100644
index b1a643a75..000000000
--- a/libretroshare/src/pqi/pqissli2pbob.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * libretroshare/src/pqi: pqissli2pbob.h *
- * *
- * libretroshare: retroshare core library *
- * *
- * Copyright 2016 by Sehraf *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public License *
- * along with this program. If not, see . *
- * *
- *******************************************************************************/
-#ifndef PQISSLI2PBOB_H
-#define PQISSLI2PBOB_H
-
-#include "pqi/pqissl.h"
-
-/*
- * This class is a minimal varied version of pqissl to work with I2P BOB tunnels.
- * The only difference is that the [.b32].i2p addresses must be sent first.
- *
- * Everything else is untouched.
- */
-
-class pqissli2pbob : public pqissl
-{
-public:
- pqissli2pbob(pqissllistener *l, PQInterface *parent, p3LinkMgr *lm)
- : pqissl(l, parent, lm) {}
-
- // NetInterface interface
-public:
- bool connect_parameter(uint32_t type, const std::string &value);
-
- // pqissl interface
-protected:
- int Basic_Connection_Complete();
-
-private:
- std::string mI2pAddr;
-};
-
-#endif // PQISSLI2PBOB_H
diff --git a/libretroshare/src/pqi/pqissli2psam3.cpp b/libretroshare/src/pqi/pqissli2psam3.cpp
new file mode 100644
index 000000000..1e0f5d433
--- /dev/null
+++ b/libretroshare/src/pqi/pqissli2psam3.cpp
@@ -0,0 +1,261 @@
+#include "pqissli2psam3.h"
+
+#include
+
+RS_SET_CONTEXT_DEBUG_LEVEL(2)
+
+static constexpr int pqiDone = 1;
+static constexpr int pqiWait = 0;
+static constexpr int pqiError = -1;
+
+pqissli2psam3::pqissli2psam3(pqissllistener *l, PQInterface *parent, p3LinkMgr *lm)
+ : pqissl(l, parent, lm), mState(pqisslSam3State::NONE), mI2pAddrB32(), mI2pAddrLong()
+{
+ RS_DBG4();
+ mConn = nullptr;
+}
+
+bool pqissli2psam3::connect_parameter(uint32_t type, const std::string &value)
+{
+ RS_DBG4();
+
+ if (type == NET_PARAM_CONNECT_DOMAIN_ADDRESS)
+ {
+ RS_DBG1("got addr:", value);
+ RS_STACK_MUTEX(mSslMtx);
+ mI2pAddrB32 = value;
+ return true;
+ }
+
+ return pqissl::connect_parameter(type, value);
+}
+
+int pqissli2psam3::Initiate_Connection()
+{
+ RS_DBG4();
+
+ if(waiting != WAITING_DELAY)
+ {
+ RS_ERR("Already Attempt in Progress!");
+ return pqiError;
+ }
+
+ switch (mState) {
+ case(pqisslSam3State::NONE):
+ RS_DBG2("NONE");
+ {
+ if(mConn) {
+ // how did we end up here?
+ RS_ERR("state is NONE but a connection is existing?!");
+ }
+ mConn = 0;
+ // get SAM session
+ mConn = 0;
+ samSettings ss;
+ ss.session = nullptr;
+ rsAutoProxyMonitor::taskSync(autoProxyType::I2PSAM3, autoProxyTask::getSettings, static_cast(&ss));
+
+ if (!!ss.session) {
+ RS_DBG3("NONE->DO_LOOKUP");
+ mState = pqisslSam3State::DO_LOOKUP;
+ } else {
+ RS_DBG3("NONE->DO_LOOKUP NOPE", ss.session);
+ }
+ }
+ break;
+ case(pqisslSam3State::DO_LOOKUP):
+ RS_DBG1("DO_LOOKUP");
+
+ if (!mI2pAddrLong.empty()) {
+ // skip lookup, it is highly unlikely/impossible for a public key to change (isn't it?)
+ mState = pqisslSam3State::WAIT_LOOKUP;
+ break;
+ }
+
+ {
+ i2p::address *addr = new i2p::address;
+ addr->clear();
+ addr->base32 = mI2pAddrB32;
+ rsAutoProxyMonitor::taskAsync(autoProxyType::I2PSAM3, autoProxyTask::lookupKey, this, static_cast(addr));
+ }
+ mState = pqisslSam3State::WAIT_LOOKUP;
+ break;
+ case(pqisslSam3State::DO_CONNECT):
+ RS_DBG2("DO_CONNECT");
+
+ {
+ auto wrapper = new samEstablishConnectionWrapper();
+ wrapper->address.clear();
+ wrapper->address.publicKey = mI2pAddrLong;
+ wrapper->connection = nullptr;
+
+ rsAutoProxyMonitor::taskAsync(autoProxyType::I2PSAM3, autoProxyTask::establishConnection, this, static_cast(wrapper));
+ }
+ mState = pqisslSam3State::WAIT_CONNECT;
+ break;
+ case(pqisslSam3State::DONE):
+ RS_DBG2("DONE");
+
+ if (setupSocket())
+ return pqiDone;
+ return pqiError;
+
+ /* waiting */
+ case(pqisslSam3State::WAIT_LOOKUP):
+ RS_DBG3("WAIT_LOOKUP");
+ break;
+ case(pqisslSam3State::WAIT_CONNECT):
+ RS_DBG3("WAIT_CONNECT");
+ break;
+ }
+ return pqiWait;
+}
+
+int pqissli2psam3::net_internal_close(int fd)
+{
+ RS_DBG4();
+
+ // sanity check
+ if (mConn && fd != mConn->fd) {
+ // this should never happen!
+ RS_ERR("fd != mConn");
+// sam3CloseConnection(mConn);
+ }
+
+ // now to the actuall closing
+ int ret = pqissl::net_internal_close(fd);
+
+ rsAutoProxyMonitor::taskAsync(autoProxyType::I2PSAM3, autoProxyTask::closeConnection, this, mConn);
+
+ // finally cleanup
+ mConn = 0;
+ mState = pqisslSam3State::NONE;
+
+ return ret;
+}
+
+void pqissli2psam3::taskFinished(taskTicket *&ticket)
+{
+ RS_DBG4();
+
+ switch (ticket->task) {
+ case autoProxyTask::lookupKey:
+ {
+ auto addr = static_cast(ticket->data);
+
+ RS_STACK_MUTEX(mSslMtx);
+ if (ticket->result == autoProxyStatus::ok) {
+ mI2pAddrLong = addr->publicKey;
+ mState = pqisslSam3State::DO_CONNECT;
+ } else {
+ waiting = WAITING_FAIL_INTERFACE;
+ }
+
+ delete addr;
+ ticket->data = nullptr;
+ addr = nullptr;
+ }
+ break;
+ case autoProxyTask::establishConnection:
+ {
+ auto wrapper = static_cast(ticket->data);
+
+ RS_STACK_MUTEX(mSslMtx);
+ if (ticket->result == autoProxyStatus::ok) {
+ mConn = wrapper->connection;
+ mState = pqisslSam3State::DONE;
+ } else {
+ waiting = WAITING_FAIL_INTERFACE;
+ }
+
+ delete wrapper;
+ ticket->data = nullptr;
+ wrapper = nullptr;
+ }
+ break;
+ case autoProxyTask::closeConnection:
+ // nothing to do here
+ break;
+ default:
+ RS_WARN("unkown task", ticket->task);
+ }
+
+ // clean up!
+ delete ticket;
+ ticket = nullptr;
+}
+
+bool pqissli2psam3::setupSocket()
+{
+ /*
+ * This function contains the generis part from pqissl::Initiate_Connection()
+ */
+ int err;
+ int osock = mConn->fd;
+
+ err = unix_fcntl_nonblock(osock);
+ if (err < 0)
+ {
+ RS_ERR("Cannot make socket NON-Blocking:", err);
+
+ waiting = WAITING_FAIL_INTERFACE;
+ net_internal_close(osock);
+ return false;
+ }
+
+#ifdef WINDOWS_SYS
+ /* Set TCP buffer size for Windows systems */
+
+ int sockbufsize = 0;
+ int size = sizeof(int);
+
+ err = getsockopt(osock, SOL_SOCKET, SO_RCVBUF, (char *)&sockbufsize, &size);
+#ifdef PQISSL_DEBUG
+ if (err == 0) {
+ std::cerr << "pqissl::Initiate_Connection: Current TCP receive buffer size " << sockbufsize << std::endl;
+ } else {
+ std::cerr << "pqissl::Initiate_Connection: Error getting TCP receive buffer size. Error " << err << std::endl;
+ }
+#endif
+
+ sockbufsize = 0;
+
+ err = getsockopt(osock, SOL_SOCKET, SO_SNDBUF, (char *)&sockbufsize, &size);
+#ifdef PQISSL_DEBUG
+ if (err == 0) {
+ std::cerr << "pqissl::Initiate_Connection: Current TCP send buffer size " << sockbufsize << std::endl;
+ } else {
+ std::cerr << "pqissl::Initiate_Connection: Error getting TCP send buffer size. Error " << err << std::endl;
+ }
+#endif
+
+ sockbufsize = WINDOWS_TCP_BUFFER_SIZE;
+
+ err = setsockopt(osock, SOL_SOCKET, SO_RCVBUF, (char *)&sockbufsize, sizeof(sockbufsize));
+#ifdef PQISSL_DEBUG
+ if (err == 0) {
+ std::cerr << "pqissl::Initiate_Connection: TCP receive buffer size set to " << sockbufsize << std::endl;
+ } else {
+ std::cerr << "pqissl::Initiate_Connection: Error setting TCP receive buffer size. Error " << err << std::endl;
+ }
+#endif
+
+ err = setsockopt(osock, SOL_SOCKET, SO_SNDBUF, (char *)&sockbufsize, sizeof(sockbufsize));
+#ifdef PQISSL_DEBUG
+ if (err == 0) {
+ std::cerr << "pqissl::Initiate_Connection: TCP send buffer size set to " << sockbufsize << std::endl;
+ } else {
+ std::cerr << "pqissl::Initiate_Connection: Error setting TCP send buffer size. Error " << err << std::endl;
+ }
+#endif
+#endif // WINDOWS_SYS
+
+
+ mTimeoutTS = time(NULL) + mConnectTimeout;
+ //std::cerr << "Setting Connect Timeout " << mConnectTimeout << " Seconds into Future " << std::endl;
+
+ waiting = WAITING_SOCK_CONNECT;
+ sockfd = osock;
+
+ return true;
+}
diff --git a/libretroshare/src/pqi/pqissli2psam3.h b/libretroshare/src/pqi/pqissli2psam3.h
new file mode 100644
index 000000000..90fdff6e0
--- /dev/null
+++ b/libretroshare/src/pqi/pqissli2psam3.h
@@ -0,0 +1,47 @@
+#ifndef PQISSLI2PSAM3_H
+#define PQISSLI2PSAM3_H
+
+#include "pqi/pqissl.h"
+#include "services/autoproxy/rsautoproxymonitor.h"
+#include "services/autoproxy/p3i2psam3.h"
+
+// Use a state machine as the whole pqi code is designed around them and some operation (like lookup) might be blocking
+enum class pqisslSam3State : uint8_t {
+ NONE = 0,
+ DO_LOOKUP,
+ WAIT_LOOKUP,
+ DO_CONNECT,
+ WAIT_CONNECT,
+ DONE
+};
+
+class pqissli2psam3 : public pqissl, public autoProxyCallback
+{
+public:
+ pqissli2psam3(pqissllistener *l, PQInterface *parent, p3LinkMgr *lm);
+
+ // NetInterface interface
+public:
+ bool connect_parameter(uint32_t type, const std::string &value);
+
+ // pqissl interface
+protected:
+ int Initiate_Connection();
+ int net_internal_close(int fd);
+
+ // autoProxyCallback interface
+public:
+ void taskFinished(taskTicket *&ticket);
+
+private:
+ bool setupSocket();
+
+private:
+ pqisslSam3State mState;
+ std::string mI2pAddrB32;
+ std::string mI2pAddrLong;
+
+ Sam3Connection *mConn;
+};
+
+#endif // PQISSLI2PSAM3_H
diff --git a/libretroshare/src/pqi/pqissllistener.h b/libretroshare/src/pqi/pqissllistener.h
index 85af2d869..800ca876b 100644
--- a/libretroshare/src/pqi/pqissllistener.h
+++ b/libretroshare/src/pqi/pqissllistener.h
@@ -186,8 +186,8 @@ public:
virtual int finaliseConnection(int fd, SSL *ssl, const RsPeerId& peerId,
const sockaddr_storage &raddr);
+ RS_SET_CONTEXT_DEBUG_LEVEL(2)
+
private:
std::map listenaddr;
-
- RS_SET_CONTEXT_DEBUG_LEVEL(2)
};
diff --git a/libretroshare/src/pqi/pqisslpersongrp.cc b/libretroshare/src/pqi/pqisslpersongrp.cc
index 7016a2fa6..16112c744 100644
--- a/libretroshare/src/pqi/pqisslpersongrp.cc
+++ b/libretroshare/src/pqi/pqisslpersongrp.cc
@@ -46,7 +46,7 @@ static struct RsLog::logInfo pqipersongrpzoneInfo = {RsLog::Default, "pqipersong
#endif
#include "pqi/pqisslproxy.h"
-#include "pqi/pqissli2pbob.h"
+#include "pqi/pqissli2psam3.h"
pqilistener * pqisslpersongrp::locked_createListener(const struct sockaddr_storage &laddr)
{
@@ -74,26 +74,26 @@ pqiperson * pqisslpersongrp::locked_createPerson(const RsPeerId& id, pqilistener
std::cerr << std::endl;
#endif
- // Use pqicI2PBOB for I2P
- pqiconnect *pqicSOCKSProxy, *pqicI2PBOB;
+ // Use pqicI2P for I2P
+ pqiconnect *pqicSOCKSProxy, *pqicI2P;
{
pqisslproxy *pqis = new pqisslproxy((pqissllistener *) listener, pqip, mLinkMgr);
RsSerialiser *rss = new RsSerialiser();
rss->addSerialType(new RsRawSerialiser());
pqicSOCKSProxy = new pqiconnect(pqip, rss, pqis);
}
- if (rsAutoProxyMonitor::instance()->isEnabled(autoProxyType::I2PBOB))
+
+ if (rsAutoProxyMonitor::instance()->isEnabled(autoProxyType::I2PSAM3))
{
- pqissli2pbob *pqis = new pqissli2pbob((pqissllistener *) listener, pqip, mLinkMgr);
+ pqissli2psam3 *pqis = new pqissli2psam3((pqissllistener *) listener, pqip, mLinkMgr);
RsSerialiser *rss = new RsSerialiser();
rss->addSerialType(new RsRawSerialiser());
- pqicI2PBOB = new pqiconnect(pqip, rss, pqis);
+ pqicI2P = new pqiconnect(pqip, rss, pqis);
} else {
- pqicI2PBOB = pqicSOCKSProxy;
+ pqicI2P = pqicSOCKSProxy;
}
-
/* first select type based on peer */
uint32_t typePeer = mPeerMgr->getHiddenType(id);
switch (typePeer) {
@@ -101,7 +101,7 @@ pqiperson * pqisslpersongrp::locked_createPerson(const RsPeerId& id, pqilistener
pqip -> addChildInterface(PQI_CONNECT_HIDDEN_TOR_TCP, pqicSOCKSProxy);
break;
case RS_HIDDEN_TYPE_I2P:
- pqip -> addChildInterface(PQI_CONNECT_HIDDEN_I2P_TCP, pqicI2PBOB);
+ pqip -> addChildInterface(PQI_CONNECT_HIDDEN_I2P_TCP, pqicI2P);
break;
default:
/* peer is not a hidden one but we are */
@@ -109,7 +109,7 @@ pqiperson * pqisslpersongrp::locked_createPerson(const RsPeerId& id, pqilistener
uint32_t typeOwn = mPeerMgr->getHiddenType(AuthSSL::getAuthSSL()->OwnId());
switch (typeOwn) {
case RS_HIDDEN_TYPE_I2P:
- pqip -> addChildInterface(PQI_CONNECT_HIDDEN_I2P_TCP, pqicI2PBOB);
+ pqip -> addChildInterface(PQI_CONNECT_HIDDEN_I2P_TCP, pqicI2P);
break;
default:
/* this case shouldn't happen! */
diff --git a/libretroshare/src/retroshare/rsinit.h b/libretroshare/src/retroshare/rsinit.h
index 73fea2684..d26e7ac05 100644
--- a/libretroshare/src/retroshare/rsinit.h
+++ b/libretroshare/src/retroshare/rsinit.h
@@ -195,7 +195,7 @@ public:
/*
* Setup Hidden Location;
*/
- static void SetHiddenLocation(const std::string& hiddenaddress, uint16_t port, bool useBob);
+ static void SetHiddenLocation(const std::string& hiddenaddress, uint16_t port, bool useI2p);
static bool LoadPassword(const std::string& passwd) ;
diff --git a/libretroshare/src/rsserver/p3face.h b/libretroshare/src/rsserver/p3face.h
index 661cb244f..648e39123 100644
--- a/libretroshare/src/rsserver/p3face.h
+++ b/libretroshare/src/rsserver/p3face.h
@@ -43,7 +43,7 @@
class p3heartbeat;
class p3discovery2;
-class p3I2pBob;
+class p3I2pSam3;
/* GXS Classes - just declare the classes.
so we don't have to totally recompile to switch */
@@ -161,8 +161,8 @@ public:
p3ChatService *chatSrv;
p3StatusService *mStatusSrv;
p3GxsTunnelService *mGxsTunnels;
-#ifdef RS_USE_I2P_BOB
- p3I2pBob *mI2pBob;
+#ifdef RS_USE_I2P_SAM3
+ p3I2pSam3 *mI2pSam3;
#endif
// This list contains all threaded services. It will be used to shut them down properly.
diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
index 8449a9e3e..ad39f46a1 100644
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@@ -170,7 +170,7 @@ struct RsInitConfig
std::string hiddenNodeAddress;
uint16_t hiddenNodePort;
- bool hiddenNodeI2PBOB;
+ bool hiddenNodeI2P;
/* Logging */
bool haveLogFile;
@@ -664,13 +664,13 @@ void RsInit::setAutoLogin(bool autoLogin){
}
/* Setup Hidden Location; */
-void RsInit::SetHiddenLocation(const std::string& hiddenaddress, uint16_t port, bool useBob)
+void RsInit::SetHiddenLocation(const std::string& hiddenaddress, uint16_t port, bool useI2p)
{
/* parse the bugger (todo) */
rsInitConfig->hiddenNodeSet = true;
rsInitConfig->hiddenNodeAddress = hiddenaddress;
rsInitConfig->hiddenNodePort = port;
- rsInitConfig->hiddenNodeI2PBOB = useBob;
+ rsInitConfig->hiddenNodeI2P = useI2p;
}
@@ -717,7 +717,7 @@ RsGRouter *rsGRouter = NULL ;
# include "rs_upnp/upnphandler_miniupnp.h"
#endif // def RS_USE_LIBUPNP
-#include "services/autoproxy/p3i2pbob.h"
+#include "services/autoproxy/p3i2psam3.h"
#include "services/autoproxy/rsautoproxymonitor.h"
#include "services/p3gxsreputation.h"
@@ -923,9 +923,9 @@ int RsServer::StartupRetroShare()
mNetMgr->setManagers(mPeerMgr, mLinkMgr);
rsAutoProxyMonitor *autoProxy = rsAutoProxyMonitor::instance();
-#ifdef RS_USE_I2P_BOB
- mI2pBob = new p3I2pBob(mPeerMgr);
- autoProxy->addProxy(autoProxyType::I2PBOB, mI2pBob);
+#ifdef RS_USE_I2P_SAM3
+ mI2pSam3 = new p3I2pSam3(mPeerMgr);
+ autoProxy->addProxy(autoProxyType::I2PSAM3, mI2pSam3);
#endif
//load all the SSL certs as friends
@@ -1655,8 +1655,9 @@ int RsServer::StartupRetroShare()
mConfigMgr->addConfiguration("wire.cfg", wire_ns);
#endif
#endif //RS_ENABLE_GXS
-#ifdef RS_USE_I2P_BOB
- mConfigMgr->addConfiguration("I2PBOB.cfg", mI2pBob);
+#ifdef RS_USE_I2P_SAM3
+ // to make migration easiert, SAM will use BOBs configuration, as they are compatible / the same.
+ mConfigMgr->addConfiguration("I2PBOB.cfg", mI2pSam3);
#endif
mPluginsManager->addConfigurations(mConfigMgr) ;
@@ -1709,34 +1710,33 @@ int RsServer::StartupRetroShare()
{
std::cout << "RsServer::StartupRetroShare setting up hidden locations" << std::endl;
- if (rsInitConfig->hiddenNodeI2PBOB) {
- std::cout << "RsServer::StartupRetroShare setting up BOB" << std::endl;
+ if (rsInitConfig->hiddenNodeI2P) {
+ std::cout << "RsServer::StartupRetroShare setting up SAMv3" << std::endl;
// we need a local port!
mNetMgr->checkNetAddress();
// add i2p proxy
- // bob will use this address
sockaddr_storage i2pInstance;
sockaddr_storage_ipv4_aton(i2pInstance, rsInitConfig->hiddenNodeAddress.c_str());
mPeerMgr->setProxyServerAddress(RS_HIDDEN_TYPE_I2P, i2pInstance);
std::string addr; // will be set by auto proxy service
- uint16_t port = rsInitConfig->hiddenNodePort; // unused by bob
+ uint16_t port; // unused by SAM
- bool r = autoProxy->initialSetup(autoProxyType::I2PBOB, addr, port);
+ bool r = autoProxy->initialSetup(autoProxyType::I2PSAM3, addr, port);
if (r && !addr.empty()) {
mPeerMgr->setupHiddenNode(addr, port);
- // now enable bob
- bobSettings bs;
- autoProxy->taskSync(autoProxyType::I2PBOB, autoProxyTask::getSettings, &bs);
- bs.enable = true;
- autoProxy->taskSync(autoProxyType::I2PBOB, autoProxyTask::setSettings, &bs);
+ // now enable SAM
+ samSettings ss;
+ autoProxy->taskSync(autoProxyType::I2PSAM3, autoProxyTask::getSettings, &ss);
+ ss.enable = true;
+ autoProxy->taskSync(autoProxyType::I2PSAM3, autoProxyTask::setSettings, &ss);
} else {
std::cerr << "RsServer::StartupRetroShare failed to receive keys" << std::endl;
- /// TODO add notify for failed bob setup
+ /// TODO add notify for failed i2p setup
}
} else {
mPeerMgr->setupHiddenNode(rsInitConfig->hiddenNodeAddress, rsInitConfig->hiddenNodePort);
@@ -1758,19 +1758,17 @@ int RsServer::StartupRetroShare()
if (rsInitConfig->hiddenNodeSet) {
// newly created location
// mNetMgr->checkNetAddress() will setup ports for us
+
+#if 0 // this was used for BOB but is not requires for SAMv3
// trigger updates for auto proxy services
std::vector types;
-
- // i2p bob need to rebuild its command map
- types.push_back(autoProxyType::I2PBOB);
-
rsAutoProxyMonitor::taskSync(types, autoProxyTask::reloadConfig);
+#endif
}
/**************************************************************************/
/* startup (stuff dependent on Ids/peers is after this point) */
/**************************************************************************/
-
autoProxy->startAll();
pqih->init_listener();
@@ -1803,8 +1801,8 @@ int RsServer::StartupRetroShare()
/**************************************************************************/
// auto proxy threads
-#ifdef RS_USE_I2P_BOB
- startServiceThread(mI2pBob, "I2P-BOB");
+#ifdef RS_USE_I2P_SAM3
+ startServiceThread(mI2pSam3, "I2P-SAM3");
#endif
#ifdef RS_ENABLE_GXS
diff --git a/libretroshare/src/services/autoproxy/p3i2pbob.cc b/libretroshare/src/services/autoproxy/p3i2pbob.cc
deleted file mode 100644
index f9eb3d9b3..000000000
--- a/libretroshare/src/services/autoproxy/p3i2pbob.cc
+++ /dev/null
@@ -1,1117 +0,0 @@
-/*******************************************************************************
- * libretroshare/src/services/autoproxy: p3i2pbob.cc *
- * *
- * libretroshare: retroshare core library *
- * *
- * Copyright 2016 by Sehraf *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public License *
- * along with this program. If not, see . *
- * *
- *******************************************************************************/
-#include
-#include /* for usleep() */
-
-#include "p3i2pbob.h"
-
-#include "pqi/p3peermgr.h"
-#include "rsitems/rsconfigitems.h"
-#include "util/radix32.h"
-#include "util/radix64.h"
-#include "util/rsdebug.h"
-#include "util/rstime.h"
-#include "util/rsprint.h"
-#include "util/rsrandom.h"
-
-static const std::string kConfigKeyBOBEnable = "BOB_ENABLE";
-static const std::string kConfigKeyBOBKey = "BOB_KEY";
-static const std::string kConfigKeyBOBAddr = "BOB_ADDR";
-static const std::string kConfigKeyInLength = "IN_LENGTH";
-static const std::string kConfigKeyInQuantity = "IN_QUANTITY";
-static const std::string kConfigKeyInVariance = "IN_VARIANCE";
-static const std::string kConfigKeyOutLength = "OUT_LENGTH";
-static const std::string kConfigKeyOutQuantity = "OUT_QUANTITY";
-static const std::string kConfigKeyOutVariance = "OUT_VARIANCE";
-
-/// Sleep duration for receiving loop in error/no-data case
-static const useconds_t sleepTimeRecv = 250; // times 1000 = 250ms
-/// Sleep duration for everything else
-static const useconds_t sleepTimeWait = 50; // times 1000 = 50ms or 0.05s
-static const int sleepFactorDefault = 10; // 0.5s
-static const int sleepFactorFast = 1; // 0.05s
-static const int sleepFactorSlow = 20; // 1s
-
-static const rstime_t selfCheckPeroid = 30;
-
-void doSleep(useconds_t timeToSleepMS) {
- rstime::rs_usleep((useconds_t) (timeToSleepMS * 1000));
-}
-
-p3I2pBob::p3I2pBob(p3PeerMgr *peerMgr)
- : RsTickingThread(), p3Config(),
- mState(csIdel), mTask(ctIdle),
- mStateOld(csIdel), mTaskOld(ctIdle),
- mBOBState(bsCleared), mPeerMgr(peerMgr),
- mConfigLoaded(false), mSocket(0),
- mLastProxyCheck(time(NULL)),
- mProcessing(NULL), mLock("I2P-BOB")
-{
- // set defaults
- mSetting.initDefault();
-
- mCommands.clear();
-}
-
-bool p3I2pBob::isEnabled()
-{
- RS_STACK_MUTEX(mLock);
- return mSetting.enable;
-}
-
-bool p3I2pBob::initialSetup(std::string &addr, uint16_t &/*port*/)
-{
- RS_DBG("");
-
- // update config
- {
- RS_STACK_MUTEX(mLock);
- if (!mConfigLoaded) {
- finalizeSettings_locked();
- mConfigLoaded = true;
- } else {
- updateSettings_locked();
- }
- }
-
- RS_DBG("config updated");
-
- // request keys
- // p3I2pBob::stateMachineBOB expects mProcessing to be set therefore
- // we create this fake ticket without a callback or data
- // ticket gets deleted later by this service
- taskTicket *fakeTicket = rsAutoProxyMonitor::getTicket();
- fakeTicket->task = autoProxyTask::receiveKey;
- processTaskAsync(fakeTicket);
-
- RS_DBG("fakeTicket requested");
-
- // now start thread
- start("I2P-BOB gen key");
-
- RS_DBG("thread started");
-
- int counter = 0;
- // wait for keys
- for(;;) {
- doSleep(sleepTimeWait * sleepFactorDefault);
-
- RS_STACK_MUTEX(mLock);
-
- // wait for tast change
- if (mTask != ctRunGetKeys)
- break;
-
- if (++counter > 30) {
- RS_DBG4("timeout!");
- return false;
- }
- }
-
- RS_DBG("got keys");
-
- // stop thread
- fullstop();
-
- RS_DBG("thread stopped");
-
- {
- RS_STACK_MUTEX(mLock);
- addr = mSetting.address.base32;
- }
-
- RS_DBG4("addr ", addr);
-
- return true;
-}
-
-void p3I2pBob::processTaskAsync(taskTicket *ticket)
-{
- switch (ticket->task) {
- case autoProxyTask::start:
- case autoProxyTask::stop:
- case autoProxyTask::receiveKey:
- case autoProxyTask::proxyStatusCheck:
- {
- RS_STACK_MUTEX(mLock);
- mPending.push(ticket);
- }
- break;
- default:
- RS_DBG("unknown task");
- rsAutoProxyMonitor::taskError(ticket);
- break;
- }
-}
-
-void p3I2pBob::processTaskSync(taskTicket *ticket)
-{
- bool data = !!ticket->data;
-
- // check wether we can process the task immediately or have to queue it
- switch (ticket->task) {
- case autoProxyTask::status:
- // check if everything needed is set
- if (!data) {
- RS_DBG("autoProxyTask::status data is missing");
- rsAutoProxyMonitor::taskError(ticket);
- break;
- }
-
- // get states
- getStates((struct bobStates*)ticket->data);
-
- // finish task
- rsAutoProxyMonitor::taskDone(ticket, autoProxyStatus::ok);
- break;
- case autoProxyTask::getSettings:
- // check if everything needed is set
- if (!data) {
- RS_DBG("autoProxyTask::getSettings data is missing");
- rsAutoProxyMonitor::taskError(ticket);
- break;
- }
-
- // get settings
- getBOBSettings((struct bobSettings *)ticket->data);
-
- // finish task
- rsAutoProxyMonitor::taskDone(ticket, autoProxyStatus::ok);
- break;
- case autoProxyTask::setSettings:
- // check if everything needed is set
- if (!data) {
- RS_DBG("autoProxyTask::setSettings data is missing");
- rsAutoProxyMonitor::taskError(ticket);
- break;
- }
-
- // set settings
- setBOBSettings((struct bobSettings *)ticket->data);
-
- // finish task
- rsAutoProxyMonitor::taskDone(ticket, autoProxyStatus::ok);
- break;
- case autoProxyTask::reloadConfig:
- {
- RS_STACK_MUTEX(mLock);
- updateSettings_locked();
- }
- rsAutoProxyMonitor::taskDone(ticket, autoProxyStatus::ok);
- break;
- case autoProxyTask::getErrorInfo:
- if (!data) {
- RS_DBG("autoProxyTask::getErrorInfo data is missing");
- rsAutoProxyMonitor::taskError(ticket);
- } else {
- RS_STACK_MUTEX(mLock);
- *(std::string *)ticket->data = mErrorMsg;
- rsAutoProxyMonitor::taskDone(ticket, autoProxyStatus::ok);
- }
- break;
- default:
- RS_DBG("unknown task");
- rsAutoProxyMonitor::taskError(ticket);
- break;
- }
-}
-
-bool inline isAnswerOk(const std::string &answer) {
- return (answer.compare(0, 2, "OK") == 0);
-}
-
-bool inline isTunnelActiveError(const std::string &answer) {
- return answer.compare(0, 22, "ERROR tunnel is active") == 0;
-}
-
-void p3I2pBob::threadTick()
-{
- int sleepTime = 0;
- {
- RS_STACK_MUTEX(mLock);
- RS_DBG4("data_tick mState: ", mState, " mTask: ", mTask, " mBOBState: ", mBOBState, " mPending: ", mPending.size());
- }
-
- sleepTime += stateMachineController();
- sleepTime += stateMachineBOB();
-
- sleepTime >>= 1;
-
- // sleep outisde of lock!
- doSleep(sleepTime * sleepTimeWait);
-}
-
-int p3I2pBob::stateMachineBOB()
-{
- std::string answer;
- bobStateInfo currentState;
-
- {
- RS_STACK_MUTEX(mLock);
- if (mBOBState == bsCleared || !mConfigLoaded) {
- // we don't have work to do - sleep longer
- return sleepFactorSlow;
- }
-
- // get next command
- currentState = mCommands[mBOBState];
- }
-
- // this call can take a while
- // do NOT hold the lock
- answer = executeCommand(currentState.command);
-
- // can hold the lock for the rest of the function
- RS_STACK_MUTEX(mLock);
-
- // special state first
- if (mBOBState == bsList) {
- int counter = 0;
- while (answer.find("OK Listing done") == std::string::npos) {
- RS_DBG3("stateMachineBOB status check: read loop, counter: ", counter);
- answer += recv();
- counter++;
- }
-
- if (answer.find(mTunnelName) == std::string::npos) {
- RS_DBG("status check: tunnel down!");
- // signal error
- *((bool *)mProcessing->data) = true;
- }
-
- mBOBState = currentState.nextState;
- } else if (isAnswerOk(answer)) {
- // check for other special states
- std::string key;
- switch (mBOBState) {
- case bsNewkeysN:
- key = answer.substr(3, answer.length()-3);
- mSetting.address.base32 = i2p::keyToBase32Addr(key);
- IndicateConfigChanged();
- break;
- case bsGetkeys:
- key = answer.substr(3, answer.length()-3);
- mSetting.address.privateKey = key;
- IndicateConfigChanged();
- break;
- default:
- break;
- }
-
- // goto next command
- mBOBState = currentState.nextState;
- } else {
- return stateMachineBOB_locked_failure(answer, currentState);
- }
- return sleepFactorFast;
-}
-
-int p3I2pBob::stateMachineBOB_locked_failure(const std::string &answer, const bobStateInfo ¤tState)
-{
- // wait in case of active tunnel
- // happens when trying to clear a stopping tunnel
- if (isTunnelActiveError(answer)) {
- return sleepFactorDefault;
- }
-
- RS_DBG("FAILED to run command: ", currentState.command);
- RS_DBG("answer: ", answer);
-
- mErrorMsg.append("FAILED to run command '" + currentState.command + "'" + '\n');
- mErrorMsg.append("reason '" + answer + "'" + '\n');
-
- // this error handling needs testing!
- mStateOld = mState;
- mState = csError;
- switch (mBOBState) {
- case bsGetnick:
- // failed getting nick
- // tunnel is probably non existing
- case bsClear:
- // tunnel is cleared
- mBOBState = bsQuit;
- break;
- case bsStop:
- // failed stopping
- // tunnel us probably not running
- // continue to clearing
- mBOBState = bsClear;
- break;
- case bsQuit:
- // this can happen when the
- // connection is somehow broken
- // just try to disconnect
- disconnectI2P();
- mBOBState = bsCleared;
- break;
- default:
- // try to recover
- mBOBState = bsGetnick;
- break;
- }
-
- return sleepFactorFast;
-}
-
-int p3I2pBob::stateMachineController()
-{
- RS_STACK_MUTEX(mLock);
-
- switch (mState) {
- case csIdel:
- return stateMachineController_locked_idle();
- case csDoConnect:
- if (!connectI2P()) {
- RS_DBG("doConnect: unable to connect");
- mStateOld = mState;
- mState = csError;
- mErrorMsg = "unable to connect to BOB port";
- return sleepFactorSlow;
- }
-
- RS_DBG4("doConnect: connected");
- mState = csConnected;
- break;
- case csConnected:
- return stateMachineController_locked_connected();
- case csWaitForBob:
- // check connection problems
- if (mSocket == 0) {
- RS_DBG("waitForBob: conection lost");
- mStateOld = mState;
- mState = csError;
- mErrorMsg = "connection lost to BOB";
- return sleepFactorDefault;
- }
-
- // check for finished BOB protocol
- if (mBOBState == bsCleared) {
- // done
- RS_DBG4("waitForBob: mBOBState == bsCleared");
- mState = csDoDisconnect;
- }
- break;
- case csDoDisconnect:
- if (!disconnectI2P() || mSocket != 0) {
- // just in case
- RS_DBG("doDisconnect: can't disconnect");
- mStateOld = mState;
- mState = csError;
- mErrorMsg = "unable to disconnect from BOB";
- return sleepFactorDefault;
- }
-
- RS_DBG4("doDisconnect: disconnected");
- mState = csDisconnected;
- break;
- case csDisconnected:
- return stateMachineController_locked_disconnected();
- case csError:
- return stateMachineController_locked_error();
- }
-
- return sleepFactorFast;
-}
-
-int p3I2pBob::stateMachineController_locked_idle()
-{
- // do some sanity checks
- // use asserts becasue these things indicate wrong/broken state machines that need to be fixed ASAP!
- assert(mBOBState == bsCleared);
- assert(mSocket == 0);
- assert(mState == csIdel || mState == csDisconnected);
-
- controllerTask oldTask = mTask;
- // check for new task
- if (mProcessing == NULL && !mPending.empty()) {
- mProcessing = mPending.front();
- mPending.pop();
-
- if (!mSetting.enable && (
- mProcessing->task == autoProxyTask::start ||
- mProcessing->task == autoProxyTask::stop ||
- mProcessing->task == autoProxyTask::proxyStatusCheck)) {
- // skip since we are not enabled
- RS_DBG1("disabled -> skipping ticket");
- rsAutoProxyMonitor::taskDone(mProcessing, autoProxyStatus::disabled);
- mProcessing = NULL;
- } else {
- // set states
- switch (mProcessing->task) {
- case autoProxyTask::start:
- mLastProxyCheck = time(NULL);
- mTask = ctRunSetUp;
- break;
- case autoProxyTask::stop:
- mTask = ctRunShutDown;
- break;
- case autoProxyTask::receiveKey:
- mTaskOld = mTask;
- mTask = ctRunGetKeys;
- break;
- case autoProxyTask::proxyStatusCheck:
- mTaskOld = mTask;
- mTask = ctRunCheck;
- break;
- default:
- RS_DBG1("unknown async task");
- rsAutoProxyMonitor::taskError(mProcessing);
- mProcessing = NULL;
- break;
- }
- }
-
- mErrorMsg.clear();
- }
-
- // periodically check
- if (mTask == ctRunSetUp && mLastProxyCheck < time(NULL) - selfCheckPeroid) {
- taskTicket *tt = rsAutoProxyMonitor::getTicket();
- tt->task = autoProxyTask::proxyStatusCheck;
- tt->data = (void *) new bool;
-
- *((bool *)tt->data) = false;
-
- mPending.push(tt);
-
- mLastProxyCheck = time(NULL);
- }
-
- // wait for new task
- if (!!mProcessing) {
- // check if task was changed
- if (mTask != oldTask) {
- mState = csDoConnect;
- } else {
- // A ticket shall be processed but the state didn't change.
- // This means that what ever is requested in the ticket
- // was requested before already.
- // -> set mState to csDisconnected to answer the ticket
- mState = csDisconnected;
- }
- return sleepFactorFast;
- }
-
- return sleepFactorSlow;
-}
-
-int p3I2pBob::stateMachineController_locked_connected()
-{
- // set proper bob state
- switch (mTask) {
- case ctRunSetUp:
- // when we have a key use it for server tunnel!
- if(mSetting.address.privateKey.empty()) {
- RS_DBG4("setting mBOBState = setnickC");
- mBOBState = bsSetnickC;
- } else {
- RS_DBG4("setting mBOBState = setnickS");
- mBOBState = bsSetnickS;
- }
- break;
- case ctRunShutDown:
- // shut down existing tunnel
- RS_DBG4("setting mBOBState = getnick");
- mBOBState = bsGetnick;
- break;
- case ctRunCheck:
- RS_DBG4("setting mBOBState = list");
- mBOBState = bsList;
- break;
- case ctRunGetKeys:
- RS_DBG4("setting mBOBState = setnickN");
- mBOBState = bsSetnickN;
- break;
- case ctIdle:
- RS_DBG("task is idle. This should not happen!");
- break;
- }
-
- mState = csWaitForBob;
- return sleepFactorFast;
-}
-
-int p3I2pBob::stateMachineController_locked_disconnected()
-{
- // check if we had an error
- bool errorHappened = (mStateOld == csError);
-
- if(errorHappened) {
- // reset old state
- mStateOld = csIdel;
- RS_DBG("error during process!");
- }
-
- // answer ticket
- controllerState newState = csIdel;
- switch (mTask) {
- case ctRunSetUp:
- if (errorHappened) {
- rsAutoProxyMonitor::taskError(mProcessing);
- // switch to error
- newState = csError;
- } else {
- rsAutoProxyMonitor::taskDone(mProcessing, autoProxyStatus::online);
- }
- break;
- case ctRunShutDown:
- // don't care about error here
- rsAutoProxyMonitor::taskDone(mProcessing, autoProxyStatus::offline);
- break;
- case ctRunCheck:
- // get result and delete dummy ticket
- errorHappened |= *((bool *)mProcessing->data);
- delete (bool *)mProcessing->data;
- delete mProcessing;
-
- // restore old task
- mTask = mTaskOld;
-
- if (!errorHappened) {
- RS_DBG4("run check result: ok");
- break;
- }
- // switch to error
- newState = csError;
- RS_DBG("run check result: error");
- mErrorMsg = "Connection check failed. Will try to restart tunnel.";
-
- break;
- case ctRunGetKeys:
- if (!errorHappened) {
- // rebuild commands
- updateSettings_locked();
-
- if (mProcessing->data)
- *((struct bobSettings *)mProcessing->data) = mSetting;
-
- rsAutoProxyMonitor::taskDone(mProcessing, autoProxyStatus::ok);
- } else {
- rsAutoProxyMonitor::taskError(mProcessing);
- // switch to error
- newState = csError;
- }
-
- // restore old task
- mTask = mTaskOld;
- break;
- case ctIdle:
- RS_DBG("task is idle. This should not happen!");
- rsAutoProxyMonitor::taskError(mProcessing);
- }
- mProcessing = NULL;
- mState = newState;
-
- if (newState == csError)
- mLastProxyCheck = time(NULL);
-
- return sleepFactorFast;
-}
-
-int p3I2pBob::stateMachineController_locked_error()
-{
- // wait for bob protocoll
- if (mBOBState != bsCleared) {
- RS_DBG4("waiting for BOB");
- return sleepFactorFast;
- }
-
-#if 0
- RS_DBG4("stateMachineController_locked_error: mProcessing: ", (mProcessing ? "not null" : "null"));
-#endif
-
- // try to finish ticket
- if (mProcessing) {
- switch (mTask) {
- case ctRunCheck:
- // connection check failed at some point
- RS_DBG("failed to check proxy status (it's likely dead)!");
- *((bool *)mProcessing->data) = true;
- mState = csDoDisconnect;
- mStateOld = csIdel;
- // keep the error message
- break;
- case ctRunShutDown:
- // not a big deal though
- RS_DBG("failed to shut down tunnel (it's likely dead though)!");
- mState = csDoDisconnect;
- mStateOld = csIdel;
- mErrorMsg.clear();
- break;
- case ctIdle:
- // should not happen but we need to deal with it
- // this will produce some error messages in the log and finish the task (marked as failed)
- RS_DBG("task is idle. This should not happen!");
- mState = csDoDisconnect;
- mStateOld = csIdel;
- mErrorMsg.clear();
- break;
- case ctRunGetKeys:
- case ctRunSetUp:
- RS_DBG("failed to receive key / start up");
- mStateOld = csError;
- mState = csDoDisconnect;
- // keep the error message
- break;
- }
- return sleepFactorFast;
- }
-
- // periodically retry
- if (mLastProxyCheck < time(NULL) - (selfCheckPeroid >> 1) && mTask == ctRunSetUp) {
- RS_DBG("retrying");
-
- mLastProxyCheck = time(NULL);
- mErrorMsg.clear();
-
- // create fake ticket
- taskTicket *tt = rsAutoProxyMonitor::getTicket();
- tt->task = autoProxyTask::start;
- mPending.push(tt);
- }
-
- // check for new tickets
- if (!mPending.empty()) {
- RS_DBG4("processing new ticket");
-
- // reset and try new task
- mTask = ctIdle;
- mState = csIdel;
- return sleepFactorFast;
- }
-
- return sleepFactorDefault;
-}
-
-RsSerialiser *p3I2pBob::setupSerialiser()
-{
- RsSerialiser* rsSerialiser = new RsSerialiser();
- rsSerialiser->addSerialType(new RsGeneralConfigSerialiser());
-
- return rsSerialiser;
-}
-
-#define addKVS(_vitem, _kv, _key, _value) \
- _kv.key = _key;\
- _kv.value = _value;\
- _vitem->tlvkvs.pairs.push_back(_kv);
-
-#define addKVSInt(_vitem, _kv, _key, _value) \
- _kv.key = _key;\
- rs_sprintf(_kv.value, "%d", _value);\
- _vitem->tlvkvs.pairs.push_back(_kv);
-
-bool p3I2pBob::saveList(bool &cleanup, std::list &lst)
-{
- RS_DBG4("");
-
- cleanup = true;
- RsConfigKeyValueSet *vitem = new RsConfigKeyValueSet;
- RsTlvKeyValue kv;
-
- RS_STACK_MUTEX(mLock);
- addKVS(vitem, kv, kConfigKeyBOBEnable, mSetting.enable ? "TRUE" : "FALSE")
- addKVS(vitem, kv, kConfigKeyBOBKey, mSetting.address.privateKey)
- addKVS(vitem, kv, kConfigKeyBOBAddr, mSetting.address.base32)
- addKVSInt(vitem, kv, kConfigKeyInLength, mSetting.inLength)
- addKVSInt(vitem, kv, kConfigKeyInQuantity, mSetting.inQuantity)
- addKVSInt(vitem, kv, kConfigKeyInVariance, mSetting.inVariance)
- addKVSInt(vitem, kv, kConfigKeyOutLength, mSetting.outLength)
- addKVSInt(vitem, kv, kConfigKeyOutQuantity, mSetting.outQuantity)
- addKVSInt(vitem, kv, kConfigKeyOutVariance, mSetting.outVariance)
-
- lst.push_back(vitem);
-
- return true;
-}
-
-#undef addKVS
-#undef addKVSUInt
-
-#define getKVSUInt(_kit, _key, _value) \
- else if (_kit->key == _key) {\
- std::istringstream is(_kit->value);\
- int tmp;\
- is >> tmp;\
- _value = (int8_t)tmp;\
- }
-
-bool p3I2pBob::loadList(std::list &load)
-{
- RS_DBG4("");
-
- for(std::list::const_iterator it = load.begin(); it!=load.end(); ++it) {
- RsConfigKeyValueSet *vitem = dynamic_cast(*it);
- if(vitem != NULL) {
- RS_STACK_MUTEX(mLock);
- for(std::list::const_iterator kit = vitem->tlvkvs.pairs.begin(); kit != vitem->tlvkvs.pairs.end(); ++kit) {
- if (kit->key == kConfigKeyBOBEnable)
- mSetting.enable = kit->value == "TRUE";
- else if (kit->key == kConfigKeyBOBKey)
- mSetting.address.privateKey = kit->value;
- else if (kit->key == kConfigKeyBOBAddr)
- mSetting.address.base32 = kit->value;
- getKVSUInt(kit, kConfigKeyInLength, mSetting.inLength)
- getKVSUInt(kit, kConfigKeyInQuantity, mSetting.inQuantity)
- getKVSUInt(kit, kConfigKeyInVariance, mSetting.inVariance)
- getKVSUInt(kit, kConfigKeyOutLength, mSetting.outLength)
- getKVSUInt(kit, kConfigKeyOutQuantity, mSetting.outQuantity)
- getKVSUInt(kit, kConfigKeyOutVariance, mSetting.outVariance)
- else
- RS_DBG("unknown key: ", kit->key);
- }
- }
- delete vitem;
- }
-
- RS_STACK_MUTEX(mLock);
- finalizeSettings_locked();
- mConfigLoaded = true;
-
- return true;
-}
-
-#undef getKVSUInt
-
-void p3I2pBob::getBOBSettings(bobSettings *settings)
-{
- if (settings == NULL)
- return;
-
- RS_STACK_MUTEX(mLock);
- *settings = mSetting;
-
-}
-
-void p3I2pBob::setBOBSettings(const bobSettings *settings)
-{
- if (settings == NULL)
- return;
-
- RS_STACK_MUTEX(mLock);
- mSetting = *settings;
-
- IndicateConfigChanged();
-
- // Note:
- // We don't take care of updating a running BOB session here
- // This can be done manually by stoping and restarting the session
-
- // Note2:
- // In case there is no config yet to load
- // finalize settings here instead
- if (!mConfigLoaded) {
- finalizeSettings_locked();
- mConfigLoaded = true;
- } else {
- updateSettings_locked();
- }
-}
-
-void p3I2pBob::getStates(bobStates *bs)
-{
- if (bs == NULL)
- return;
-
- RS_STACK_MUTEX(mLock);
- bs->cs = mState;
- bs->ct = mTask;
- bs->bs = mBOBState;
- bs->tunnelName = mTunnelName;
-}
-
-std::string p3I2pBob::executeCommand(const std::string &command)
-{
- RS_DBG4("running: ", command);
-
- std::string copy = command;
- copy.push_back('\n');
-
- // send command
- // there is only one thread that touches mSocket - no need for a lock
- ::send(mSocket, copy.c_str(), copy.size(), 0);
-
- // receive answer (trailing new line is already removed!)
- std::string ans = recv();
-
- RS_DBG4("answer: ", ans);
-
- return ans;
-}
-
-bool p3I2pBob::connectI2P()
-{
- // there is only one thread that touches mSocket - no need for a lock
-
- if (mSocket != 0) {
- RS_DBG("mSocket != 0");
- return false;
- }
-
- // create socket
- mSocket = unix_socket(PF_INET, SOCK_STREAM, 0);
- if (mSocket < 0)
- {
- RS_DBG("Failed to open socket! Socket Error: ", socket_errorType(errno));
- return false;
- }
-
- // connect
- int err = unix_connect(mSocket, mI2PProxyAddr);
- if (err != 0) {
- RS_DBG("Failed to connect to BOB! Socket Error: ", socket_errorType(errno));
- return false;
- }
-
- // receive hello msg
- recv();
-
- RS_DBG4("done");
- return true;
-}
-
-bool p3I2pBob::disconnectI2P()
-{
- // there is only one thread that touches mSocket - no need for a lock
-
- if (mSocket == 0) {
- RS_DBG("mSocket == 0");
- return true;
- }
-
- int err = unix_close(mSocket);
- if (err != 0) {
- RS_DBG("Failed to close socket! Socket Error: ", socket_errorType(errno));
- return false;
- }
-
- RS_DBG4("done");
- mSocket = 0;
- return true;
-}
-
-std::string toString(const std::string &a, const int b) {
- std::ostringstream oss;
- oss << b;
- return a + oss.str();;
-}
-
-std::string toString(const std::string &a, const uint16_t b) {
- return toString(a, (int)b);
-}
-
-std::string toString(const std::string &a, const int8_t b) {
- return toString(a, (int)b);
-}
-
-void p3I2pBob::finalizeSettings_locked()
-{
- RS_DBG4("");
-
- sockaddr_storage_clear(mI2PProxyAddr);
- // get i2p proxy addr
- sockaddr_storage proxy;
- mPeerMgr->getProxyServerAddress(RS_HIDDEN_TYPE_I2P, proxy);
-
- // overwrite port to bob port
- sockaddr_storage_setipv4(mI2PProxyAddr, (sockaddr_in*)&proxy);
- sockaddr_storage_setport(mI2PProxyAddr, 2827);
-
- RS_DBG4("using ", mI2PProxyAddr);
- RS_DBG4("using ", mSetting.address.base32);
-
- peerState ps;
- mPeerMgr->getOwnNetStatus(ps);
-
- // setup commands
- // new lines are appended later!
-
- // generate 8 characater long random suffix for name
- constexpr size_t len = 8;
- const std::string location = RsRandom::alphaNumeric(len);
- RS_DBG4("using suffix ", location);
- mTunnelName = "RetroShare-" + location;
-
- const std::string setnick = "setnick RetroShare-" + location;
- const std::string getnick = "getnick RetroShare-" + location;
- const std::string newkeys = "newkeys";
- const std::string getkeys = "getkeys";
- const std::string setkeys = "setkeys " + mSetting.address.privateKey;
- const std::string inhost = "inhost " + sockaddr_storage_iptostring(proxy);
- const std::string inport = toString("inport ", sockaddr_storage_port(proxy));
- const std::string outhost = "outhost " + sockaddr_storage_iptostring(ps.localaddr);
- const std::string outport = toString("outport ", sockaddr_storage_port(ps.localaddr));
- // length
- const std::string inlength = toString("option inbound.length=", mSetting.inLength);
- const std::string outlength = toString("option outbound.length=", mSetting.outLength);
- // variance
- const std::string invariance = toString("option inbound.lengthVariance=", mSetting.inVariance);
- const std::string outvariance= toString("option outbound.lengthVariance=", mSetting.outVariance);
- // quantity
- const std::string inquantity = toString("option inbound.quantity=", mSetting.inQuantity);
- const std::string outquantity= toString("option outbound.quantity=", mSetting.outQuantity);
- const std::string quiet = "quiet true";
- const std::string start = "start";
- const std::string stop = "stop";
- const std::string clear = "clear";
- const std::string list = "list";
- const std::string quit = "quit";
-
- // setup state machine
-
- // start chain
- // -> A: server and client tunnel
- mCommands[bsSetnickS] = {setnick, bsSetkeys};
- mCommands[bsSetkeys] = {setkeys, bsOuthost};
- mCommands[bsOuthost] = {outhost, bsOutport};
- mCommands[bsOutport] = {outport, bsInhost};
- // -> B: only client tunnel
- mCommands[bsSetnickC] = {setnick, bsNewkeysC};
- mCommands[bsNewkeysC] = {newkeys, bsInhost};
- // -> both
- mCommands[bsInhost] = {inhost, bsInport};
- mCommands[bsInport] = {inport, bsInlength};
- mCommands[bsInlength] = {inlength, bsOutlength};
- mCommands[bsOutlength] = {outlength, bsInvariance};
- mCommands[bsInvariance] = {invariance, bsOutvariance};
- mCommands[bsOutvariance]= {outvariance,bsInquantity};
- mCommands[bsInquantity] = {inquantity, bsOutquantity};
- mCommands[bsOutquantity]= {outquantity,bsQuiet};
- mCommands[bsQuiet] = {quiet, bsStart};
- mCommands[bsStart] = {start, bsQuit};
- mCommands[bsQuit] = {quit, bsCleared};
-
- // stop chain
- mCommands[bsGetnick] = {getnick, bsStop};
- mCommands[bsStop] = {stop, bsClear};
- mCommands[bsClear] = {clear, bsQuit};
-
- // getkeys chain
- mCommands[bsSetnickN] = {setnick, bsNewkeysN};
- mCommands[bsNewkeysN] = {newkeys, bsGetkeys};
- mCommands[bsGetkeys] = {getkeys, bsClear};
-
- // list chain
- mCommands[bsList] = {list, bsQuit};
-}
-
-void p3I2pBob::updateSettings_locked()
-{
- RS_DBG4("");
-
- sockaddr_storage proxy;
- mPeerMgr->getProxyServerAddress(RS_HIDDEN_TYPE_I2P, proxy);
-
- peerState ps;
- mPeerMgr->getOwnNetStatus(ps);
-
- const std::string setkeys = "setkeys " + mSetting.address.privateKey;
- const std::string inhost = "inhost " + sockaddr_storage_iptostring(proxy);
- const std::string inport = toString("inport ", sockaddr_storage_port(proxy));
- const std::string outhost = "outhost " + sockaddr_storage_iptostring(ps.localaddr);
- const std::string outport = toString("outport ", sockaddr_storage_port(ps.localaddr));
-
- // length
- const std::string inlength = toString("option inbound.length=", mSetting.inLength);
- const std::string outlength = toString("option outbound.length=", mSetting.outLength);
- // variance
- const std::string invariance = toString("option inbound.lengthVariance=", mSetting.inVariance);
- const std::string outvariance= toString("option outbound.lengthVariance=", mSetting.outVariance);
- // quantity
- const std::string inquantity = toString("option inbound.quantity=", mSetting.inQuantity);
- const std::string outquantity= toString("option outbound.quantity=", mSetting.outQuantity);
-
- mCommands[bsSetkeys] = {setkeys, bsOuthost};
- mCommands[bsOuthost] = {outhost, bsOutport};
- mCommands[bsOutport] = {outport, bsInhost};
- mCommands[bsInhost] = {inhost, bsInport};
- mCommands[bsInport] = {inport, bsInlength};
-
- mCommands[bsInlength] = {inlength, bsOutlength};
- mCommands[bsOutlength] = {outlength, bsInvariance};
- mCommands[bsInvariance] = {invariance, bsOutvariance};
- mCommands[bsOutvariance]= {outvariance,bsInquantity};
- mCommands[bsInquantity] = {inquantity, bsOutquantity};
- mCommands[bsOutquantity]= {outquantity,bsQuiet};
-}
-
-std::string p3I2pBob::recv()
-{
- // BOB works line based
- // -> \n indicates and of the line
-
- constexpr uint16_t bufferSize = 128;
- char buffer[bufferSize];
-
- std::string ans;
- uint16_t retry = 10;
-
- do {
- memset(buffer, 0, bufferSize);
-
- // peek at data
- auto length = ::recv(mSocket, buffer, bufferSize, MSG_PEEK);
- if (length <= 0) {
- if (length < 0) {
- // error
- perror(__PRETTY_FUNCTION__);
- }
- retry--;
- doSleep(sleepTimeRecv);
- continue;
- }
-
- // at least one byte was read
-
- // search for new line
- auto bufferStr = std::string(buffer);
- size_t pos = bufferStr.find('\n');
-
- if (pos == std::string::npos) {
- // no new line found -> more to read
-
- // sanity check
- if (length != bufferSize) {
- // expectation: a full buffer was peeked)
- RS_DBG1("peeked less than bufferSize but also didn't found a new line character");
- }
- // this should never happen
- assert(length <= bufferSize);
- } else {
- // new line found -> end of message
-
- // calculate how much there is to read, read the \n, too!
- length = pos + 1;
-
- // end loop
- retry = 0;
- }
-
- // now read for real
- memset(buffer, 0, bufferSize);
- length = ::recv(mSocket, buffer, length, 0);
- bufferStr = std::string(buffer);
- ans.append(bufferStr);
- } while(retry > 0);
-
- return ans;
-}
diff --git a/libretroshare/src/services/autoproxy/p3i2pbob.h b/libretroshare/src/services/autoproxy/p3i2pbob.h
deleted file mode 100644
index 29bcbcb61..000000000
--- a/libretroshare/src/services/autoproxy/p3i2pbob.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/*******************************************************************************
- * libretroshare/src/services/autoproxy: p3i2pbob.h *
- * *
- * libretroshare: retroshare core library *
- * *
- * Copyright 2016 by Sehraf *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public License *
- * along with this program. If not, see . *
- * *
- *******************************************************************************/
-#ifndef P3I2PBOB_H
-#define P3I2PBOB_H
-
-#include