aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GCS_MAVLink: clarify packetReceive calling handlemessage checks

Browse Source 
modules/libcanard/
This commit is contained in:
Peter Barker 2019-02-15 15:47:57 +11:00 committed by Peter Barker
parent ddab9455e8
commit 91c8d0b915
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -1427,10 +1427,15 @@ void GCS_MAVLINK::packetReceived(const mavlink_status_t &status,
cstatus->flags &= ~MAVLINK_STATUS_FLAG_OUT_MAVLINK1;
}
}
if (routing.check_and_forward(chan, &msg) &&
accept_packet(status, msg)) {
handleMessage(&msg);
if (!routing.check_and_forward(chan, &msg)) {
// the routing code has indicated we should not handle this packet locally
return;
}
if (!accept_packet(status, msg)) {
// e.g. enforce-sysid says we shouldn't look at this packet
return;
}
handleMessage(&msg);
}
void