Remove SAM and BOB support. See #49.

monero-project · Dec 14, 2015 · 9d31345 · 9d31345
1 parent 11c0197
commit 9d31345
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 2,103 deletions.
diff --git a/client/BOB.cpp b/client/BOB.cpp
diff --git a/client/BOB.h b/client/BOB.h
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -1,13 +1,11 @@
 set(CLIENT_SRC
-  "BOB.cpp"	
   "ClientContext.cpp"
   "Daemon.cpp"
   "HTTPProxy.cpp"
   "HTTPServer.cpp"
   "I2PService.cpp"
   "I2PTunnel.cpp"
   "Kovri.cpp"
-  "SAM.cpp"
   "SOCKS.cpp"
   "i2pcontrol/I2PControl.cpp"
   "i2pcontrol/I2PControlServer.cpp"

diff --git a/client/ClientContext.cpp b/client/ClientContext.cpp
@@ -16,16 +16,12 @@ namespace client
         m_SharedLocalDestination (nullptr),
         m_HttpProxy (nullptr),
         m_SocksProxy (nullptr),
-        m_SamBridge (nullptr),
-        m_BOBCommandChannel (nullptr),
         m_I2PControlService (nullptr) {}
 
     ClientContext::~ClientContext () 
     {
         delete m_HttpProxy;
         delete m_SocksProxy;
-        delete m_SamBridge;
-        delete m_BOBCommandChannel;
         delete m_I2PControlService;
     }
 
@@ -95,28 +91,6 @@ namespace client
 
         ReadTunnels ();
 
-        // SAM
-        int samPort = i2p::util::config::varMap["samport"].as<int>();
-        if (samPort)
-        {
-            m_SamBridge = new SAMBridge(
-                i2p::util::config::varMap["samaddress"].as<std::string>(), samPort
-            );
-            m_SamBridge->Start();
-            LogPrint("SAM bridge started");
-        } 
-
-        // BOB
-        int bobPort = i2p::util::config::varMap["bobport"].as<int>();
-        if (bobPort)
-        {
-            m_BOBCommandChannel = new BOBCommandChannel(
-                i2p::util::config::varMap["bobaddress"].as<std::string>(), bobPort
-            );
-            m_BOBCommandChannel->Start ();
-            LogPrint("BOB command channel started");
-        } 
-
         // I2P Control
         int i2pcontrolPort = i2p::util::config::varMap["i2pcontrolport"].as<int>();
         if(i2pcontrolPort) {
@@ -159,20 +133,6 @@ namespace client
             LogPrint("I2P server tunnel stopped");  
         }
         m_ServerTunnels.clear ();   
-        if (m_SamBridge)
-        {
-            m_SamBridge->Stop ();
-            delete m_SamBridge; 
-            m_SamBridge = nullptr;
-            LogPrint("SAM bridge stopped"); 
-        }       
-        if (m_BOBCommandChannel)
-        {
-            m_BOBCommandChannel->Stop ();
-            delete m_BOBCommandChannel; 
-            m_BOBCommandChannel = nullptr;
-            LogPrint("BOB command channel stopped");    
-        }           
         if (m_I2PControlService)
         {
             m_I2PControlService->Stop ();

diff --git a/client/ClientContext.h b/client/ClientContext.h
@@ -8,8 +8,6 @@
 #include "HTTPProxy.h"
 #include "SOCKS.h"
 #include "I2PTunnel.h"
-#include "SAM.h"
-#include "BOB.h"
 #include "AddressBook.h"
 #include "i2pcontrol/I2PControlServer.h"
 
@@ -52,7 +50,6 @@ namespace client
             std::shared_ptr<ClientDestination> LoadLocalDestination (const std::string& filename, bool isPublic);
 
             AddressBook& GetAddressBook () { return m_AddressBook; };
-            const SAMBridge * GetSAMBridge () const { return m_SamBridge; };
 
         private:
 
@@ -70,8 +67,6 @@ namespace client
             i2p::proxy::SOCKSProxy * m_SocksProxy;
             std::map<int, std::unique_ptr<I2PClientTunnel> > m_ClientTunnels; // port->tunnel
             std::map<i2p::data::IdentHash, std::unique_ptr<I2PServerTunnel> > m_ServerTunnels; // destination->tunnel
-            SAMBridge * m_SamBridge;
-            BOBCommandChannel * m_BOBCommandChannel;
             i2pcontrol::I2PControlService * m_I2PControlService;
 
         public: