aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDeterminant <ted.sybil@gmail.com>2019-06-30 13:49:59 -0400
committerDeterminant <ted.sybil@gmail.com>2019-06-30 13:49:59 -0400
commita53ae6b6ff2faa7fa1d54b3eb662dcfb3591d8ef (patch)
tree0c984757e1f312cb69dc3ed49d914e2bda3099c9 /include
parentb06eef583fb9084f29e416a1af7555de4a73f764 (diff)
try to fix get_peer_addr bug
Diffstat (limited to 'include')
-rw-r--r--include/salticidae/network.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/salticidae/network.h b/include/salticidae/network.h
index 1f21c92..d83e7f1 100644
--- a/include/salticidae/network.h
+++ b/include/salticidae/network.h
@@ -284,7 +284,7 @@ class PeerNetwork: public MsgNetwork<OpcodeType> {
NetAddr get_peer_addr() {
auto ret = *(static_cast<NetAddr *>(
get_net()->disp_tcall->call([this](ThreadCall::Handle &h) {
- h.set_result(peer ? peer->peer_addr : NetAddr());
+ h.set_result(peer ? NetAddr(peer->peer_addr) : NetAddr());
}).get()));
return ret;
}
@@ -650,6 +650,7 @@ void PeerNetwork<O, _, __>::on_teardown(const ConnPool::conn_t &_conn) {
known_peers[p->peer_addr] = std::make_pair(uint256_t(), TimerEvent());
{
pinfo_ulock_t __g(pid2peer_lock);
+ p->conn->peer = nullptr;
pid2peer.erase(p->peer_id);
}
this->user_tcall->async_call([this, conn](ThreadCall::Handle &) {