aboutsummaryrefslogtreecommitdiff
path: root/src/rpc
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-10-06 22:49:45 +0400
committerRiccardo Spagni <ric@spagni.net>2017-10-06 22:49:45 +0400
commit3bcce5be8687fc99d5faa5c71e7a07afb7cdb39d (patch)
treedd14a8fb911acf97900548c7c1965c2d6a46a331 /src/rpc
parentMerge pull request #2518 (diff)
parentUpgrades to epee::net_utils::network_address (diff)
downloadmonero-3bcce5be8687fc99d5faa5c71e7a07afb7cdb39d.tar.xz
Merge pull request #2345
8b006877 Upgrades to epee::net_utils::network_address - internal nullptr checks - prevent modifications to network_address (shallow copy issues) - automagically works with any type containing interface functions - removed fnv1a hashing - ipv4_network_address now flattened with no base class (Lee Clagett)
Diffstat (limited to '')
-rw-r--r--src/rpc/core_rpc_server.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 9b91f438a..b9678f414 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -1395,7 +1395,7 @@ namespace cryptonote
}
else
{
- na.reset(new epee::net_utils::ipv4_network_address(i->ip, 0));
+ na = epee::net_utils::ipv4_network_address{i->ip, 0};
}
if (i->ban)
m_p2p.block_host(na, i->seconds);