diff options
author | luigi1111 <luigi1111w@gmail.com> | 2019-07-24 14:25:51 -0500 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2019-07-24 14:25:51 -0500 |
commit | 8774555d29a3594d430d1bc7c744ca904f38b389 (patch) | |
tree | 636bea13e50cce0cea15235882b6b2c7138b2a9d /src/serialization | |
parent | Merge pull request #5594 (diff) | |
parent | daemon: display peer address type in print_cn (diff) | |
download | monero-8774555d29a3594d430d1bc7c744ca904f38b389.tar.xz |
Merge pull request #5595
2aa1134 daemon: display peer address type in print_cn (moneromooo-monero)
Diffstat (limited to 'src/serialization')
-rw-r--r-- | src/serialization/json_object.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/serialization/json_object.cpp b/src/serialization/json_object.cpp index 73e17a775..cc52bde58 100644 --- a/src/serialization/json_object.cpp +++ b/src/serialization/json_object.cpp @@ -566,6 +566,7 @@ void toJsonValue(rapidjson::Document& doc, const cryptonote::connection_info& in INSERT_INTO_JSON_OBJECT(val, doc, incoming, info.incoming); INSERT_INTO_JSON_OBJECT(val, doc, localhost, info.localhost); INSERT_INTO_JSON_OBJECT(val, doc, local_ip, info.local_ip); + INSERT_INTO_JSON_OBJECT(val, doc, address_type, info.address_type); INSERT_INTO_JSON_OBJECT(val, doc, ip, info.ip); INSERT_INTO_JSON_OBJECT(val, doc, port, info.port); @@ -601,6 +602,7 @@ void fromJsonValue(const rapidjson::Value& val, cryptonote::connection_info& inf GET_FROM_JSON_OBJECT(val, info.incoming, incoming); GET_FROM_JSON_OBJECT(val, info.localhost, localhost); GET_FROM_JSON_OBJECT(val, info.local_ip, local_ip); + GET_FROM_JSON_OBJECT(val, info.address_type, address_type); GET_FROM_JSON_OBJECT(val, info.ip, ip); GET_FROM_JSON_OBJECT(val, info.port, port); |