From e7f05cc462a00b3a57c53b412fdf3f61e5c2c1eb Mon Sep 17 00:00:00 2001 From: orignal Date: Tue, 2 Dec 2014 10:34:02 -0500 Subject: [PATCH] BOB added --- BOB.cpp | 16 ++++++++++++++++ BOB.h | 20 ++++++++++++++++++++ ClientContext.cpp | 3 ++- ClientContext.h | 2 ++ Win32/i2pd.vcxproj | 4 +++- build/CMakeLists.txt | 3 ++- build/autotools/Makefile.in | 7 ++++--- filelist.mk | 5 +++-- 8 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 BOB.cpp create mode 100644 BOB.h diff --git a/BOB.cpp b/BOB.cpp new file mode 100644 index 00000000..5cb8cda3 --- /dev/null +++ b/BOB.cpp @@ -0,0 +1,16 @@ +#include "BOB.h" + +namespace i2p +{ +namespace client +{ + BOBCommandChannel::BOBCommandChannel (int port) + { + } + + BOBCommandChannel::~BOBCommandChannel () + { + } +} +} + diff --git a/BOB.h b/BOB.h new file mode 100644 index 00000000..4f7359c9 --- /dev/null +++ b/BOB.h @@ -0,0 +1,20 @@ +#ifndef BOB_H__ +#define BOB_H__ + +namespace i2p +{ +namespace client +{ + + class BOBCommandChannel + { + public: + + BOBCommandChannel (int port); + ~BOBCommandChannel (); + }; +} +} + +#endif + diff --git a/ClientContext.cpp b/ClientContext.cpp index c5a6e9af..bc2d37d4 100644 --- a/ClientContext.cpp +++ b/ClientContext.cpp @@ -12,7 +12,7 @@ namespace client ClientContext::ClientContext (): m_SharedLocalDestination (nullptr), m_HttpProxy (nullptr), m_SocksProxy (nullptr), m_IrcTunnel (nullptr), - m_ServerTunnel (nullptr), m_SamBridge (nullptr) + m_ServerTunnel (nullptr), m_SamBridge (nullptr), m_BOBCommandChannel (nullptr) { } @@ -23,6 +23,7 @@ namespace client delete m_IrcTunnel; delete m_ServerTunnel; delete m_SamBridge; + delete m_BOBCommandChannel; } void ClientContext::Start () diff --git a/ClientContext.h b/ClientContext.h index a413e21d..4ee81549 100644 --- a/ClientContext.h +++ b/ClientContext.h @@ -7,6 +7,7 @@ #include "SOCKS.h" #include "I2PTunnel.h" #include "SAM.h" +#include "BOB.h" #include "AddressBook.h" namespace i2p @@ -47,6 +48,7 @@ namespace client I2PClientTunnel * m_IrcTunnel; I2PServerTunnel * m_ServerTunnel; SAMBridge * m_SamBridge; + BOBCommandChannel * m_BOBCommandChannel; public: // for HTTP diff --git a/Win32/i2pd.vcxproj b/Win32/i2pd.vcxproj index b50ae810..bba9a6a7 100644 --- a/Win32/i2pd.vcxproj +++ b/Win32/i2pd.vcxproj @@ -22,6 +22,7 @@ + @@ -62,6 +63,7 @@ + @@ -278,4 +280,4 @@ - \ No newline at end of file + diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 02475c0d..4ac2241d 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -10,7 +10,7 @@ set ( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" ) set ( CMAKE_SOURCE_DIR ".." ) set (SOURCES - "${CMAKE_SOURCE_DIR}/AddressBook.cpp" + "${CMAKE_SOURCE_DIR}/AddressBook.cpp" "${CMAKE_SOURCE_DIR}/CryptoConst.cpp" "${CMAKE_SOURCE_DIR}/Daemon.cpp" "${CMAKE_SOURCE_DIR}/Garlic.cpp" @@ -43,6 +43,7 @@ set (SOURCES "${CMAKE_SOURCE_DIR}/i2p.cpp" "${CMAKE_SOURCE_DIR}/util.cpp" "${CMAKE_SOURCE_DIR}/SAM.cpp" + "${CMAKE_SOURCE_DIR}/BOB.cpp" "${CMAKE_SOURCE_DIR}/ClientContext.cpp" "${CMAKE_SOURCE_DIR}/Datagram.cpp" ) diff --git a/build/autotools/Makefile.in b/build/autotools/Makefile.in index 0816f946..6c861710 100644 --- a/build/autotools/Makefile.in +++ b/build/autotools/Makefile.in @@ -115,7 +115,7 @@ am_i2p_OBJECTS = AddressBook.$(OBJEXT) CryptoConst.$(OBJEXT) \ TunnelGateway.$(OBJEXT) TunnelPool.$(OBJEXT) UPnP.$(OBJEXT) \ aes.$(OBJEXT) base64.$(OBJEXT) i2p.$(OBJEXT) util.$(OBJEXT) \ SAM.$(OBJEXT) Destination.$(OBJEXT) ClientContext.$(OBJEXT) \ - Datagram.$(OBJEXT) SSUSession.$(OBJEXT) + Datagram.$(OBJEXT) SSUSession.$(OBJEXT) BOB.$(OBJEXT) i2p_OBJECTS = $(am_i2p_OBJECTS) i2p_LDADD = $(LDADD) AM_V_P = $(am__v_P_@AM_V@) @@ -326,7 +326,7 @@ i2p_SOURCES = AddressBook.cpp CryptoConst.cpp Daemon.cpp \ Transports.cpp Tunnel.cpp TunnelEndpoint.cpp \ TunnelGateway.cpp TunnelPool.cpp UPnP.cpp aes.cpp \ base64.cpp i2p.cpp util.cpp SAM.cpp Destination.cpp \ - ClientContext.cpp DataFram.cpp SSUSession.cpp \ + ClientContext.cpp DataFram.cpp SSUSession.cpp BOB.cpp \ \ AddressBook.h CryptoConst.h Daemon.h ElGamal.h \ Garlic.h HTTPProxy.h HTTPServer.h I2NPProtocol.h \ @@ -338,7 +338,7 @@ i2p_SOURCES = AddressBook.cpp CryptoConst.cpp Daemon.cpp \ TunnelConfig.h TunnelEndpoint.h TunnelGateway.h \ TunnelPool.h UPnP.h aes.h base64.h config.h hmac.h \ util.h version.h Destination.h ClientContext.h \ - TransportSession.h Datagram.h SSUSession.h + TransportSession.h Datagram.h SSUSession.h BOB.h AM_LDFLAGS = @BOOST_DATE_TIME_LIB@ @BOOST_FILESYSTEM_LIB@ \ @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_REGEX_LIB@ \ @@ -486,6 +486,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i2p.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SAM.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BOB.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClientContext.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Datagram.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SSUSession.Po@am__quote@ diff --git a/filelist.mk b/filelist.mk index 8c1b5562..8f684be9 100644 --- a/filelist.mk +++ b/filelist.mk @@ -5,7 +5,8 @@ CPP_FILES := CryptoConst.cpp base64.cpp NTCPSession.cpp RouterInfo.cpp Transport TransitTunnel.cpp I2NPProtocol.cpp Log.cpp Garlic.cpp HTTPServer.cpp Streaming.cpp \ Destination.cpp Identity.cpp SSU.cpp SSUSession.cpp SSUData.cpp util.cpp Reseed.cpp \ DaemonLinux.cpp SSUData.cpp aes.cpp SOCKS.cpp UPnP.cpp TunnelPool.cpp HTTPProxy.cpp \ - AddressBook.cpp Daemon.cpp I2PTunnel.cpp SAM.cpp ClientContext.cpp Datagram.cpp i2p.cpp + AddressBook.cpp Daemon.cpp I2PTunnel.cpp SAM.cpp BOB.cpp ClientContext.cpp \ + Datagram.cpp i2p.cpp H_FILES := CryptoConst.h base64.h NTCPSession.h RouterInfo.h Transports.h \ @@ -13,7 +14,7 @@ H_FILES := CryptoConst.h base64.h NTCPSession.h RouterInfo.h Transports.h \ TransitTunnel.h I2NPProtocol.h Log.h Garlic.h HTTPServer.h Streaming.h Destination.h \ Identity.h SSU.h SSUSession.h SSUData.h util.h Reseed.h DaemonLinux.h SSUData.h \ aes.h SOCKS.h UPnP.h TunnelPool.h HTTPProxy.h AddressBook.h Daemon.h I2PTunnel.h \ - version.h Signature.h SAM.h ClientContext.h TransportSession.h Datagram.h + version.h Signature.h SAM.h BOB.h ClientContext.h TransportSession.h Datagram.h OBJECTS = $(addprefix obj/, $(notdir $(CPP_FILES:.cpp=.o)))