Browse Source

fix spelling of advertise in src and doc

0.13
jloughry 9 years ago
parent
commit
37767fd46f
  1. 2
      doc/tor.md
  2. 8
      src/main.cpp
  3. 4
      src/net.cpp
  4. 2
      src/net.h
  5. 4
      src/torcontrol.cpp

2
doc/tor.md

@ -52,7 +52,7 @@ your bitcoind's P2P listen port (8333 by default).
this option, and this can be a .onion address. Given the above this option, and this can be a .onion address. Given the above
configuration, you can find your onion address in configuration, you can find your onion address in
/var/lib/tor/bitcoin-service/hostname. Onion addresses are given /var/lib/tor/bitcoin-service/hostname. Onion addresses are given
preference for your node to advertize itself with, for connections preference for your node to advertise itself with, for connections
coming from unroutable addresses (such as 127.0.0.1, where the coming from unroutable addresses (such as 127.0.0.1, where the
Tor proxy typically runs). Tor proxy typically runs).

8
src/main.cpp

@ -376,7 +376,7 @@ void MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Pa
mapBlocksInFlight[hash] = std::make_pair(nodeid, it); mapBlocksInFlight[hash] = std::make_pair(nodeid, it);
} }
/** Check whether the last unknown block a peer advertized is not yet known. */ /** Check whether the last unknown block a peer advertised is not yet known. */
void ProcessBlockAvailability(NodeId nodeid) { void ProcessBlockAvailability(NodeId nodeid) {
CNodeState *state = State(nodeid); CNodeState *state = State(nodeid);
assert(state != NULL); assert(state != NULL);
@ -4456,11 +4456,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
CAddress addr = GetLocalAddress(&pfrom->addr); CAddress addr = GetLocalAddress(&pfrom->addr);
if (addr.IsRoutable()) if (addr.IsRoutable())
{ {
LogPrintf("ProcessMessages: advertizing address %s\n", addr.ToString()); LogPrintf("ProcessMessages: advertising address %s\n", addr.ToString());
pfrom->PushAddress(addr); pfrom->PushAddress(addr);
} else if (IsPeerAddrLocalGood(pfrom)) { } else if (IsPeerAddrLocalGood(pfrom)) {
addr.SetIP(pfrom->addrLocal); addr.SetIP(pfrom->addrLocal);
LogPrintf("ProcessMessages: advertizing address %s\n", addr.ToString()); LogPrintf("ProcessMessages: advertising address %s\n", addr.ToString());
pfrom->PushAddress(addr); pfrom->PushAddress(addr);
} }
} }
@ -5469,7 +5469,7 @@ bool SendMessages(CNode* pto)
// Address refresh broadcast // Address refresh broadcast
int64_t nNow = GetTimeMicros(); int64_t nNow = GetTimeMicros();
if (!IsInitialBlockDownload() && pto->nNextLocalAddrSend < nNow) { if (!IsInitialBlockDownload() && pto->nNextLocalAddrSend < nNow) {
AdvertizeLocal(pto); AdvertiseLocal(pto);
pto->nNextLocalAddrSend = PoissonNextSend(nNow, AVG_LOCAL_ADDRESS_BROADCAST_INTERVAL); pto->nNextLocalAddrSend = PoissonNextSend(nNow, AVG_LOCAL_ADDRESS_BROADCAST_INTERVAL);
} }

4
src/net.cpp

@ -205,7 +205,7 @@ bool IsPeerAddrLocalGood(CNode *pnode)
} }
// pushes our own address to a peer // pushes our own address to a peer
void AdvertizeLocal(CNode *pnode) void AdvertiseLocal(CNode *pnode)
{ {
if (fListen && pnode->fSuccessfullyConnected) if (fListen && pnode->fSuccessfullyConnected)
{ {
@ -220,7 +220,7 @@ void AdvertizeLocal(CNode *pnode)
} }
if (addrLocal.IsRoutable()) if (addrLocal.IsRoutable())
{ {
LogPrintf("AdvertizeLocal: advertizing address %s\n", addrLocal.ToString()); LogPrintf("AdvertiseLocal: advertising address %s\n", addrLocal.ToString());
pnode->PushAddress(addrLocal); pnode->PushAddress(addrLocal);
} }
} }

2
src/net.h

@ -134,7 +134,7 @@ enum
}; };
bool IsPeerAddrLocalGood(CNode *pnode); bool IsPeerAddrLocalGood(CNode *pnode);
void AdvertizeLocal(CNode *pnode); void AdvertiseLocal(CNode *pnode);
void SetLimited(enum Network net, bool fLimited = true); void SetLimited(enum Network net, bool fLimited = true);
bool IsLimited(enum Network net); bool IsLimited(enum Network net);
bool IsLimited(const CNetAddr& addr); bool IsLimited(const CNetAddr& addr);

4
src/torcontrol.cpp

@ -434,7 +434,7 @@ void TorController::add_onion_cb(TorControlConnection& conn, const TorControlRep
} }
service = CService(service_id+".onion", GetListenPort(), false); service = CService(service_id+".onion", GetListenPort(), false);
LogPrintf("tor: Got service ID %s, advertizing service %s\n", service_id, service.ToString()); LogPrintf("tor: Got service ID %s, advertising service %s\n", service_id, service.ToString());
if (WriteBinaryFile(GetPrivateKeyFile(), private_key)) { if (WriteBinaryFile(GetPrivateKeyFile(), private_key)) {
LogPrint("tor", "tor: Cached service private key to %s\n", GetPrivateKeyFile()); LogPrint("tor", "tor: Cached service private key to %s\n", GetPrivateKeyFile());
} else { } else {
@ -615,7 +615,7 @@ void TorController::connected_cb(TorControlConnection& conn)
void TorController::disconnected_cb(TorControlConnection& conn) void TorController::disconnected_cb(TorControlConnection& conn)
{ {
// Stop advertizing service when disconnected // Stop advertising service when disconnected
if (service.IsValid()) if (service.IsValid())
RemoveLocal(service); RemoveLocal(service);
service = CService(); service = CService();

Loading…
Cancel
Save