highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-05 04:31:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Rename TorController::target to m_tor_control_center

Browse Source 
`target` is a proper name for the onion service target address and port.
This change is required for the following commit.
This commit is contained in:
Hennadii Stepanov 2020-09-24 22:28:29 +03:00
parent fdd3ae4d26
commit e3f07851f0
No known key found for this signature in database
GPG Key ID: 410108112E7EA81F
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/torcontrol.cpp
View File

@ -81,12 +81,12 @@ public:
/** /**
* Connect to a Tor control port. * Connect to a Tor control port.
* target is address of the form host:port. * tor_control_center is address of the form host:port.
* connected is the handler that is called when connection is successfully established. * connected is the handler that is called when connection is successfully established.
* disconnected is a handler that is called when the connection is broken. * disconnected is a handler that is called when the connection is broken.
* Return true on success. * Return true on success.
*/ */
bool Connect(const std::string &target, const ConnectionCB& connected, const ConnectionCB& disconnected); bool Connect(const std::string& tor_control_center, const ConnectionCB& connected, const ConnectionCB& disconnected);
/** /**
* Disconnect from Tor control port. * Disconnect from Tor control port.
@ -193,16 +193,16 @@ void TorControlConnection::eventcb(struct bufferevent *bev, short what, void *ct
} }
} }
bool TorControlConnection::Connect(const std::string &target, const ConnectionCB& _connected, const ConnectionCB& _disconnected) bool TorControlConnection::Connect(const std::string& tor_control_center, const ConnectionCB& _connected, const ConnectionCB& _disconnected)
{ {
if (b_conn) if (b_conn)
Disconnect(); Disconnect();
// Parse target address:port // Parse tor_control_center address:port
struct sockaddr_storage connect_to_addr; struct sockaddr_storage connect_to_addr;
int connect_to_addrlen = sizeof(connect_to_addr); int connect_to_addrlen = sizeof(connect_to_addr);
if (evutil_parse_sockaddr_port(target.c_str(), if (evutil_parse_sockaddr_port(tor_control_center.c_str(),
(struct sockaddr*)&connect_to_addr, &connect_to_addrlen)<0) { (struct sockaddr*)&connect_to_addr, &connect_to_addrlen)<0) {
LogPrintf("tor: Error parsing socket address %s\n", target); LogPrintf("tor: Error parsing socket address %s\n", tor_control_center);
return false; return false;
} }
@ -215,9 +215,9 @@ bool TorControlConnection::Connect(const std::string &target, const ConnectionCB
this->connected = _connected; this->connected = _connected;
this->disconnected = _disconnected; this->disconnected = _disconnected;
// Finally, connect to target // Finally, connect to tor_control_center
if (bufferevent_socket_connect(b_conn, (struct sockaddr*)&connect_to_addr, connect_to_addrlen) < 0) { if (bufferevent_socket_connect(b_conn, (struct sockaddr*)&connect_to_addr, connect_to_addrlen) < 0) {
LogPrintf("tor: Error connecting to address %s\n", target); LogPrintf("tor: Error connecting to address %s\n", tor_control_center);
return false; return false;
} }
return true; return true;
@ -410,7 +410,7 @@ static bool WriteBinaryFile(const fs::path &filename, const std::string &data)
class TorController class TorController
{ {
public: public:
TorController(struct event_base* base, const std::string& target); TorController(struct event_base* base, const std::string& tor_control_center);
~TorController(); ~TorController();
/** Get name of file to store private key in */ /** Get name of file to store private key in */
@ -420,7 +420,7 @@ public:
void Reconnect(); void Reconnect();
private: private:
struct event_base* base; struct event_base* base;
std::string target; const std::string m_tor_control_center;
TorControlConnection conn; TorControlConnection conn;
std::string private_key; std::string private_key;
std::string service_id; std::string service_id;
@ -450,18 +450,18 @@ private:
static void reconnect_cb(evutil_socket_t fd, short what, void *arg); static void reconnect_cb(evutil_socket_t fd, short what, void *arg);
}; };
TorController::TorController(struct event_base* _base, const std::string& _target): TorController::TorController(struct event_base* _base, const std::string& tor_control_center):
base(_base), base(_base),
target(_target), conn(base), reconnect(true), reconnect_ev(0), m_tor_control_center(tor_control_center), conn(base), reconnect(true), reconnect_ev(0),
reconnect_timeout(RECONNECT_TIMEOUT_START) reconnect_timeout(RECONNECT_TIMEOUT_START)
{ {
reconnect_ev = event_new(base, -1, 0, reconnect_cb, this); reconnect_ev = event_new(base, -1, 0, reconnect_cb, this);
if (!reconnect_ev) if (!reconnect_ev)
LogPrintf("tor: Failed to create event for reconnection: out of memory?\n"); LogPrintf("tor: Failed to create event for reconnection: out of memory?\n");
// Start connection attempts immediately // Start connection attempts immediately
if (!conn.Connect(_target, std::bind(&TorController::connected_cb, this, std::placeholders::_1), if (!conn.Connect(m_tor_control_center, std::bind(&TorController::connected_cb, this, std::placeholders::_1),
std::bind(&TorController::disconnected_cb, this, std::placeholders::_1) )) { std::bind(&TorController::disconnected_cb, this, std::placeholders::_1) )) {
LogPrintf("tor: Initiating connection to Tor control port %s failed\n", _target); LogPrintf("tor: Initiating connection to Tor control port %s failed\n", m_tor_control_center);
} }
// Read service private key if cached // Read service private key if cached
std::pair<bool,std::string> pkf = ReadBinaryFile(GetPrivateKeyFile()); std::pair<bool,std::string> pkf = ReadBinaryFile(GetPrivateKeyFile());
@ -696,7 +696,7 @@ void TorController::disconnected_cb(TorControlConnection& _conn)
if (!reconnect) if (!reconnect)
return; return;
LogPrint(BCLog::TOR, "tor: Not connected to Tor control port %s, trying to reconnect\n", target); LogPrint(BCLog::TOR, "tor: Not connected to Tor control port %s, trying to reconnect\n", m_tor_control_center);
// Single-shot timer for reconnect. Use exponential backoff. // Single-shot timer for reconnect. Use exponential backoff.
struct timeval time = MillisToTimeval(int64_t(reconnect_timeout * 1000.0)); struct timeval time = MillisToTimeval(int64_t(reconnect_timeout * 1000.0));
@ -710,9 +710,9 @@ void TorController::Reconnect()
/* Try to reconnect and reestablish if we get booted - for example, Tor /* Try to reconnect and reestablish if we get booted - for example, Tor
* may be restarting. * may be restarting.
*/ */
if (!conn.Connect(target, std::bind(&TorController::connected_cb, this, std::placeholders::_1), if (!conn.Connect(m_tor_control_center, std::bind(&TorController::connected_cb, this, std::placeholders::_1),
std::bind(&TorController::disconnected_cb, this, std::placeholders::_1) )) { std::bind(&TorController::disconnected_cb, this, std::placeholders::_1) )) {
LogPrintf("tor: Re-initiating connection to Tor control port %s failed\n", target); LogPrintf("tor: Re-initiating connection to Tor control port %s failed\n", m_tor_control_center);
} }
} }