aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Ryan <jeffreyryan@tutanota.com>2022-09-14 20:09:29 -0500
committerJeffrey Ryan <jeffreyryan@tutanota.com>2022-09-14 20:09:29 -0500
commitb526a4bf1ed774d4dd33b4358336a1914f847251 (patch)
tree343c928b4d09353817b225d86dbe357d844fb9d6
parentMerge pull request #8554 (diff)
downloadmonero-b526a4bf1ed774d4dd33b4358336a1914f847251.tar.xz
levin_abstract_invoke: remove dead code
-rw-r--r--contrib/epee/include/storages/levin_abstract_invoke2.h72
1 files changed, 0 insertions, 72 deletions
diff --git a/contrib/epee/include/storages/levin_abstract_invoke2.h b/contrib/epee/include/storages/levin_abstract_invoke2.h
index 7fd786a53..9d3dda0d6 100644
--- a/contrib/epee/include/storages/levin_abstract_invoke2.h
+++ b/contrib/epee/include/storages/levin_abstract_invoke2.h
@@ -56,33 +56,6 @@ namespace epee
{
namespace net_utils
{
- template<class t_arg, class t_result, class t_transport>
- bool invoke_remote_command2(const epee::net_utils::connection_context_base context, int command, const t_arg& out_struct, t_result& result_struct, t_transport& transport)
- {
- const boost::uuids::uuid &conn_id = context.m_connection_id;
- typename serialization::portable_storage stg;
- out_struct.store(stg);
- levin::message_writer to_send{16 * 1024};
- std::string buff_to_recv;
- stg.store_to_binary(to_send.buffer);
-
- int res = transport.invoke(command, std::move(to_send), buff_to_recv, conn_id);
- if( res <=0 )
- {
- LOG_PRINT_L1("Failed to invoke command " << command << " return code " << res);
- return false;
- }
- typename serialization::portable_storage stg_ret;
- if(!stg_ret.load_from_binary(buff_to_recv, &default_levin_limits))
- {
- on_levin_traffic(context, true, false, true, buff_to_recv.size(), command);
- LOG_ERROR("Failed to load_from_binary on command " << command);
- return false;
- }
- on_levin_traffic(context, true, false, false, buff_to_recv.size(), command);
- return result_struct.load(stg_ret);
- }
-
template<class t_result, class t_arg, class callback_t, class t_transport>
bool async_invoke_remote_command2(const epee::net_utils::connection_context_base &context, int command, const t_arg& out_struct, t_transport& transport, const callback_t &cb, size_t inv_timeout = LEVIN_DEFAULT_TIMEOUT_PRECONFIGURED)
{
@@ -216,65 +189,20 @@ namespace epee
return handle_invoke_map(true, command, in_buff, fake_str, context, handled); \
}
-
-#define CHAIN_LEVIN_INVOKE_MAP() \
- int invoke(int command, const epee::span<const uint8_t> in_buff, epee::byte_stream& buff_out, epee::net_utils::connection_context_base& context) \
- { \
- bool handled = false; \
- return handle_invoke_map(false, command, in_buff, buff_out, context, handled); \
- }
-
-#define CHAIN_LEVIN_NOTIFY_MAP() \
- int notify(int command, const epee::span<const uint8_t> in_buff, epee::net_utils::connection_context_base& context) \
- { \
- bool handled = false; std::string fake_str;\
- return handle_invoke_map(true, command, in_buff, fake_str, context, handled); \
- }
-
-#define CHAIN_LEVIN_NOTIFY_STUB() \
- int notify(int command, const epee::span<const uint8_t> in_buff, epee::net_utils::connection_context_base& context) \
- { \
- return -1; \
- }
-
#define BEGIN_INVOKE_MAP2(owner_type) \
template <class t_context> int handle_invoke_map(bool is_notify, int command, const epee::span<const uint8_t> in_buff, epee::byte_stream& buff_out, t_context& context, bool& handled) \
{ \
try { \
typedef owner_type internal_owner_type_name;
-#define HANDLE_INVOKE2(command_id, func, type_name_in, typename_out) \
- if(!is_notify && command_id == command) \
- {handled=true;return epee::net_utils::buff_to_t_adapter<internal_owner_type_name, type_name_in, typename_out>(this, command, in_buff, buff_out, std::bind(func, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), context);}
-
#define HANDLE_INVOKE_T2(COMMAND, func) \
if(!is_notify && COMMAND::ID == command) \
{handled=true;return epee::net_utils::buff_to_t_adapter<internal_owner_type_name, typename COMMAND::request, typename COMMAND::response>(command, in_buff, buff_out, std::bind(func, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), context);}
-
-#define HANDLE_NOTIFY2(command_id, func, type_name_in) \
- if(is_notify && command_id == command) \
- {handled=true;return epee::net_utils::buff_to_t_adapter<internal_owner_type_name, type_name_in>(this, command, in_buff, std::bind(func, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), context);}
-
#define HANDLE_NOTIFY_T2(NOTIFY, func) \
if(is_notify && NOTIFY::ID == command) \
{handled=true;return epee::net_utils::buff_to_t_adapter<internal_owner_type_name, typename NOTIFY::request>(this, command, in_buff, std::bind(func, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), context);}
-
-#define CHAIN_INVOKE_MAP2(func) \
- { \
- int res = func(is_notify, command, in_buff, buff_out, context, handled); \
- if(handled) \
- return res; \
- }
-
-#define CHAIN_INVOKE_MAP_TO_OBJ2(obj) \
- { \
- int res = obj.handle_invoke_map(is_notify, command, in_buff, buff_out, context, handled); \
- if(handled) \
- return res; \
- }
-
#define CHAIN_INVOKE_MAP_TO_OBJ_FORCE_CONTEXT(obj, context_type) \
{ \
int res = obj.handle_invoke_map(is_notify, command, in_buff, buff_out, static_cast<context_type>(context), handled); \