diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-10-06 22:49:45 +0400 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-10-06 22:49:45 +0400 |
| commit | 3bcce5be8687fc99d5faa5c71e7a07afb7cdb39d (patch) | |
| tree | dd14a8fb911acf97900548c7c1965c2d6a46a331 /src/rpc | |
| parent | a2041c98742154df4360831c99cfd9200a5620c2 (diff) | |
| parent | 8b0068773525e585ce4c98d4ea2ce66dd6cf4aad (diff) | |
| download | monzero-core-3bcce5be8687fc99d5faa5c71e7a07afb7cdb39d.tar.gz monzero-core-3bcce5be8687fc99d5faa5c71e7a07afb7cdb39d.tar.xz monzero-core-3bcce5be8687fc99d5faa5c71e7a07afb7cdb39d.zip | |
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 'src/rpc')
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 2 |
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); |