Commit f20cca8f authored by Joseph Noir's avatar Joseph Noir

Align message names for new basp and raw data

parent a287eae8
...@@ -40,7 +40,7 @@ typename Inspector::result_type inspect(Inspector& fun, basp_header& hdr) { ...@@ -40,7 +40,7 @@ typename Inspector::result_type inspect(Inspector& fun, basp_header& hdr) {
constexpr size_t basp_header_len = sizeof(uint32_t) + sizeof(actor_id) * 2; constexpr size_t basp_header_len = sizeof(uint32_t) + sizeof(actor_id) * 2;
struct new_basp_message { struct new_basp_msg {
basp_header header; basp_header header;
char* payload; char* payload;
size_t payload_len; size_t payload_len;
...@@ -48,14 +48,14 @@ struct new_basp_message { ...@@ -48,14 +48,14 @@ struct new_basp_message {
template <class Inspector> template <class Inspector>
typename Inspector::result_type inspect(Inspector& fun, typename Inspector::result_type inspect(Inspector& fun,
new_basp_message& msg) { new_basp_msg& msg) {
return fun(meta::type_name("new_basp_message"), msg.header, return fun(meta::type_name("new_basp_message"), msg.header,
msg.payload_len); msg.payload_len);
} }
struct datagram_basp { struct datagram_basp {
static constexpr size_t header_size = basp_header_len; static constexpr size_t header_size = basp_header_len;
using message_type = new_basp_message; using message_type = new_basp_msg;
using result_type = optional<message_type>; using result_type = optional<message_type>;
io::network::newb<message_type>* parent; io::network::newb<message_type>* parent;
message_type msg; message_type msg;
...@@ -109,7 +109,7 @@ struct datagram_basp { ...@@ -109,7 +109,7 @@ struct datagram_basp {
struct stream_basp { struct stream_basp {
static constexpr size_t header_size = basp_header_len; static constexpr size_t header_size = basp_header_len;
using message_type = new_basp_message; using message_type = new_basp_msg;
using result_type = optional<message_type>; using result_type = optional<message_type>;
io::network::newb<message_type>* parent; io::network::newb<message_type>* parent;
message_type msg; message_type msg;
......
...@@ -24,18 +24,18 @@ ...@@ -24,18 +24,18 @@
namespace caf { namespace caf {
namespace policy { namespace policy {
struct raw_data_message { struct new_raw_msg {
char* payload; char* payload;
size_t payload_len; size_t payload_len;
}; };
template <class Inspector> template <class Inspector>
typename Inspector::result_type inspect(Inspector& fun, raw_data_message& data) { typename Inspector::result_type inspect(Inspector& fun, new_raw_msg& data) {
return fun(meta::type_name("raw_data_message"), data.payload_len); return fun(meta::type_name("raw_data_message"), data.payload_len);
} }
struct raw { struct raw {
using message_type = raw_data_message; using message_type = new_raw_msg;
using result_type = optional<message_type>; using result_type = optional<message_type>;
io::network::newb<message_type>* parent; io::network::newb<message_type>* parent;
message_type msg; message_type msg;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment