mirror of
https://github.com/oxen-io/oxen-core.git
synced 2023-12-14 02:22:56 +01:00
Merge commit '1880c1a58290cde589fe6db1062284ddba294483' into MergeUpstream
This commit is contained in:
commit
7c22487613
3 changed files with 6 additions and 3 deletions
|
@ -52,7 +52,6 @@ namespace epee { namespace net_utils
|
||||||
return (address.ip() & ~(0xffffffffull << m_mask)) == subnet();
|
return (address.ip() & ~(0xffffffffull << m_mask)) == subnet();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool network_address::equal(const network_address& other) const
|
bool network_address::equal(const network_address& other) const
|
||||||
{
|
{
|
||||||
// clang typeid workaround
|
// clang typeid workaround
|
||||||
|
|
|
@ -93,8 +93,8 @@ constexpr char const CORE_RPC_STATUS_TX_LONG_POLL_MAX_CONNECTIONS[] = "Daemon ma
|
||||||
// whether they can talk to a given daemon without having to know in
|
// whether they can talk to a given daemon without having to know in
|
||||||
// advance which version they will stop working with
|
// advance which version they will stop working with
|
||||||
// Don't go over 32767 for any of these
|
// Don't go over 32767 for any of these
|
||||||
#define CORE_RPC_VERSION_MAJOR 3
|
#define CORE_RPC_VERSION_MAJOR 2
|
||||||
#define CORE_RPC_VERSION_MINOR 3
|
#define CORE_RPC_VERSION_MINOR 8
|
||||||
#define MAKE_CORE_RPC_VERSION(major,minor) (((major)<<16)|(minor))
|
#define MAKE_CORE_RPC_VERSION(major,minor) (((major)<<16)|(minor))
|
||||||
#define CORE_RPC_VERSION MAKE_CORE_RPC_VERSION(CORE_RPC_VERSION_MAJOR, CORE_RPC_VERSION_MINOR)
|
#define CORE_RPC_VERSION MAKE_CORE_RPC_VERSION(CORE_RPC_VERSION_MAJOR, CORE_RPC_VERSION_MINOR)
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,10 @@
|
||||||
#define MAKE_IPV4_ADDRESS_PORT(a,b,c,d,e) epee::net_utils::ipv4_network_address{MAKE_IP(a,b,c,d),e}
|
#define MAKE_IPV4_ADDRESS_PORT(a,b,c,d,e) epee::net_utils::ipv4_network_address{MAKE_IP(a,b,c,d),e}
|
||||||
#define MAKE_IPV4_SUBNET(a,b,c,d,e) epee::net_utils::ipv4_network_subnet{MAKE_IP(a,b,c,d),e}
|
#define MAKE_IPV4_SUBNET(a,b,c,d,e) epee::net_utils::ipv4_network_subnet{MAKE_IP(a,b,c,d),e}
|
||||||
|
|
||||||
|
namespace cryptonote {
|
||||||
|
class blockchain_storage;
|
||||||
|
}
|
||||||
|
|
||||||
class test_core
|
class test_core
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
Loading…
Reference in a new issue