henry/whisper-com
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CHG: changed message proto and fixed all causing issues after that

Browse Source
This commit is contained in:
Henry Winkel
2023-02-15 15:28:07 +01:00
parent 01e61cd482
commit 42f749be45
10 changed files with 160 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/WHISPER/Messages/Join.cpp
View File

@@ -18,11 +18,12 @@ namespace WHISPER {
deviceId_ = msg.sourceid();
parentId_ = msg.parentid();
if ( msg.payload_size()) {
if (msg.payload().begin()->Is<messages::join::Join>()) {
msg.payload().begin()->UnpackTo(&joinMessage);
if (msg.mutable_payload()->Is<messages::join::Join>())
{
msg.mutable_payload()->UnpackTo(&joinMessage);
}
}
port = joinMessage.port();
sourceAddr = joinMessage.srcaddress();

10
src/WHISPER/Messages/Leave.cpp
View File

@@ -18,11 +18,13 @@ namespace WHISPER {
leaveMessage = messages::leave::Leave();
if ( msg.payload_size()) {
if (msg.payload().begin()->Is<messages::leave::Leave>()) {
msg.payload().begin()->UnpackTo(&leaveMessage);
}
if (msg.mutable_payload()->Is<messages::leave::Leave>())
{
msg.mutable_payload()->UnpackTo(&leaveMessage);
}
port = leaveMessage.port();
sourceAddr = leaveMessage.srcaddress();

5
src/WHISPER/Messages/Message.cpp
View File

@@ -39,6 +39,7 @@ namespace WHISPER {
msg.set_sourcetype(sourceType_);
msg.set_msgtype(msgType_);
msg.set_parentid(parentId);
}
}
@@ -52,9 +53,11 @@ namespace WHISPER {
void Message::addPayLoad(std::shared_ptr<google::protobuf::Any> payload){
payload_ = payload;
payloadString_ = payload->SerializeAsString();
msg.clear_payload();
msg.add_payload()->CopyFrom(*payload_);
msg.mutable_payload()->CopyFrom(*payload);
// msg.add_payload()->CopyFrom(*payload_);
}

9
src/WHISPER/Messages/Ping.cpp
View File

@@ -19,11 +19,12 @@ namespace WHISPER {
deviceId_ = msg.sourceid();
parentId_ = msg.parentid();
if ( msg.payload_size()) {
if (msg.payload().begin()->Is<messages::ping::Ping>()) {
msg.payload().begin()->UnpackTo(&pingMessage);
if (msg.mutable_payload()->Is<messages::ping::Ping>())
{
msg.mutable_payload()->UnpackTo(&pingMessage);
}
}
port_ = pingMessage.port();

8
src/WHISPER/Messages/Pong.cpp
View File

@@ -19,11 +19,11 @@ namespace WHISPER {
deviceId_ = msg.sourceid();
parentId_ = msg.parentid();
if ( msg.payload_size()) {
if (msg.payload().begin()->Is<messages::pong::Pong>()) {
msg.payload().begin()->UnpackTo(&message_);
if (msg.mutable_payload()->Is<messages::pong::Pong>())
{
msg.mutable_payload()->UnpackTo(&message_);
}
}
port_ = message_.port();

9
src/WHISPER/Messages/stringData.cpp
View File

@@ -19,11 +19,12 @@ namespace WHISPER {
deviceId_ = msg.sourceid();
parentId_ = msg.parentid();
if ( msg.payload_size()) {
if (msg.payload().begin()->Is<messages::stringData::StringData>()) {
msg.payload().begin()->UnpackTo(&message_);
if (msg.mutable_payload()->Is<messages::stringData::StringData>())
{
msg.mutable_payload()->UnpackTo(&message_);
}
}
data_ = message_.data();