From c1a29b08acee79afd41104afe86189bffc4932a9 Mon Sep 17 00:00:00 2001 From: "Francisco Blas (klondike) Izquierdo Riera" Date: Wed, 7 Jan 2015 21:50:12 +0100 Subject: [PATCH] Remove ClientContext.h dependency --- AddressBook.h | 4 +++- Destination.cpp | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/AddressBook.h b/AddressBook.h index 5b24c017..1d22018e 100644 --- a/AddressBook.h +++ b/AddressBook.h @@ -23,6 +23,8 @@ namespace client const int CONTINIOUS_SUBSCRIPTION_UPDATE_TIMEOUT = 240; // in minutes const int CONTINIOUS_SUBSCRIPTION_RETRY_TIMEOUT = 5; // in minutes const int SUBSCRIPTION_REQUEST_TIMEOUT = 60; //in second + + inline std::string GetB32Address(const i2p::data::IdentHash& ident) { return ident.ToBase32().append(".b32.i2p"); } class AddressBookStorage // interface for storage { @@ -55,7 +57,7 @@ namespace client void LoadHostsFromStream (std::istream& f); void DownloadComplete (bool success); //This method returns the ".b32.i2p" address - std::string ToAddress(const i2p::data::IdentHash& ident) { return ident.ToBase32().append(".b32.i2p"); } + std::string ToAddress(const i2p::data::IdentHash& ident) { return GetB32Address(ident); } std::string ToAddress(const i2p::data::IdentityEx& ident) { return ToAddress(ident.GetIdentHash ()); } private: diff --git a/Destination.cpp b/Destination.cpp index abaf0de0..77cae1d0 100644 --- a/Destination.cpp +++ b/Destination.cpp @@ -6,7 +6,7 @@ #include "ElGamal.h" #include "Timestamp.h" #include "NetDb.h" -#include "ClientContext.h" +#include "AddressBook.h" #include "Destination.h" namespace i2p @@ -47,7 +47,7 @@ namespace client } m_Pool = i2p::tunnel::tunnels.CreateTunnelPool (this, inboundTunnelLen, outboundTunnelLen); if (m_IsPublic) - LogPrint (eLogInfo, "Local address ", i2p::client::context.GetAddressBook ().ToAddress(GetIdentHash()), " created"); + LogPrint (eLogInfo, "Local address ", i2p::client::GetB32Address(GetIdentHash()), " created"); m_StreamingDestination = new i2p::stream::StreamingDestination (*this); // TODO: }