Skip to content
Bitcoin Roots

v30.3-roots.1 · Commit 3: [PATCH 03/68] feat(policy): preserve Roots relay and network controls on Core 30.3

src/netbase.cpp

Before: src/netbase.cpp · After: src/netbase.cpp

File metadata
index 06593312d12f0a09567ecb03e1b89dd959caecd6..e2719e1a09a64f7a081cacb84fe48facc6486cca 100644

Download original patch · Release notes

Diff rows 1–17 of 17. Line numbers refer to the original before/after files.

+ Added− RemovedUnmarked lines are context.

Scroll the code area horizontally to read long lines. Before is on the left; after is on the right. Unified view fits narrow screens more easily.

src/netbase.cpp CHANGED
@@ -103,7 +103,7 @@ enum Network ParseNetwork(const std::string& net_in) {
103
  if (net == "ipv6") return NET_IPV6;
104
  if (net == "onion") return NET_ONION;
105
  if (net == "tor") {
106
- LogPrintf("Warning: net name 'tor' is deprecated and will be removed in the future. You should use 'onion' instead.\n");
107
  return NET_ONION;
108
  }
109
  if (net == "i2p") {
@@ -435,8 +435,8 @@ bool Socks5(const std::string& strDest, uint16_t port, const ProxyCredentials* a
435
  vAuth.insert(vAuth.end(), auth->username.begin(), auth->username.end());
436
  vAuth.push_back(auth->password.size());
437
  vAuth.insert(vAuth.end(), auth->password.begin(), auth->password.end());
 
438
  sock.SendComplete(vAuth, g_socks5_recv_timeout, g_socks5_interrupt);
439
- LogDebug(BCLog::PROXY, "SOCKS5 sending proxy authentication %s:%s\n", auth->username, auth->password);
440
  uint8_t pchRetA[2];
441
  if (InterruptibleRecv(pchRetA, 2, g_socks5_recv_timeout, sock) != IntrRecvError::OK) {
442
  LogError("Error reading proxy authentication response\n");
 
103
  if (net == "ipv6") return NET_IPV6;
104
  if (net == "onion") return NET_ONION;
105
  if (net == "tor") {
106
+ LogWarning("Net name 'tor' is deprecated and will be removed in the future. You should use 'onion' instead.");
107
  return NET_ONION;
108
  }
109
  if (net == "i2p") {
 
435
  vAuth.insert(vAuth.end(), auth->username.begin(), auth->username.end());
436
  vAuth.push_back(auth->password.size());
437
  vAuth.insert(vAuth.end(), auth->password.begin(), auth->password.end());
438
+ LogDebug(BCLog::PROXY, "SOCKS5 sending username/password authentication\n");
439
  sock.SendComplete(vAuth, g_socks5_recv_timeout, g_socks5_interrupt);
 
440
  uint8_t pchRetA[2];
441
  if (InterruptibleRecv(pchRetA, 2, g_socks5_recv_timeout, sock) != IntrRecvError::OK) {
442
  LogError("Error reading proxy authentication response\n");