mirror of https://github.com/oxen-io/lokinet
standardize include format and pragma once
All #ifndef guards on headers have been removed, I think, in favor of #pragma once Headers are now included as `#include "filename"` if the included file resides in the same directory as the file including it, or any subdirectory therein. Otherwise they are included as `#include <project/top/dir/relative/path/filename>` The above does not include system/os headers.
This commit is contained in:
parent
35fb54d131
commit
7caa87862e
|
@ -4,7 +4,7 @@
|
|||
#include <future>
|
||||
#include <vector>
|
||||
#include <array>
|
||||
#include <net/net.hpp>
|
||||
#include <llarp/net/net.hpp>
|
||||
|
||||
#ifdef _WIN32
|
||||
// add the unholy windows headers for iphlpapi
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include <config/config.hpp>
|
||||
#include <router_contact.hpp>
|
||||
#include <util/logging/logger.hpp>
|
||||
#include <util/logging/ostream_logger.hpp>
|
||||
#include <llarp/config/config.hpp>
|
||||
#include <llarp/router_contact.hpp>
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
#include <llarp/util/logging/ostream_logger.hpp>
|
||||
|
||||
#include <cxxopts.hpp>
|
||||
#include <string>
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
#include <config/config.hpp> // for ensure_config
|
||||
#include <constants/version.hpp>
|
||||
#include <llarp/config/config.hpp> // for ensure_config
|
||||
#include <llarp/constants/version.hpp>
|
||||
#include <llarp.hpp>
|
||||
#include <util/lokinet_init.h>
|
||||
#include <util/fs.hpp>
|
||||
#include <util/logging/logger.hpp>
|
||||
#include <util/logging/ostream_logger.hpp>
|
||||
#include <util/str.hpp>
|
||||
#include <llarp/util/lokinet_init.h>
|
||||
#include <llarp/util/fs.hpp>
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
#include <llarp/util/logging/ostream_logger.hpp>
|
||||
#include <llarp/util/str.hpp>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <dbghelp.h>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "network_loki_lokinet_LokinetConfig.h"
|
||||
#include <llarp.hpp>
|
||||
#include <config/config.hpp>
|
||||
#include <llarp/config/config.hpp>
|
||||
#include "lokinet_jni_common.hpp"
|
||||
|
||||
extern "C"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#include "lokinet_jni_common.hpp"
|
||||
#include "lokinet_jni_vpnio.hpp"
|
||||
#include <llarp.hpp>
|
||||
#include <config/config.hpp>
|
||||
#include <llarp/config/config.hpp>
|
||||
|
||||
extern "C"
|
||||
{
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#ifndef LOKINET_JNI_COMMON_HPP
|
||||
#define LOKINET_JNI_COMMON_HPP
|
||||
#pragma once
|
||||
|
||||
#include <jni.h>
|
||||
#include <string_view>
|
||||
|
@ -78,5 +77,3 @@ GetImpl(JNIEnv* env, jobject self)
|
|||
{
|
||||
return FromObjectMember<T>(env, self, "impl");
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#ifndef LOKINET_JNI_VPNIO_HPP
|
||||
#define LOKINET_JNI_VPNIO_HPP
|
||||
#pragma once
|
||||
|
||||
#include <llarp.h>
|
||||
#include <memory>
|
||||
|
@ -143,5 +142,3 @@ struct lokinet_jni_vpnio : public lokinet::VPNIO
|
|||
Tick() override
|
||||
{}
|
||||
};
|
||||
|
||||
#endif
|
|
@ -1,8 +1,8 @@
|
|||
#include "network_loki_lokinet_LokinetVPN.h"
|
||||
#include "lokinet_jni_vpnio.hpp"
|
||||
#include "lokinet_jni_common.hpp"
|
||||
#include <net/ip.hpp>
|
||||
#include <net/ip_packet.hpp>
|
||||
#include <llarp/net/ip.hpp>
|
||||
#include <llarp/net/ip_packet.hpp>
|
||||
#include <string_view>
|
||||
|
||||
extern "C"
|
||||
|
@ -82,4 +82,4 @@ extern "C"
|
|||
});
|
||||
vpn->info.netmask = GetObjectMemberAsInt<uint8_t>(env, info, "netmask");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <android/ifaddrs.h>
|
||||
#include "ifaddrs.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include <bootstrap.hpp>
|
||||
#include <util/bencode.hpp>
|
||||
#include "bootstrap.hpp"
|
||||
#include "util/bencode.hpp"
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef LLARP_BOOTSTRAP_HPP
|
||||
#define LLARP_BOOTSTRAP_HPP
|
||||
#pragma once
|
||||
|
||||
#include <router_contact.hpp>
|
||||
#include "router_contact.hpp"
|
||||
#include <set>
|
||||
|
||||
namespace llarp
|
||||
|
@ -18,5 +17,3 @@ namespace llarp
|
|||
Clear();
|
||||
};
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,25 +1,25 @@
|
|||
#include <chrono>
|
||||
#include <config/config.hpp>
|
||||
#include "config.hpp"
|
||||
|
||||
#include <config/ini.hpp>
|
||||
#include <constants/defaults.hpp>
|
||||
#include <constants/files.hpp>
|
||||
#include <net/net.hpp>
|
||||
#include <net/ip.hpp>
|
||||
#include <router_contact.hpp>
|
||||
#include "ini.hpp"
|
||||
#include <llarp/constants/defaults.hpp>
|
||||
#include <llarp/constants/files.hpp>
|
||||
#include <llarp/net/net.hpp>
|
||||
#include <llarp/net/ip.hpp>
|
||||
#include <llarp/router_contact.hpp>
|
||||
#include <stdexcept>
|
||||
#include <util/fs.hpp>
|
||||
#include <util/logging/logger.hpp>
|
||||
#include <util/mem.hpp>
|
||||
#include <util/str.hpp>
|
||||
#include <llarp/util/fs.hpp>
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
#include <llarp/util/mem.hpp>
|
||||
#include <llarp/util/str.hpp>
|
||||
|
||||
#include <service/name.hpp>
|
||||
#include <llarp/service/name.hpp>
|
||||
|
||||
#include <cstdlib>
|
||||
#include <fstream>
|
||||
#include <ios>
|
||||
#include <iostream>
|
||||
#include "constants/version.hpp"
|
||||
#include <llarp/constants/version.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,22 +1,21 @@
|
|||
#ifndef LLARP_CONFIG_HPP
|
||||
#define LLARP_CONFIG_HPP
|
||||
#pragma once
|
||||
|
||||
#include <chrono>
|
||||
#include <crypto/types.hpp>
|
||||
#include <router_contact.hpp>
|
||||
#include <util/fs.hpp>
|
||||
#include <util/str.hpp>
|
||||
#include <config/ini.hpp>
|
||||
#include <config/definition.hpp>
|
||||
#include <constants/files.hpp>
|
||||
#include <net/ip_address.hpp>
|
||||
#include <net/net_int.hpp>
|
||||
#include <net/ip_range_map.hpp>
|
||||
#include <service/address.hpp>
|
||||
#include <service/auth.hpp>
|
||||
#include <dns/srv_data.hpp>
|
||||
#include <llarp/crypto/types.hpp>
|
||||
#include <llarp/router_contact.hpp>
|
||||
#include <llarp/util/fs.hpp>
|
||||
#include <llarp/util/str.hpp>
|
||||
#include "ini.hpp"
|
||||
#include "definition.hpp"
|
||||
#include <llarp/constants/files.hpp>
|
||||
#include <llarp/net/ip_address.hpp>
|
||||
#include <llarp/net/net_int.hpp>
|
||||
#include <llarp/net/ip_range_map.hpp>
|
||||
#include <llarp/service/address.hpp>
|
||||
#include <llarp/service/auth.hpp>
|
||||
#include <llarp/dns/srv_data.hpp>
|
||||
|
||||
#include <router_contact.hpp>
|
||||
#include <llarp/router_contact.hpp>
|
||||
|
||||
#include <cstdlib>
|
||||
#include <functional>
|
||||
|
@ -276,5 +275,3 @@ namespace llarp
|
|||
ensureConfig(fs::path dataDir, fs::path confFile, bool overwrite, bool asRouter);
|
||||
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include <config/definition.hpp>
|
||||
#include <util/logging/logger.hpp>
|
||||
#include "definition.hpp"
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
|
||||
#include <iterator>
|
||||
#include <sstream>
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
#include <initializer_list>
|
||||
#include <type_traits>
|
||||
#include <util/str.hpp>
|
||||
#include <util/fs.hpp>
|
||||
#include <llarp/util/str.hpp>
|
||||
#include <llarp/util/fs.hpp>
|
||||
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include <config/ini.hpp>
|
||||
#include "ini.hpp"
|
||||
|
||||
#include <util/logging/logger.hpp>
|
||||
#include <util/str.hpp>
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
#include <llarp/util/str.hpp>
|
||||
|
||||
#include <cctype>
|
||||
#include <fstream>
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#ifndef LOKINET_BOOTSERV_CONFIG_HPP
|
||||
#define LOKINET_BOOTSERV_CONFIG_HPP
|
||||
#pragma once
|
||||
|
||||
#include <string_view>
|
||||
#include <string>
|
||||
|
@ -7,7 +6,7 @@
|
|||
#include <memory>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
#include <util/fs.hpp>
|
||||
#include <llarp/util/fs.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
@ -59,5 +58,3 @@ namespace llarp
|
|||
};
|
||||
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#include <config/key_manager.hpp>
|
||||
#include "key_manager.hpp"
|
||||
|
||||
#include <system_error>
|
||||
#include <util/logging/logger.hpp>
|
||||
#include "config/config.hpp"
|
||||
#include "crypto/crypto.hpp"
|
||||
#include "crypto/types.hpp"
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
#include "config.hpp"
|
||||
#include <llarp/crypto/crypto.hpp>
|
||||
#include <llarp/crypto/types.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
#ifndef LLARP_KEY_MANAGER_HPP
|
||||
#define LLARP_KEY_MANAGER_HPP
|
||||
#pragma once
|
||||
|
||||
#include <atomic>
|
||||
#include <config/config.hpp>
|
||||
#include <crypto/types.hpp>
|
||||
#include <router_contact.hpp>
|
||||
#include "config.hpp"
|
||||
#include <llarp/crypto/types.hpp>
|
||||
#include <llarp/router_contact.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
@ -88,5 +87,3 @@ namespace llarp
|
|||
};
|
||||
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include <consensus/table.hpp>
|
||||
#include <crypto/crypto.hpp>
|
||||
#include "table.hpp"
|
||||
#include <llarp/crypto/crypto.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef LLARP_CONSENSUS_TABLE_HPP
|
||||
#define LLARP_CONSENSUS_TABLE_HPP
|
||||
#pragma once
|
||||
|
||||
#include <crypto/types.hpp>
|
||||
#include <llarp/crypto/types.hpp>
|
||||
#include <vector>
|
||||
|
||||
namespace llarp
|
||||
|
@ -16,5 +15,3 @@ namespace llarp
|
|||
};
|
||||
} // namespace consensus
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#ifndef LLARP_DEFAULTS_HPP
|
||||
#define LLARP_DEFAULTS_HPP
|
||||
#pragma once
|
||||
|
||||
#ifndef DEFAULT_RESOLVER_US
|
||||
#define DEFAULT_RESOLVER_US "1.1.1.1"
|
||||
|
@ -17,5 +16,3 @@
|
|||
#ifndef DEFAULT_LOKINET_GROUP
|
||||
#define DEFAULT_LOKINET_GROUP "lokinet"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <util/fs.hpp>
|
||||
#include <llarp/util/fs.hpp>
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
@ -1,11 +1,9 @@
|
|||
#ifndef LLARP_LINK_LAYER_HPP
|
||||
#define LLARP_LINK_LAYER_HPP
|
||||
#include <util/types.hpp>
|
||||
#include <util/time.hpp>
|
||||
#pragma once
|
||||
#include <llarp/util/types.hpp>
|
||||
#include <llarp/util/time.hpp>
|
||||
|
||||
#include <cstdlib>
|
||||
|
||||
constexpr size_t MAX_LINK_MSG_SIZE = 8192;
|
||||
static constexpr auto DefaultLinkSessionLifetime = 1min;
|
||||
constexpr size_t MaxSendQueueSize = 1024;
|
||||
#endif
|
||||
|
|
|
@ -1,11 +1,10 @@
|
|||
#ifndef LLARP_CONSTANTS_PATH_HPP
|
||||
#define LLARP_CONSTANTS_PATH_HPP
|
||||
#pragma once
|
||||
|
||||
#include <chrono>
|
||||
#include <cstddef>
|
||||
|
||||
#include <util/types.hpp>
|
||||
#include <util/time.hpp>
|
||||
#include <llarp/util/types.hpp>
|
||||
#include <llarp/util/time.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
@ -40,5 +39,3 @@ namespace llarp
|
|||
|
||||
} // namespace path
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#ifndef LLARP_PROTO_HPP
|
||||
#define LLARP_PROTO_HPP
|
||||
#pragma once
|
||||
|
||||
#ifndef LLARP_PROTO_VERSION
|
||||
#define LLARP_PROTO_VERSION (0)
|
||||
|
@ -12,5 +11,3 @@
|
|||
#ifndef LLARP_KEYFILE_VERSION
|
||||
#define LLARP_KEYFILE_VERSION (1)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
#include <llarp.hpp>
|
||||
#include <constants/version.hpp>
|
||||
#include <constants/evloop.hpp>
|
||||
#include "constants/version.hpp"
|
||||
#include "constants/evloop.hpp"
|
||||
|
||||
#include <config/config.hpp>
|
||||
#include <crypto/crypto_libsodium.hpp>
|
||||
#include <dht/context.hpp>
|
||||
#include <ev/ev.hpp>
|
||||
#include <ev/vpnio.hpp>
|
||||
#include "config/config.hpp"
|
||||
#include "crypto/crypto_libsodium.hpp"
|
||||
#include "dht/context.hpp"
|
||||
#include "ev/ev.hpp"
|
||||
#include "ev/vpnio.hpp"
|
||||
#include <memory>
|
||||
#include <nodedb.hpp>
|
||||
#include <router/router.hpp>
|
||||
#include <service/context.hpp>
|
||||
#include <util/logging/logger.hpp>
|
||||
#include "nodedb.hpp"
|
||||
#include "router/router.hpp"
|
||||
#include "service/context.hpp"
|
||||
#include "util/logging/logger.hpp"
|
||||
|
||||
#include <cxxopts.hpp>
|
||||
#include <csignal>
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#ifndef LLARP_CRYPTO_CONSTANTS_HPP
|
||||
#define LLARP_CRYPTO_CONSTANTS_HPP
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
|
@ -21,5 +20,3 @@ static constexpr uint32_t PQ_CIPHERTEXTSIZE = crypto_kem_CIPHERTEXTBYTES;
|
|||
static constexpr uint32_t PQ_PUBKEYSIZE = crypto_kem_PUBLICKEYBYTES;
|
||||
static constexpr uint32_t PQ_SECRETKEYSIZE = crypto_kem_SECRETKEYBYTES;
|
||||
static constexpr uint32_t PQ_KEYPAIRSIZE = (PQ_SECRETKEYSIZE + PQ_PUBKEYSIZE);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include <crypto/crypto.hpp>
|
||||
#include "crypto.hpp"
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
#ifndef LLARP_CRYPTO_HPP
|
||||
#define LLARP_CRYPTO_HPP
|
||||
#pragma once
|
||||
|
||||
#include <crypto/constants.hpp>
|
||||
#include <crypto/types.hpp>
|
||||
#include "constants.hpp"
|
||||
#include "types.hpp"
|
||||
|
||||
#include <util/buffer.hpp>
|
||||
#include <llarp/util/buffer.hpp>
|
||||
|
||||
#include <functional>
|
||||
|
||||
|
@ -176,5 +175,3 @@ namespace llarp
|
|||
};
|
||||
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include <crypto/crypto_libsodium.hpp>
|
||||
#include "crypto_libsodium.hpp"
|
||||
#include <sodium/crypto_generichash.h>
|
||||
#include <sodium/crypto_sign.h>
|
||||
#include <sodium/crypto_scalarmult.h>
|
||||
|
@ -8,9 +8,9 @@
|
|||
#include <sodium/crypto_aead_xchacha20poly1305.h>
|
||||
#include <sodium/randombytes.h>
|
||||
#include <sodium/utils.h>
|
||||
#include <util/mem.hpp>
|
||||
#include <util/endian.hpp>
|
||||
#include <util/str.hpp>
|
||||
#include <llarp/util/mem.hpp>
|
||||
#include <llarp/util/endian.hpp>
|
||||
#include <llarp/util/str.hpp>
|
||||
#include <cassert>
|
||||
#include <cstring>
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef LLARP_CRYPTO_LIBSODIUM_HPP
|
||||
#define LLARP_CRYPTO_LIBSODIUM_HPP
|
||||
#pragma once
|
||||
|
||||
#include <crypto/crypto.hpp>
|
||||
#include "crypto.hpp"
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
@ -109,5 +108,3 @@ namespace llarp
|
|||
} // namespace sodium
|
||||
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,11 +1,10 @@
|
|||
#ifndef LLARP_ENCRYPTED_HPP
|
||||
#define LLARP_ENCRYPTED_HPP
|
||||
#pragma once
|
||||
|
||||
#include <constants/link_layer.hpp>
|
||||
#include <util/aligned.hpp>
|
||||
#include <util/bencode.h>
|
||||
#include <util/buffer.hpp>
|
||||
#include <util/mem.hpp>
|
||||
#include <llarp/constants/link_layer.hpp>
|
||||
#include <llarp/util/aligned.hpp>
|
||||
#include <llarp/util/bencode.h>
|
||||
#include <llarp/util/buffer.hpp>
|
||||
#include <llarp/util/mem.hpp>
|
||||
|
||||
#include <vector>
|
||||
#include <stdexcept>
|
||||
|
@ -165,5 +164,3 @@ namespace llarp
|
|||
llarp_buffer_t m_Buffer;
|
||||
}; // namespace llarp
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#include <crypto/encrypted_frame.hpp>
|
||||
#include "encrypted_frame.hpp"
|
||||
|
||||
#include <crypto/crypto.hpp>
|
||||
#include <util/logging/logger.hpp>
|
||||
#include <util/mem.hpp>
|
||||
#include "crypto.hpp"
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
#include <llarp/util/mem.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,11 +1,10 @@
|
|||
#ifndef LLARP_ENCRYPTED_FRAME_HPP
|
||||
#define LLARP_ENCRYPTED_FRAME_HPP
|
||||
#pragma once
|
||||
|
||||
#include <crypto/encrypted.hpp>
|
||||
#include <crypto/types.hpp>
|
||||
#include <util/buffer.hpp>
|
||||
#include "encrypted.hpp"
|
||||
#include "types.hpp"
|
||||
#include <llarp/util/buffer.hpp>
|
||||
#include <utility>
|
||||
#include <util/mem.h>
|
||||
#include <llarp/util/mem.h>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
@ -85,5 +84,3 @@ namespace llarp
|
|||
}
|
||||
};
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#include <crypto/types.hpp>
|
||||
#include "types.hpp"
|
||||
|
||||
#include <util/buffer.hpp>
|
||||
#include <llarp/util/buffer.hpp>
|
||||
|
||||
#include <fstream>
|
||||
#include <util/fs.hpp>
|
||||
#include <llarp/util/fs.hpp>
|
||||
|
||||
#include <iterator>
|
||||
|
||||
|
|
|
@ -1,11 +1,10 @@
|
|||
#ifndef LLARP_CRYPTO_TYPES_HPP
|
||||
#define LLARP_CRYPTO_TYPES_HPP
|
||||
#pragma once
|
||||
|
||||
#include <crypto/constants.hpp>
|
||||
#include <router_id.hpp>
|
||||
#include <util/aligned.hpp>
|
||||
#include <util/types.hpp>
|
||||
#include <util/fs.hpp>
|
||||
#include "constants.hpp"
|
||||
#include <llarp/router_id.hpp>
|
||||
#include <llarp/util/aligned.hpp>
|
||||
#include <llarp/util/types.hpp>
|
||||
#include <llarp/util/fs.hpp>
|
||||
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
|
@ -244,5 +243,3 @@ namespace llarp
|
|||
/// SH(result, body)
|
||||
using shorthash_func = std::function<bool(ShortHash&, const llarp_buffer_t&)>;
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
#ifndef LLARP_DHT_BUCKET_HPP
|
||||
#define LLARP_DHT_BUCKET_HPP
|
||||
#pragma once
|
||||
|
||||
#include <dht/kademlia.hpp>
|
||||
#include <dht/key.hpp>
|
||||
#include <util/status.hpp>
|
||||
#include "kademlia.hpp"
|
||||
#include "key.hpp"
|
||||
#include <llarp/util/status.hpp>
|
||||
|
||||
#include <map>
|
||||
#include <set>
|
||||
|
@ -230,4 +229,3 @@ namespace llarp
|
|||
};
|
||||
} // namespace dht
|
||||
} // namespace llarp
|
||||
#endif
|
||||
|
|
|
@ -1,26 +1,26 @@
|
|||
#include <dht/context.hpp>
|
||||
#include "context.hpp"
|
||||
|
||||
#include <dht/explorenetworkjob.hpp>
|
||||
#include <dht/localrouterlookup.hpp>
|
||||
#include <dht/localserviceaddresslookup.hpp>
|
||||
#include <dht/localtaglookup.hpp>
|
||||
#include <dht/messages/findrouter.hpp>
|
||||
#include <dht/messages/gotintro.hpp>
|
||||
#include <dht/messages/gotrouter.hpp>
|
||||
#include <dht/messages/pubintro.hpp>
|
||||
#include <dht/node.hpp>
|
||||
#include <dht/publishservicejob.hpp>
|
||||
#include <dht/recursiverouterlookup.hpp>
|
||||
#include <dht/serviceaddresslookup.hpp>
|
||||
#include <dht/taglookup.hpp>
|
||||
#include <messages/dht_immediate.hpp>
|
||||
#include <path/path_context.hpp>
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include <routing/dht_message.hpp>
|
||||
#include <nodedb.hpp>
|
||||
#include <profiling.hpp>
|
||||
#include <router/i_rc_lookup_handler.hpp>
|
||||
#include <util/decaying_hashset.hpp>
|
||||
#include "explorenetworkjob.hpp"
|
||||
#include "localrouterlookup.hpp"
|
||||
#include "localserviceaddresslookup.hpp"
|
||||
#include "localtaglookup.hpp"
|
||||
#include <llarp/dht/messages/findrouter.hpp>
|
||||
#include <llarp/dht/messages/gotintro.hpp>
|
||||
#include <llarp/dht/messages/gotrouter.hpp>
|
||||
#include <llarp/dht/messages/pubintro.hpp>
|
||||
#include "node.hpp"
|
||||
#include "publishservicejob.hpp"
|
||||
#include "recursiverouterlookup.hpp"
|
||||
#include "serviceaddresslookup.hpp"
|
||||
#include "taglookup.hpp"
|
||||
#include <llarp/messages/dht_immediate.hpp>
|
||||
#include <llarp/path/path_context.hpp>
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
#include <llarp/routing/dht_message.hpp>
|
||||
#include <llarp/nodedb.hpp>
|
||||
#include <llarp/profiling.hpp>
|
||||
#include <llarp/router/i_rc_lookup_handler.hpp>
|
||||
#include <llarp/util/decaying_hashset.hpp>
|
||||
#include <vector>
|
||||
|
||||
namespace llarp
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
#ifndef LLARP_DHT_CONTEXT
|
||||
#define LLARP_DHT_CONTEXT
|
||||
|
||||
#include <dht/bucket.hpp>
|
||||
#include <dht/dht.h>
|
||||
#include <dht/key.hpp>
|
||||
#include <dht/message.hpp>
|
||||
#include <dht/messages/findintro.hpp>
|
||||
#include <dht/node.hpp>
|
||||
#include <dht/tx.hpp>
|
||||
#include <dht/txholder.hpp>
|
||||
#include <dht/txowner.hpp>
|
||||
#include <service/intro_set.hpp>
|
||||
#include <util/time.hpp>
|
||||
#include <util/status.hpp>
|
||||
#include "bucket.hpp"
|
||||
#include "dht.h"
|
||||
#include "key.hpp"
|
||||
#include "message.hpp"
|
||||
#include <llarp/dht/messages/findintro.hpp>
|
||||
#include "node.hpp"
|
||||
#include "tx.hpp"
|
||||
#include "txholder.hpp"
|
||||
#include "txowner.hpp"
|
||||
#include <llarp/service/intro_set.hpp>
|
||||
#include <llarp/util/time.hpp>
|
||||
#include <llarp/util/status.hpp>
|
||||
|
||||
#include <memory>
|
||||
#include <set>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include <dht/context.hpp>
|
||||
#include <dht/dht.h>
|
||||
#include <router_contact.hpp>
|
||||
#include "context.hpp"
|
||||
#include "dht.h"
|
||||
#include <llarp/router_contact.hpp>
|
||||
|
||||
llarp_dht_context::llarp_dht_context(llarp::AbstractRouter* router)
|
||||
{
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
#ifndef LLARP_DHT_H_
|
||||
#define LLARP_DHT_H_
|
||||
#pragma once
|
||||
|
||||
#include <crypto/crypto.hpp>
|
||||
#include <router_contact.hpp>
|
||||
#include <util/buffer.hpp>
|
||||
#include <llarp/crypto/crypto.hpp>
|
||||
#include <llarp/router_contact.hpp>
|
||||
#include <llarp/util/buffer.hpp>
|
||||
|
||||
/**
|
||||
* dht.h
|
||||
|
@ -60,5 +59,3 @@ __llarp_dht_remove_peer(struct llarp_dht_context* ctx, const byte_t* id);
|
|||
|
||||
void
|
||||
llarp_dht_lookup_router(struct llarp_dht_context* ctx, struct llarp_router_lookup_job* job);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
#include <dht/explorenetworkjob.hpp>
|
||||
#include "explorenetworkjob.hpp"
|
||||
|
||||
#include <dht/context.hpp>
|
||||
#include <dht/messages/findrouter.hpp>
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include "context.hpp"
|
||||
#include <llarp/dht/messages/findrouter.hpp>
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
|
||||
#include <nodedb.hpp>
|
||||
#include <llarp/nodedb.hpp>
|
||||
|
||||
#include <tooling/dht_event.hpp>
|
||||
#include <llarp/tooling/dht_event.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#ifndef LLARP_DHT_EXPLORENETWORKJOB
|
||||
#define LLARP_DHT_EXPLORENETWORKJOB
|
||||
|
||||
#include <dht/tx.hpp>
|
||||
#include <router_id.hpp>
|
||||
#include "tx.hpp"
|
||||
#include <llarp/router_id.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
#ifndef LLARP_DHT_KADEMLIA_HPP
|
||||
#define LLARP_DHT_KADEMLIA_HPP
|
||||
#pragma once
|
||||
|
||||
#include <dht/key.hpp>
|
||||
#include <router_contact.hpp>
|
||||
#include "key.hpp"
|
||||
#include <llarp/router_contact.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
@ -29,4 +28,3 @@ namespace llarp
|
|||
};
|
||||
} // namespace dht
|
||||
} // namespace llarp
|
||||
#endif
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
#ifndef LLARP_DHT_KEY_HPP
|
||||
#define LLARP_DHT_KEY_HPP
|
||||
#pragma once
|
||||
|
||||
#include <util/aligned.hpp>
|
||||
#include <router_id.hpp>
|
||||
#include <llarp/util/aligned.hpp>
|
||||
#include <llarp/router_id.hpp>
|
||||
|
||||
#include <array>
|
||||
|
||||
|
@ -75,5 +74,3 @@ namespace llarp
|
|||
};
|
||||
} // namespace dht
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
#include <dht/localrouterlookup.hpp>
|
||||
#include "localrouterlookup.hpp"
|
||||
|
||||
#include <dht/context.hpp>
|
||||
#include <dht/messages/gotrouter.hpp>
|
||||
#include "context.hpp"
|
||||
#include <llarp/dht/messages/gotrouter.hpp>
|
||||
|
||||
#include <path/path_context.hpp>
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include <routing/dht_message.hpp>
|
||||
#include <util/logging/logger.hpp>
|
||||
#include <llarp/path/path_context.hpp>
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
#include <llarp/routing/dht_message.hpp>
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
#ifndef LLARP_DHT_LOCALROUTERLOOKUP
|
||||
#define LLARP_DHT_LOCALROUTERLOOKUP
|
||||
|
||||
#include <dht/recursiverouterlookup.hpp>
|
||||
#include "recursiverouterlookup.hpp"
|
||||
|
||||
#include <path/path_types.hpp>
|
||||
#include <router_contact.hpp>
|
||||
#include <router_id.hpp>
|
||||
#include <llarp/path/path_types.hpp>
|
||||
#include <llarp/router_contact.hpp>
|
||||
#include <llarp/router_id.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
#include <dht/localserviceaddresslookup.hpp>
|
||||
#include "localserviceaddresslookup.hpp"
|
||||
|
||||
#include <dht/context.hpp>
|
||||
#include <dht/messages/gotintro.hpp>
|
||||
#include <path/path_context.hpp>
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include <routing/dht_message.hpp>
|
||||
#include <util/logging/logger.hpp>
|
||||
#include "context.hpp"
|
||||
#include <llarp/dht/messages/gotintro.hpp>
|
||||
#include <llarp/path/path_context.hpp>
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
#include <llarp/routing/dht_message.hpp>
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#ifndef LLARP_DHT_LOCALSERVICEADDRESSLOOKUP
|
||||
#define LLARP_DHT_LOCALSERVICEADDRESSLOOKUP
|
||||
|
||||
#include <dht/serviceaddresslookup.hpp>
|
||||
#include "serviceaddresslookup.hpp"
|
||||
|
||||
#include <path/path_types.hpp>
|
||||
#include <llarp/path/path_types.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#include <dht/localtaglookup.hpp>
|
||||
#include "localtaglookup.hpp"
|
||||
|
||||
#include <dht/context.hpp>
|
||||
#include <dht/messages/gotintro.hpp>
|
||||
#include <path/path_context.hpp>
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include <routing/dht_message.hpp>
|
||||
#include "context.hpp"
|
||||
#include <llarp/dht/messages/gotintro.hpp>
|
||||
#include <llarp/path/path_context.hpp>
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
#include <llarp/routing/dht_message.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef LLARP_DHT_LOOKUPTAGLOOKUP
|
||||
#define LLARP_DHT_LOOKUPTAGLOOKUP
|
||||
|
||||
#include <dht/taglookup.hpp>
|
||||
#include "taglookup.hpp"
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
#include <dht/context.hpp>
|
||||
#include "context.hpp"
|
||||
|
||||
#include <memory>
|
||||
#include <util/bencode.hpp>
|
||||
#include <dht/messages/findintro.hpp>
|
||||
#include <dht/messages/findrouter.hpp>
|
||||
#include <dht/messages/gotintro.hpp>
|
||||
#include <dht/messages/gotrouter.hpp>
|
||||
#include <dht/messages/pubintro.hpp>
|
||||
#include <dht/messages/findname.hpp>
|
||||
#include <dht/messages/gotname.hpp>
|
||||
#include <llarp/util/bencode.hpp>
|
||||
#include <llarp/dht/messages/findintro.hpp>
|
||||
#include <llarp/dht/messages/findrouter.hpp>
|
||||
#include <llarp/dht/messages/gotintro.hpp>
|
||||
#include <llarp/dht/messages/gotrouter.hpp>
|
||||
#include <llarp/dht/messages/pubintro.hpp>
|
||||
#include <llarp/dht/messages/findname.hpp>
|
||||
#include <llarp/dht/messages/gotname.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
#ifndef LLARP_DHT_MESSAGE_HPP
|
||||
#define LLARP_DHT_MESSAGE_HPP
|
||||
#pragma once
|
||||
|
||||
#include <dht/dht.h>
|
||||
#include <dht/key.hpp>
|
||||
#include <path/path_types.hpp>
|
||||
#include <util/bencode.hpp>
|
||||
#include "dht.h"
|
||||
#include "key.hpp"
|
||||
#include <llarp/path/path_types.hpp>
|
||||
#include <llarp/util/bencode.hpp>
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
@ -46,5 +45,3 @@ namespace llarp
|
|||
Key_t from, llarp_buffer_t* buf, std::vector<IMessage::Ptr_t>& dst, bool relayed = false);
|
||||
} // namespace dht
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef LLARP_DHT_MESSAGES_CONSENSUS_HPP
|
||||
#define LLARP_DHT_MESSAGES_CONSENSUS_HPP
|
||||
#include <dht/message.hpp>
|
||||
#include <router_version.hpp>
|
||||
#pragma once
|
||||
#include <llarp/dht/message.hpp>
|
||||
#include <llarp/router_version.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#include <dht/context.hpp>
|
||||
#include <dht/messages/findintro.hpp>
|
||||
#include <dht/messages/gotintro.hpp>
|
||||
#include <routing/message.hpp>
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include <nodedb.hpp>
|
||||
#include <llarp/dht/context.hpp>
|
||||
#include "findintro.hpp"
|
||||
#include "gotintro.hpp"
|
||||
#include <llarp/routing/message.hpp>
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
#include <llarp/nodedb.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
#ifndef LLARP_DHT_MESSAGES_FIND_INTRO_HPP
|
||||
#define LLARP_DHT_MESSAGES_FIND_INTRO_HPP
|
||||
#pragma once
|
||||
|
||||
#include <dht/message.hpp>
|
||||
#include <routing/message.hpp>
|
||||
#include <service/address.hpp>
|
||||
#include <service/tag.hpp>
|
||||
#include <llarp/dht/message.hpp>
|
||||
#include <llarp/routing/message.hpp>
|
||||
#include <llarp/service/address.hpp>
|
||||
#include <llarp/service/tag.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
@ -47,4 +46,3 @@ namespace llarp
|
|||
};
|
||||
} // namespace dht
|
||||
} // namespace llarp
|
||||
#endif
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
#include <dht/messages/findname.hpp>
|
||||
#include "findname.hpp"
|
||||
#include <oxenmq/bt_serialize.h>
|
||||
#include <dht/context.hpp>
|
||||
#include <dht/messages/gotname.hpp>
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include <rpc/lokid_rpc_client.hpp>
|
||||
#include <path/path_context.hpp>
|
||||
#include <routing/dht_message.hpp>
|
||||
#include <llarp/dht/context.hpp>
|
||||
#include "gotname.hpp"
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
#include <llarp/rpc/lokid_rpc_client.hpp>
|
||||
#include <llarp/path/path_context.hpp>
|
||||
#include <llarp/routing/dht_message.hpp>
|
||||
|
||||
namespace llarp::dht
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <dht/message.hpp>
|
||||
#include <llarp/dht/message.hpp>
|
||||
|
||||
namespace llarp::dht
|
||||
{
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
#include <dht/messages/findrouter.hpp>
|
||||
#include "findrouter.hpp"
|
||||
|
||||
#include <dht/context.hpp>
|
||||
#include <dht/messages/gotrouter.hpp>
|
||||
#include <nodedb.hpp>
|
||||
#include <path/path_context.hpp>
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include <routing/dht_message.hpp>
|
||||
#include <llarp/dht/context.hpp>
|
||||
#include "gotrouter.hpp"
|
||||
#include <llarp/nodedb.hpp>
|
||||
#include <llarp/path/path_context.hpp>
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
#include <llarp/routing/dht_message.hpp>
|
||||
|
||||
#include <tooling/dht_event.hpp>
|
||||
#include <llarp/tooling/dht_event.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
#ifndef LLARP_DHT_MESSAGES_FIND_ROUTER_HPP
|
||||
#define LLARP_DHT_MESSAGES_FIND_ROUTER_HPP
|
||||
#include <dht/message.hpp>
|
||||
#pragma once
|
||||
#include <llarp/dht/message.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
@ -56,4 +55,3 @@ namespace llarp
|
|||
};
|
||||
} // namespace dht
|
||||
} // namespace llarp
|
||||
#endif
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
#include <dht/messages/gotintro.hpp>
|
||||
#include "gotintro.hpp"
|
||||
|
||||
#include <service/intro.hpp>
|
||||
#include <dht/context.hpp>
|
||||
#include <llarp/service/intro.hpp>
|
||||
#include <llarp/dht/context.hpp>
|
||||
#include <memory>
|
||||
#include <path/path_context.hpp>
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include <routing/dht_message.hpp>
|
||||
#include <tooling/dht_event.hpp>
|
||||
#include <llarp/path/path_context.hpp>
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
#include <llarp/routing/dht_message.hpp>
|
||||
#include <llarp/tooling/dht_event.hpp>
|
||||
#include <utility>
|
||||
|
||||
namespace llarp
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
#ifndef LLARP_DHT_MESSAGES_GOT_INTRO_HPP
|
||||
#define LLARP_DHT_MESSAGES_GOT_INTRO_HPP
|
||||
#pragma once
|
||||
|
||||
#include <dht/message.hpp>
|
||||
#include <service/intro_set.hpp>
|
||||
#include <util/copy_or_nullptr.hpp>
|
||||
#include <llarp/dht/message.hpp>
|
||||
#include <llarp/service/intro_set.hpp>
|
||||
#include <llarp/util/copy_or_nullptr.hpp>
|
||||
|
||||
#include <vector>
|
||||
#include <optional>
|
||||
|
@ -63,4 +62,3 @@ namespace llarp
|
|||
using GotIntroMessage_constptr = std::shared_ptr<const GotIntroMessage>;
|
||||
} // namespace dht
|
||||
} // namespace llarp
|
||||
#endif
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#include <dht/messages/gotname.hpp>
|
||||
#include "gotname.hpp"
|
||||
#include <oxenmq/bt_serialize.h>
|
||||
#include <dht/context.hpp>
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include <path/path_context.hpp>
|
||||
#include <llarp/dht/context.hpp>
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
#include <llarp/path/path_context.hpp>
|
||||
|
||||
namespace llarp::dht
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <dht/message.hpp>
|
||||
#include <service/name.hpp>
|
||||
#include <llarp/dht/message.hpp>
|
||||
#include <llarp/service/name.hpp>
|
||||
|
||||
namespace llarp::dht
|
||||
{
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
#include <dht/context.hpp>
|
||||
#include <dht/messages/gotrouter.hpp>
|
||||
#include <llarp/dht/context.hpp>
|
||||
#include "gotrouter.hpp"
|
||||
|
||||
#include <memory>
|
||||
#include <path/path_context.hpp>
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include <router/i_rc_lookup_handler.hpp>
|
||||
#include <tooling/rc_event.hpp>
|
||||
#include <llarp/path/path_context.hpp>
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
#include <llarp/router/i_rc_lookup_handler.hpp>
|
||||
#include <llarp/tooling/rc_event.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
#ifndef LLARP_DHT_MESSAGES_GOT_ROUTER_HPP
|
||||
#define LLARP_DHT_MESSAGES_GOT_ROUTER_HPP
|
||||
#include <constants/proto.hpp>
|
||||
#include <dht/message.hpp>
|
||||
#include <router_contact.hpp>
|
||||
#include <util/copy_or_nullptr.hpp>
|
||||
#pragma once
|
||||
#include <llarp/constants/proto.hpp>
|
||||
#include <llarp/dht/message.hpp>
|
||||
#include <llarp/router_contact.hpp>
|
||||
#include <llarp/util/copy_or_nullptr.hpp>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
|
@ -67,4 +66,3 @@ namespace llarp
|
|||
using GotRouterMessage_constptr = std::shared_ptr<const GotRouterMessage>;
|
||||
} // namespace dht
|
||||
} // namespace llarp
|
||||
#endif
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
#include <dht/messages/pubintro.hpp>
|
||||
#include "pubintro.hpp"
|
||||
|
||||
#include <dht/context.hpp>
|
||||
#include <dht/messages/gotintro.hpp>
|
||||
#include <messages/dht_immediate.hpp>
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include <routing/dht_message.hpp>
|
||||
#include <nodedb.hpp>
|
||||
#include <llarp/dht/context.hpp>
|
||||
#include "gotintro.hpp"
|
||||
#include <llarp/messages/dht_immediate.hpp>
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
#include <llarp/routing/dht_message.hpp>
|
||||
#include <llarp/nodedb.hpp>
|
||||
|
||||
#include <tooling/dht_event.hpp>
|
||||
#include <llarp/tooling/dht_event.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef LLARP_DHT_MESSAGES_PUB_INTRO_HPP
|
||||
#define LLARP_DHT_MESSAGES_PUB_INTRO_HPP
|
||||
#include <dht/message.hpp>
|
||||
#include <service/intro_set.hpp>
|
||||
#pragma once
|
||||
#include <llarp/dht/message.hpp>
|
||||
#include <llarp/service/intro_set.hpp>
|
||||
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
@ -42,4 +41,3 @@ namespace llarp
|
|||
};
|
||||
} // namespace dht
|
||||
} // namespace llarp
|
||||
#endif
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
#ifndef LLARP_DHT_NODE_HPP
|
||||
#define LLARP_DHT_NODE_HPP
|
||||
#pragma once
|
||||
|
||||
#include <dht/key.hpp>
|
||||
#include <router_contact.hpp>
|
||||
#include <service/intro_set.hpp>
|
||||
#include "key.hpp"
|
||||
#include <llarp/router_contact.hpp>
|
||||
#include <llarp/service/intro_set.hpp>
|
||||
#include <utility>
|
||||
|
||||
namespace llarp
|
||||
|
@ -66,5 +65,3 @@ namespace llarp
|
|||
};
|
||||
} // namespace dht
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
#include <dht/publishservicejob.hpp>
|
||||
#include "publishservicejob.hpp"
|
||||
|
||||
#include <dht/context.hpp>
|
||||
#include <dht/messages/pubintro.hpp>
|
||||
#include <dht/messages/gotintro.hpp>
|
||||
#include <path/path_context.hpp>
|
||||
#include <routing/dht_message.hpp>
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include "context.hpp"
|
||||
#include <llarp/dht/messages/pubintro.hpp>
|
||||
#include <llarp/dht/messages/gotintro.hpp>
|
||||
#include <llarp/path/path_context.hpp>
|
||||
#include <llarp/routing/dht_message.hpp>
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
|
||||
#include <utility>
|
||||
namespace llarp
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#ifndef LLARP_DHT_PUBLISHSERVICEJOB
|
||||
#define LLARP_DHT_PUBLISHSERVICEJOB
|
||||
|
||||
#include <dht/tx.hpp>
|
||||
#include <dht/txowner.hpp>
|
||||
#include <service/address.hpp>
|
||||
#include <service/intro_set.hpp>
|
||||
#include "tx.hpp"
|
||||
#include "txowner.hpp"
|
||||
#include <llarp/service/address.hpp>
|
||||
#include <llarp/service/intro_set.hpp>
|
||||
|
||||
#include <set>
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
#include <dht/recursiverouterlookup.hpp>
|
||||
#include "recursiverouterlookup.hpp"
|
||||
|
||||
#include <dht/context.hpp>
|
||||
#include <dht/messages/findrouter.hpp>
|
||||
#include <dht/messages/gotrouter.hpp>
|
||||
#include "context.hpp"
|
||||
#include <llarp/dht/messages/findrouter.hpp>
|
||||
#include <llarp/dht/messages/gotrouter.hpp>
|
||||
|
||||
#include <router/abstractrouter.hpp>
|
||||
#include <router/i_rc_lookup_handler.hpp>
|
||||
#include <llarp/router/abstractrouter.hpp>
|
||||
#include <llarp/router/i_rc_lookup_handler.hpp>
|
||||
|
||||
#include <utility>
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#ifndef LLARP_DHT_RECURSIVEROUTERLOOKUP
|
||||
#define LLARP_DHT_RECURSIVEROUTERLOOKUP
|
||||
|
||||
#include <dht/tx.hpp>
|
||||
#include "tx.hpp"
|
||||
|
||||
#include <router_contact.hpp>
|
||||
#include <router_id.hpp>
|
||||
#include <llarp/router_contact.hpp>
|
||||
#include <llarp/router_id.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#include <dht/serviceaddresslookup.hpp>
|
||||
#include "serviceaddresslookup.hpp"
|
||||
|
||||
#include <dht/context.hpp>
|
||||
#include <dht/messages/findintro.hpp>
|
||||
#include <dht/messages/gotintro.hpp>
|
||||
#include "context.hpp"
|
||||
#include <llarp/dht/messages/findintro.hpp>
|
||||
#include <llarp/dht/messages/gotintro.hpp>
|
||||
#include <utility>
|
||||
|
||||
namespace llarp
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#ifndef LLARP_DHT_SERVICEADDRESSLOOKUP
|
||||
#define LLARP_DHT_SERVICEADDRESSLOOKUP
|
||||
|
||||
#include <dht/key.hpp>
|
||||
#include <dht/tx.hpp>
|
||||
#include <service/address.hpp>
|
||||
#include <service/intro_set.hpp>
|
||||
#include "key.hpp"
|
||||
#include "tx.hpp"
|
||||
#include <llarp/service/address.hpp>
|
||||
#include <llarp/service/intro_set.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include <dht/taglookup.hpp>
|
||||
#include "taglookup.hpp"
|
||||
|
||||
#include <dht/context.hpp>
|
||||
#include <dht/messages/gotintro.hpp>
|
||||
#include "context.hpp"
|
||||
#include <llarp/dht/messages/gotintro.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#ifndef LLARP_DHT_TAGLOOKUP
|
||||
#define LLARP_DHT_TAGLOOKUP
|
||||
|
||||
#include <dht/tx.hpp>
|
||||
#include <service/intro_set.hpp>
|
||||
#include <service/tag.hpp>
|
||||
#include "tx.hpp"
|
||||
#include <llarp/service/intro_set.hpp>
|
||||
#include <llarp/service/tag.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#ifndef LLARP_DHT_TX
|
||||
#define LLARP_DHT_TX
|
||||
|
||||
#include <dht/key.hpp>
|
||||
#include <dht/txowner.hpp>
|
||||
#include <util/logging/logger.hpp>
|
||||
#include <util/status.hpp>
|
||||
#include "key.hpp"
|
||||
#include "txowner.hpp"
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
#include <llarp/util/status.hpp>
|
||||
|
||||
#include <set>
|
||||
#include <vector>
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#ifndef LLARP_DHT_TXHOLDER
|
||||
#define LLARP_DHT_TXHOLDER
|
||||
|
||||
#include <dht/tx.hpp>
|
||||
#include <dht/txowner.hpp>
|
||||
#include <util/time.hpp>
|
||||
#include <util/status.hpp>
|
||||
#include "tx.hpp"
|
||||
#include "txowner.hpp"
|
||||
#include <llarp/util/time.hpp>
|
||||
#include <llarp/util/status.hpp>
|
||||
|
||||
#include <memory>
|
||||
#include <unordered_map>
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
#ifndef LLARP_DHT_TXOWNER_HPP
|
||||
#define LLARP_DHT_TXOWNER_HPP
|
||||
#pragma once
|
||||
|
||||
#include <dht/key.hpp>
|
||||
#include <util/status.hpp>
|
||||
#include "key.hpp"
|
||||
#include <llarp/util/status.hpp>
|
||||
#include <cstdint>
|
||||
|
||||
namespace llarp
|
||||
|
@ -59,5 +58,3 @@ namespace llarp
|
|||
};
|
||||
} // namespace dht
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#ifndef LLARP_DNS_DNS_HPP
|
||||
#define LLARP_DNS_DNS_HPP
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
|
@ -29,5 +28,3 @@ namespace llarp
|
|||
|
||||
} // namespace dns
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
#include <dns/message.hpp>
|
||||
#include "message.hpp"
|
||||
|
||||
#include <dns/dns.hpp>
|
||||
#include <dns/srv_data.hpp>
|
||||
#include <util/buffer.hpp>
|
||||
#include <util/endian.hpp>
|
||||
#include <util/logging/logger.hpp>
|
||||
#include <util/printer.hpp>
|
||||
#include <net/ip.hpp>
|
||||
#include "dns.hpp"
|
||||
#include "srv_data.hpp"
|
||||
#include <llarp/util/buffer.hpp>
|
||||
#include <llarp/util/endian.hpp>
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
#include <llarp/util/printer.hpp>
|
||||
#include <llarp/net/ip.hpp>
|
||||
|
||||
#include <array>
|
||||
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
#ifndef LLARP_DNS_MESSAGE_HPP
|
||||
#define LLARP_DNS_MESSAGE_HPP
|
||||
#pragma once
|
||||
|
||||
#include <dns/serialize.hpp>
|
||||
#include <dns/rr.hpp>
|
||||
#include <dns/question.hpp>
|
||||
#include "serialize.hpp"
|
||||
#include "rr.hpp"
|
||||
#include "question.hpp"
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
@ -106,5 +105,3 @@ namespace llarp
|
|||
}
|
||||
} // namespace dns
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#define __USE_MINGW_ANSI_STDIO 1
|
||||
#include <dns/name.hpp>
|
||||
#include <net/net.hpp>
|
||||
#include <net/ip.hpp>
|
||||
#include <util/str.hpp>
|
||||
#include "name.hpp"
|
||||
#include <llarp/net/net.hpp>
|
||||
#include <llarp/net/ip.hpp>
|
||||
#include <llarp/util/str.hpp>
|
||||
|
||||
#include <algorithm>
|
||||
#include <sstream>
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
#ifndef LLARP_DNS_NAME_HPP
|
||||
#define LLARP_DNS_NAME_HPP
|
||||
#pragma once
|
||||
|
||||
#include <net/net_int.hpp>
|
||||
#include <util/buffer.hpp>
|
||||
#include <llarp/net/net_int.hpp>
|
||||
#include <llarp/util/buffer.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
|
@ -28,5 +27,3 @@ namespace llarp
|
|||
|
||||
} // namespace dns
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1 @@
|
|||
#ifndef LLARP_DNS_QUERY_HPP
|
||||
#define LLARP_DNS_QUERY_HPP
|
||||
|
||||
#endif
|
||||
#pragma once
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#include <dns/question.hpp>
|
||||
#include "question.hpp"
|
||||
|
||||
#include <util/logging/logger.hpp>
|
||||
#include <util/printer.hpp>
|
||||
#include <util/str.hpp>
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
#include <llarp/util/printer.hpp>
|
||||
#include <llarp/util/str.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
#ifndef LLARP_DNS_QUESTION_HPP
|
||||
#define LLARP_DNS_QUESTION_HPP
|
||||
#pragma once
|
||||
|
||||
#include <dns/serialize.hpp>
|
||||
#include <dns/name.hpp>
|
||||
#include <net/net_int.hpp>
|
||||
#include "serialize.hpp"
|
||||
#include "name.hpp"
|
||||
#include <llarp/net/net_int.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
@ -69,5 +68,3 @@ namespace llarp
|
|||
}
|
||||
} // namespace dns
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#include <dns/rr.hpp>
|
||||
#include <dns/dns.hpp>
|
||||
#include <util/mem.hpp>
|
||||
#include <util/logging/logger.hpp>
|
||||
#include <util/printer.hpp>
|
||||
#include "rr.hpp"
|
||||
#include "dns.hpp"
|
||||
#include <llarp/util/mem.hpp>
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
#include <llarp/util/printer.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
#ifndef LLARP_DNS_RR_HPP
|
||||
#define LLARP_DNS_RR_HPP
|
||||
#pragma once
|
||||
|
||||
#include <dns/name.hpp>
|
||||
#include <dns/serialize.hpp>
|
||||
#include <net/net_int.hpp>
|
||||
#include "name.hpp"
|
||||
#include "serialize.hpp"
|
||||
#include <llarp/net/net_int.hpp>
|
||||
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
@ -49,5 +48,3 @@ namespace llarp
|
|||
}
|
||||
} // namespace dns
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include <dns/serialize.hpp>
|
||||
#include <net/net_int.hpp>
|
||||
#include "serialize.hpp"
|
||||
#include <llarp/net/net_int.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef LLARP_DNS_SERIALIZE_HPP
|
||||
#define LLARP_DNS_SERIALIZE_HPP
|
||||
#pragma once
|
||||
|
||||
#include <util/buffer.hpp>
|
||||
#include <llarp/util/buffer.hpp>
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
@ -31,5 +30,3 @@ namespace llarp
|
|||
|
||||
} // namespace dns
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#include <dns/server.hpp>
|
||||
#include <dns/dns.hpp>
|
||||
#include <crypto/crypto.hpp>
|
||||
#include "server.hpp"
|
||||
#include "dns.hpp"
|
||||
#include <llarp/crypto/crypto.hpp>
|
||||
#include <array>
|
||||
#include <utility>
|
||||
#include <ev/udp_handle.hpp>
|
||||
#include <llarp/ev/udp_handle.hpp>
|
||||
|
||||
namespace llarp::dns
|
||||
{
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
#ifndef LLARP_DNS_SERVER_HPP
|
||||
#define LLARP_DNS_SERVER_HPP
|
||||
#pragma once
|
||||
|
||||
#include <dns/message.hpp>
|
||||
#include <ev/ev.hpp>
|
||||
#include <net/net.hpp>
|
||||
#include <dns/unbound_resolver.hpp>
|
||||
#include "message.hpp"
|
||||
#include <llarp/ev/ev.hpp>
|
||||
#include <llarp/net/net.hpp>
|
||||
#include "unbound_resolver.hpp"
|
||||
|
||||
#include <unordered_map>
|
||||
|
||||
|
@ -87,5 +86,3 @@ namespace llarp
|
|||
};
|
||||
} // namespace dns
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include <dns/srv_data.hpp>
|
||||
#include <util/str.hpp>
|
||||
#include <util/logging/logger.hpp>
|
||||
#include "srv_data.hpp"
|
||||
#include <llarp/util/str.hpp>
|
||||
#include <llarp/util/logging/logger.hpp>
|
||||
|
||||
#include <limits>
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <dns/name.hpp>
|
||||
#include <dns/serialize.hpp>
|
||||
#include "name.hpp"
|
||||
#include "serialize.hpp"
|
||||
|
||||
#include <tuple>
|
||||
#include <string_view>
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#ifndef LLARP_DNS_STRING_HPP
|
||||
#define LLARP_DNS_STRING_HPP
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
|
||||
|
@ -21,5 +20,3 @@ namespace llarp
|
|||
|
||||
} // namespace dns
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include <dns/unbound_resolver.hpp>
|
||||
#include "unbound_resolver.hpp"
|
||||
|
||||
#include <dns/server.hpp>
|
||||
#include <util/buffer.hpp>
|
||||
#include "server.hpp"
|
||||
#include <llarp/util/buffer.hpp>
|
||||
|
||||
namespace llarp::dns
|
||||
{
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
#include <memory>
|
||||
#include <queue>
|
||||
|
||||
#include <ev/ev.hpp>
|
||||
#include <llarp/ev/ev.hpp>
|
||||
|
||||
#include <dns/message.hpp>
|
||||
#include "message.hpp"
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <thread>
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue