|
|
|
@ -29,13 +29,11 @@
|
|
|
|
|
#ifndef _NET_UTILS_BASE_H_
|
|
|
|
|
#define _NET_UTILS_BASE_H_
|
|
|
|
|
|
|
|
|
|
#include <boost/asio/io_service.hpp>
|
|
|
|
|
#include <boost/uuid/uuid.hpp>
|
|
|
|
|
#include <memory>
|
|
|
|
|
#include <boost/asio/io_service.hpp>
|
|
|
|
|
#include <typeinfo>
|
|
|
|
|
#include <type_traits>
|
|
|
|
|
#include "serialization/keyvalue_serialization.h"
|
|
|
|
|
#include "string_tools.h"
|
|
|
|
|
#include "misc_log_ex.h"
|
|
|
|
|
|
|
|
|
|
#undef MONERO_DEFAULT_LOG_CATEGORY
|
|
|
|
@ -45,7 +43,6 @@
|
|
|
|
|
#define MAKE_IP( a1, a2, a3, a4 ) (a1|(a2<<8)|(a3<<16)|(a4<<24))
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
namespace epee
|
|
|
|
|
{
|
|
|
|
|
namespace net_utils
|
|
|
|
@ -214,19 +211,8 @@ namespace net_utils
|
|
|
|
|
inline bool operator>=(const network_address& lhs, const network_address& rhs)
|
|
|
|
|
{ return !lhs.less(rhs); }
|
|
|
|
|
|
|
|
|
|
inline bool create_network_address(network_address &address, const std::string &string, uint16_t default_port = 0)
|
|
|
|
|
{
|
|
|
|
|
uint32_t ip;
|
|
|
|
|
uint16_t port;
|
|
|
|
|
if (epee::string_tools::parse_peer_from_string(ip, port, string))
|
|
|
|
|
{
|
|
|
|
|
if (default_port && !port)
|
|
|
|
|
port = default_port;
|
|
|
|
|
address = ipv4_network_address{ip, port};
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
bool create_network_address(network_address &address, const std::string &string, uint16_t default_port = 0);
|
|
|
|
|
|
|
|
|
|
/************************************************************************/
|
|
|
|
|
/* */
|
|
|
|
|
/************************************************************************/
|
|
|
|
@ -309,21 +295,8 @@ namespace net_utils
|
|
|
|
|
//some helpers
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
inline
|
|
|
|
|
std::string print_connection_context(const connection_context_base& ctx)
|
|
|
|
|
{
|
|
|
|
|
std::stringstream ss;
|
|
|
|
|
ss << ctx.m_remote_address.str() << " " << epee::string_tools::get_str_from_guid_a(ctx.m_connection_id) << (ctx.m_is_income ? " INC":" OUT");
|
|
|
|
|
return ss.str();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
inline
|
|
|
|
|
std::string print_connection_context_short(const connection_context_base& ctx)
|
|
|
|
|
{
|
|
|
|
|
std::stringstream ss;
|
|
|
|
|
ss << ctx.m_remote_address.str() << (ctx.m_is_income ? " INC":" OUT");
|
|
|
|
|
return ss.str();
|
|
|
|
|
}
|
|
|
|
|
std::string print_connection_context(const connection_context_base& ctx);
|
|
|
|
|
std::string print_connection_context_short(const connection_context_base& ctx);
|
|
|
|
|
|
|
|
|
|
inline MAKE_LOGGABLE(connection_context_base, ct, os)
|
|
|
|
|
{
|
|
|
|
|