Browse Source

Remove ClientContext.h dependency

pull/144/head
Francisco Blas (klondike) Izquierdo Riera 10 years ago
parent
commit
c1a29b08ac
  1. 4
      AddressBook.h
  2. 4
      Destination.cpp

4
AddressBook.h

@ -23,6 +23,8 @@ namespace client @@ -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 @@ -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:

4
Destination.cpp

@ -6,7 +6,7 @@ @@ -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 @@ -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:
}

Loading…
Cancel
Save