diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2020-10-21 14:24:42 +0200 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2020-10-21 14:40:42 +0200 |
| commit | af3b0dfc5463c42fb9bff39f020fc1728ed44bc7 (patch) | |
| tree | e47e3de74b2bade25e977725e942387bd432c590 /src/net_processing.cpp | |
| parent | 0f86e7f1285c6de697d144a0e68bbd67f4900e19 (diff) | |
| download | bitcoin-af3b0dfc5463c42fb9bff39f020fc1728ed44bc7.tar.xz | |
net: fix output of peer address in version message
If `-logips -debug=net` is specified then we print the contents of the
version message we send to the peer, including his address. Because the
addresses in the version message use pre-BIP155 encoding they cannot
represent a Tor v3 address and we would actually send 16 `0`s instead (a
dummy IPv6 address). However we would print the full address in the log
message. Before this fix:
```
2020-10-21T12:24:17Z send version message: version 70016, blocks=653500, us=[::]:0, them=xwjtp3mj427zdp4tljiiivg2l5ijfvmt5lcsfaygtpp6cw254kykvpyd.onion:8333, peer=0
```
This is confusing because we pretend to send one thing while we actually
send another. Adjust the printout to reflect what we are sending. After
this fix:
```
2020-10-21T12:26:54Z send version message: version 70016, blocks=653500, us=[::]:0, them=[::]:0, peer=0
```
Diffstat (limited to 'src/net_processing.cpp')
| -rw-r--r-- | src/net_processing.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 94d4052fa1..f0fd63b33c 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -498,7 +498,9 @@ static void PushNodeVersion(CNode& pnode, CConnman& connman, int64_t nTime) NodeId nodeid = pnode.GetId(); CAddress addr = pnode.addr; - CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices)); + CAddress addrYou = addr.IsRoutable() && !IsProxy(addr) && addr.IsAddrV1Compatible() ? + addr : + CAddress(CService(), addr.nServices); CAddress addrMe = CAddress(CService(), nLocalNodeServices); connman.PushMessage(&pnode, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERSION, PROTOCOL_VERSION, (uint64_t)nLocalNodeServices, nTime, addrYou, addrMe, |