Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix websocket proto request handling #281

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Fix websocket proto request handling #281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions plugins/websocket_server/WebsocketServer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,10 +742,21 @@ void WebsocketServer::OnMessage(int _socketId, const std::string _msg)
// Get all the messages, and build a single proto to send to the client.
for (auto const &type : types)
{
// only include messages in the gz.msgs package
if (type.find("gz.msgs") != 0)
continue;
auto msg = gz::msgs::Factory::New(type);
if (msg)
{
auto descriptor = msg->GetDescriptor();

// Skip nested messages for now, e.g. gz.msgs.CameraInfo.Distortion
// conflicts with gz.msgs.Distortion - in both cases the DebugString
// will output the same message name: "message Distortion {..}".
// todo(iche033): extend the logic to work with nested messages
if (descriptor->containing_type())
continue;

if (descriptor)
allProtos += descriptor->DebugString();
else
Expand Down
Loading