Add protocol server tests

chronoxor · Jan 7, 2022 · e7d4b30 · e7d4b30
1 parent 8c3b4b6
commit e7d4b30
Show file tree

Hide file tree

Showing 8 changed files with 468 additions and 4 deletions.
diff --git a/examples/proto_server.cpp b/examples/proto_server.cpp
@@ -63,6 +63,7 @@ class SimpleProtoSession : public CppServer::Asio::TCPSession, public FBE::simpl
         simple::SimpleResponse response;
         response.id = request.id;
         response.Hash = (uint32_t)hasher(request.Message);
+        response.Length = (uint32_t)request.Message.size();
         send(response);
     }
 

diff --git a/performance/proto_server.cpp b/performance/proto_server.cpp
@@ -33,7 +33,8 @@ class ProtoSession : public TCPSession, public FBE::simple::Sender, public FBE::
         // Send response
         simple::SimpleResponse response;
         response.id = request.id;
-        response.Hash = (uint32_t)request.Message.size();
+        response.Hash = 0;
+        response.Length = (uint32_t)request.Message.size();
         send(response);
     }
 

diff --git a/proto/simple.cpp b/proto/simple.cpp
@@ -51,11 +51,13 @@ std::ostream& operator<<(std::ostream& stream, const SimpleRequest& value)
 
 SimpleResponse::SimpleResponse()
     : id(FBE::uuid_t::sequential())
+    , Length((uint32_t)0ull)
     , Hash((uint32_t)0ull)
 {}
 
-SimpleResponse::SimpleResponse(const FBE::uuid_t& arg_id, uint32_t arg_Hash)
+SimpleResponse::SimpleResponse(const FBE::uuid_t& arg_id, uint32_t arg_Length, uint32_t arg_Hash)
     : id(arg_id)
+    , Length(arg_Length)
     , Hash(arg_Hash)
 {}
 
@@ -79,13 +81,15 @@ void SimpleResponse::swap(SimpleResponse& other) noexcept
 {
     using std::swap;
     swap(id, other.id);
+    swap(Length, other.Length);
     swap(Hash, other.Hash);
 }
 
 std::ostream& operator<<(std::ostream& stream, const SimpleResponse& value)
 {
     stream << "SimpleResponse(";
     stream << "id="; stream << "\"" << value.id << "\"";
+    stream << ",Length="; stream << value.Length;
     stream << ",Hash="; stream << value.Hash;
     stream << ")";
     return stream;

diff --git a/proto/simple.fbe b/proto/simple.fbe
@@ -31,6 +31,8 @@ message SimpleResponse
 {
     // Response Id
     uuid [id] = uuid1;
+    // Calculated message length
+    uint32 Length;
     // Calculated message hash
     uint32 Hash;
 }

diff --git a/proto/simple.h b/proto/simple.h
@@ -85,12 +85,13 @@ namespace simple {
 struct SimpleResponse
 {
     FBE::uuid_t id;
+    uint32_t Length;
     uint32_t Hash;
 
     size_t fbe_type() const noexcept { return 2; }
 
     SimpleResponse();
-    SimpleResponse(const FBE::uuid_t& arg_id, uint32_t arg_Hash);
+    SimpleResponse(const FBE::uuid_t& arg_id, uint32_t arg_Length, uint32_t arg_Hash);
     SimpleResponse(const SimpleResponse& other) = default;
     SimpleResponse(SimpleResponse&& other) = default;
     ~SimpleResponse() = default;

diff --git a/proto/simple_models.cpp b/proto/simple_models.cpp
@@ -231,13 +231,15 @@ size_t SimpleRequestModel::deserialize(::simple::SimpleRequest& value) const noe
 
 FieldModel<::simple::SimpleResponse>::FieldModel(FBEBuffer& buffer, size_t offset) noexcept : _buffer(buffer), _offset(offset)
     , id(buffer, 4 + 4)
-    , Hash(buffer, id.fbe_offset() + id.fbe_size())
+    , Length(buffer, id.fbe_offset() + id.fbe_size())
+    , Hash(buffer, Length.fbe_offset() + Length.fbe_size())
 {}
 
 size_t FieldModel<::simple::SimpleResponse>::fbe_body() const noexcept
 {
     size_t fbe_result = 4 + 4
         + id.fbe_size()
+        + Length.fbe_size()
         + Hash.fbe_size()
         ;
     return fbe_result;
@@ -256,6 +258,7 @@ size_t FieldModel<::simple::SimpleResponse>::fbe_extra() const noexcept
 
     size_t fbe_result = fbe_body()
         + id.fbe_extra()
+        + Length.fbe_extra()
         + Hash.fbe_extra()
         ;
 
@@ -297,6 +300,12 @@ bool FieldModel<::simple::SimpleResponse>::verify_fields(size_t fbe_struct_size)
         return false;
     fbe_current_size += id.fbe_size();
 
+    if ((fbe_current_size + Length.fbe_size()) > fbe_struct_size)
+        return true;
+    if (!Length.verify())
+        return false;
+    fbe_current_size += Length.fbe_size();
+
     if ((fbe_current_size + Hash.fbe_size()) > fbe_struct_size)
         return true;
     if (!Hash.verify())
@@ -351,6 +360,12 @@ void FieldModel<::simple::SimpleResponse>::get_fields(::simple::SimpleResponse&
         fbe_value.id = FBE::uuid_t::sequential();
     fbe_current_size += id.fbe_size();
 
+    if ((fbe_current_size + Length.fbe_size()) <= fbe_struct_size)
+        Length.get(fbe_value.Length);
+    else
+        fbe_value.Length = (uint32_t)0ull;
+    fbe_current_size += Length.fbe_size();
+
     if ((fbe_current_size + Hash.fbe_size()) <= fbe_struct_size)
         Hash.get(fbe_value.Hash);
     else
@@ -396,6 +411,7 @@ void FieldModel<::simple::SimpleResponse>::set(const ::simple::SimpleResponse& f
 void FieldModel<::simple::SimpleResponse>::set_fields(const ::simple::SimpleResponse& fbe_value) noexcept
 {
     id.set(fbe_value.id);
+    Length.set(fbe_value.Length);
     Hash.set(fbe_value.Hash);
 }
 

diff --git a/proto/simple_models.h b/proto/simple_models.h
@@ -166,6 +166,7 @@ class FieldModel<::simple::SimpleResponse>
 
 public:
     FieldModel<FBE::uuid_t> id;
+    FieldModel<uint32_t> Length;
     FieldModel<uint32_t> Hash;
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -166,6 +166,7 @@ class FieldModel<::simple::SimpleResponse> @@
     public:
         FieldModel<FBE::uuid_t> id;
+        FieldModel<uint32_t> Length;
         FieldModel<uint32_t> Hash;
     };
@@ Expand Down @@