This commit is contained in:
2026-10-18 04:29:44 +03:00
parent 7f317aee67
commit e94783ef47
2 changed files with 20 additions and 4 deletions

View File

@@ -26,6 +26,8 @@ struct net_repr_proto_result_t {
result_flag_t flag{result_flag_t::INVALID_DATA};
size_t bytes_used{0};
OR result{};
};
@@ -41,7 +43,9 @@ struct netproto_noop_t {
net_repr_proto_result_t<OR> toNetwork(IR&& message)
{
using ret_t = net_repr_proto_result_t<OR>;
return ret_t{.flag = ret_t::result_flag_t::OK, .result = transform_char_range<OR>(message)};
return ret_t{.flag = ret_t::result_flag_t::OK,
.bytes_used = std::ranges::size(message),
.result = transform_char_range<OR>(message)};
}
template <input_char_range_c IR>
@@ -109,7 +113,8 @@ struct netproto_stopseq_t {
net_repr_proto_result_t<OR> toNetwork(IR&& message)
{
using res_el_t = std::ranges::range_value_t<OR>;
net_repr_proto_result_t<OR> res{.flag = net_repr_proto_result_t<OR>::result_flag_t::OK};
net_repr_proto_result_t<OR> res{.flag = net_repr_proto_result_t<OR>::result_flag_t::OK,
.bytes_used = std::ranges::size(message)};
if constexpr (fixed_size_range_c<OR>) {
static_assert(std::tuple_size_v<OR> > 1, "Invalid range size!!!");
@@ -123,6 +128,7 @@ struct netproto_stopseq_t {
std::back_inserter(res.result) = transform_char_range<res_el_t>(NETPROTO_STOP_SEQ);
}
return res;
}
@@ -131,7 +137,8 @@ struct netproto_stopseq_t {
requires(!char_view_c<OR>)
net_repr_proto_result_t<OR> toNetwork(IR&& message)
{
net_repr_proto_result_t<OR> res{.flag = net_repr_proto_result_t<OR>::result_flag_t::OK};
net_repr_proto_result_t<OR> res{.flag = net_repr_proto_result_t<OR>::result_flag_t::OK,
.bytes_used = std::ranges::size(message)};
std::ranges::copy(std::forward<IR>(message), std::back_inserter(res.result));
std::ranges::copy(NETPROTO_STOP_SEQ, std::back_inserter(res.result));
@@ -224,6 +231,8 @@ struct netproto_stopseq_t {
static_assert(false, "Unsupported output byte sequence type!");
}
res.bytes_used = NETPROTO_STOP_SEQ.size() + std::ranges::distance(bytes.begin(), found.end());
return res;
}
@@ -273,7 +282,8 @@ struct netproto_binary_blob_t {
requires(!char_view_c<OR>)
net_repr_proto_result_t<OR> toNetwork(IR&& message)
{
net_repr_proto_result_t<OR> res{.flag = net_repr_proto_result_flag_e::OK};
net_repr_proto_result_t<OR> res{.flag = net_repr_proto_result_flag_e::OK,
.bytes_used = std::ranges::size(message)};
std::format_to(std::back_inserter(res.result), std::string_view(BLOB_SIZE_FIELD_FORMAT),
std::ranges::size(std::forward<IR>(message)));
@@ -306,11 +316,13 @@ struct netproto_binary_blob_t {
if constexpr (std::ranges::contiguous_range<IR>) {
return ret_t{.flag = net_repr_proto_result_flag_e::OK,
.bytes_used = std::ranges::size(message),
.result = std::make_tuple(std::format(std::string_view(BLOB_SIZE_FIELD_FORMAT),
std::ranges::size(std::forward<IR>(message))),
std::string_view(message))};
} else {
return ret_t{.flag = net_repr_proto_result_flag_e::OK,
.bytes_used = std::ranges::size(message),
.result = std::make_tuple(std::format(std::string_view(BLOB_SIZE_FIELD_FORMAT),
std::ranges::size(std::forward<IR>(message))),
std::ranges::subrange(std::forward<IR>(message)))};
@@ -332,6 +344,7 @@ struct netproto_binary_blob_t {
net_repr_proto_result_t<OR> res{.flag = net_repr_proto_result_flag_e::NOT_ENOUGH_DATA};
auto bytes_sz = std::ranges::size(std::forward<IR>(bytes));
res.bytes_used = bytes_sz;
if (bytes_sz < BLOB_SIZE_FIELD) { // not enough data
return res;
@@ -393,6 +406,7 @@ struct netproto_binary_blob_t {
static_assert(false, "Unsupported output byte sequence type!");
}
return res;
}

View File

@@ -60,6 +60,8 @@ concept net_repr_proto_result_c = requires(T t) {
// char_range_or_range_of_char_ranges_c<decltype(t.result)>;
requires std::convertible_to<decltype(t.bytes_used), size_t>; // number of input range bytes used to conversion
requires(
requires { requires char_range_or_range_of_char_ranges_c<decltype(t.result)>; } ||
requires { requires char_range_or_tuple_of_char_ranges_c<decltype(t.result)>; });