mirror of https://github.com/oxen-io/lokinet
Review fixes + misc fixes
dr7ana
7 months ago
parent
8b70e0ad2b
commit
af0ac28119
@ -1,121 +0,0 @@
|
||||
#ifndef _WIN32
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
|
||||
#include "exit_info.hpp"
|
||||
|
||||
#include <llarp/util/bencode.h>
|
||||
|
||||
#include <cstring>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
bool
|
||||
ExitInfo::bt_encode(llarp_buffer_t* buf) const
|
||||
{
|
||||
SockAddr exitaddr = ipAddress.createSockAddr();
|
||||
const auto* exitaddr6 = static_cast<const sockaddr_in6*>(exitaddr);
|
||||
|
||||
SockAddr netmaskaddr = netmask.createSockAddr();
|
||||
const auto* netmaskaddr6 = static_cast<const sockaddr_in6*>(netmaskaddr);
|
||||
|
||||
char tmp[128] = {0};
|
||||
if (!bencode_start_dict(buf))
|
||||
return false;
|
||||
|
||||
if (!inet_ntop(AF_INET6, &exitaddr6->sin6_addr, tmp, sizeof(tmp)))
|
||||
return false;
|
||||
if (!BEncodeWriteDictString("a", std::string(tmp), buf))
|
||||
return false;
|
||||
|
||||
if (!inet_ntop(AF_INET6, &netmaskaddr6->sin6_addr, tmp, sizeof(tmp)))
|
||||
return false;
|
||||
if (!BEncodeWriteDictString("b", std::string(tmp), buf))
|
||||
return false;
|
||||
|
||||
if (!BEncodeWriteDictEntry("k", pubkey, buf))
|
||||
return false;
|
||||
|
||||
if (!BEncodeWriteDictInt("v", version, buf))
|
||||
return false;
|
||||
|
||||
return bencode_end(buf);
|
||||
}
|
||||
|
||||
static bool
|
||||
bdecode_ip_string(llarp_buffer_t* buf, in6_addr& ip)
|
||||
{
|
||||
char tmp[128] = {0};
|
||||
llarp_buffer_t strbuf;
|
||||
if (!bencode_read_string(buf, &strbuf))
|
||||
return false;
|
||||
|
||||
if (strbuf.sz >= sizeof(tmp))
|
||||
return false;
|
||||
|
||||
memcpy(tmp, strbuf.base, strbuf.sz);
|
||||
tmp[strbuf.sz] = 0;
|
||||
return inet_pton(AF_INET6, tmp, &ip.s6_addr[0]) == 1;
|
||||
}
|
||||
|
||||
bool
|
||||
ExitInfo::decode_key(const llarp_buffer_t& k, llarp_buffer_t* buf)
|
||||
{
|
||||
bool read = false;
|
||||
if (!BEncodeMaybeReadDictEntry("k", pubkey, read, k, buf))
|
||||
return false;
|
||||
if (!BEncodeMaybeReadDictInt("v", version, read, k, buf))
|
||||
return false;
|
||||
if (k.startswith("a"))
|
||||
{
|
||||
in6_addr tmp;
|
||||
if (not bdecode_ip_string(buf, tmp))
|
||||
return false;
|
||||
|
||||
SockAddr addr(tmp);
|
||||
ipAddress = IpAddress(addr);
|
||||
return true;
|
||||
}
|
||||
if (k.startswith("b"))
|
||||
{
|
||||
in6_addr tmp;
|
||||
if (not bdecode_ip_string(buf, tmp))
|
||||
return false;
|
||||
SockAddr addr(tmp);
|
||||
netmask = IpAddress(addr);
|
||||
return true;
|
||||
}
|
||||
return read;
|
||||
}
|
||||
|
||||
std::string
|
||||
ExitInfo::ToString() const
|
||||
{
|
||||
/*
|
||||
// TODO: derive these from ipAdress
|
||||
throw std::runtime_error("FIXME: need in6_addr and netmask from IpAddress");
|
||||
in6_addr address;
|
||||
in6_addr netmask;
|
||||
|
||||
Printer printer(stream, level, spaces);
|
||||
|
||||
std::ostringstream ss;
|
||||
char tmp[128] = {0};
|
||||
|
||||
if (inet_ntop(AF_INET6, (void*)&address, tmp, sizeof(tmp)))
|
||||
ss << tmp;
|
||||
else
|
||||
return stream;
|
||||
ss << std::string("/");
|
||||
#if defined(ANDROID)
|
||||
snprintf(tmp, sizeof(tmp), "%zu", llarp::bits::count_array_bits(netmask.s6_addr));
|
||||
ss << tmp;
|
||||
#else
|
||||
ss << std::to_string(llarp::bits::count_array_bits(netmask.s6_addr));
|
||||
#endif
|
||||
printer.printValue(ss.str());
|
||||
*/
|
||||
return fmt::format("[Exit {}]", ipAddress.ToString());
|
||||
}
|
||||
|
||||
} // namespace llarp
|
||||
@ -1,51 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include "ip_address.hpp"
|
||||
|
||||
#include <llarp/crypto/types.hpp>
|
||||
#include <llarp/util/bencode.hpp>
|
||||
|
||||
#include <iosfwd>
|
||||
|
||||
/**
|
||||
* exit_info.h
|
||||
*
|
||||
* utilities for handling exits on the llarp network
|
||||
*/
|
||||
|
||||
/// Exit info model
|
||||
namespace llarp
|
||||
{
|
||||
/// deprecated don't use me , this is only for backwards compat
|
||||
struct ExitInfo
|
||||
{
|
||||
IpAddress ipAddress;
|
||||
IpAddress netmask;
|
||||
PubKey pubkey;
|
||||
uint64_t version = llarp::constants::proto_version;
|
||||
|
||||
ExitInfo() = default;
|
||||
|
||||
ExitInfo(const PubKey& pk, const IpAddress& address) : ipAddress(address), pubkey(pk)
|
||||
{}
|
||||
|
||||
bool
|
||||
bt_encode(llarp_buffer_t* buf) const;
|
||||
|
||||
bool
|
||||
BDecode(llarp_buffer_t* buf)
|
||||
{
|
||||
return bencode_decode_dict(*this, buf);
|
||||
}
|
||||
|
||||
bool
|
||||
decode_key(const llarp_buffer_t& k, llarp_buffer_t* buf);
|
||||
|
||||
std::string
|
||||
ToString() const;
|
||||
};
|
||||
|
||||
template <>
|
||||
constexpr inline bool IsToStringFormattable<ExitInfo> = true;
|
||||
|
||||
} // namespace llarp
|
||||
Loading…
Reference in New Issue