LocalMsg: add relayed address

gokvik · Sep 5, 2024 · 1826096 · 1826096
1 parent 11e3c17
commit 1826096
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/include/kvik/local_msg.hpp b/include/kvik/local_msg.hpp
@@ -70,6 +70,7 @@ namespace kvik
     {
         LocalMsgType type = LocalMsgType::NONE;                   //!< Type of message
         LocalAddr addr = {};                                      //!< Source/destination address
+        LocalAddr relayedAddr = {};                               //!< Relayed address (processed by relay node)
         std::string topic = "";                                   //!< Topic of message
         std::string payload = "";                                 //!< Payload of message
         LocalMsgFailReason failReason = LocalMsgFailReason::NONE; //!< Fail reason
@@ -108,6 +109,7 @@ struct std::hash<kvik::LocalMsg>
     {
         return std::hash<kvik::LocalMsgType>{}(msg.type) +
                std::hash<kvik::LocalAddr>{}(msg.addr) +
+               std::hash<kvik::LocalAddr>{}(msg.relayedAddr) +
                std::hash<std::string>{}(msg.topic) +
                std::hash<std::string>{}(msg.payload) +
                std::hash<kvik::LocalMsgFailReason>{}(msg.failReason);

diff --git a/src/common/local_msg.cpp b/src/common/local_msg.cpp
@@ -65,6 +65,7 @@ namespace kvik
                           ") ")
                     : "") +
                (!addr.empty() ? addr.toString() : "(no addr)") + " " +
+               (!relayedAddr.empty() ? relayedAddr.toString() : "(not relayed)") + " " +
                (!topic.empty() ? topic : "(no topic)") + " " +
                "(" + std::to_string(payload.length()) + " B payload)";
     }
@@ -73,6 +74,7 @@ namespace kvik
     {
         return type == other.type &&
                addr == other.addr &&
+               relayedAddr == other.relayedAddr &&
                topic == other.topic &&
                payload == other.payload &&
                failReason == other.failReason;

diff --git a/test/tests/local_msg.cpp b/test/tests/local_msg.cpp
@@ -26,6 +26,12 @@ TEST_CASE("Comparison", "[LocalMsg]")
         REQUIRE(msg1 != msg2);
     }
 
+    SECTION("Different relayed addresses")
+    {
+        msg2.relayedAddr.addr.push_back(0x01);
+        REQUIRE(msg1 != msg2);
+    }
+
     SECTION("Different topics")
     {
         msg2.topic = "1";