diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-07-29 12:34:29 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-07-29 12:34:29 +0200 |
| commit | 17bfc06e9c16851c42121357735996c12ca2f52b (patch) | |
| tree | 579dd88e8db237134ac6ddbd6d39193b2d51dcab /src/modules/mavlink/mavlink_main.cpp | |
| parent | e3bc5571556d043ad5c8c4fcabd1f9b371599397 (diff) | |
| parent | c439db421a6dc32c5e37cdd3841200a00c338d99 (diff) | |
| download | px4-firmware-17bfc06e9c16851c42121357735996c12ca2f52b.tar.gz px4-firmware-17bfc06e9c16851c42121357735996c12ca2f52b.tar.bz2 px4-firmware-17bfc06e9c16851c42121357735996c12ca2f52b.zip | |
Merge branch 'master' into mavlinkrates2
Diffstat (limited to 'src/modules/mavlink/mavlink_main.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 69beb9cc9..49781e8f8 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -383,7 +383,12 @@ Mavlink::forward_message(const mavlink_message_t *msg, Mavlink *self) Mavlink *inst; LL_FOREACH(_mavlink_instances, inst) { if (inst != self) { - inst->pass_message(msg); + + /* if not in normal mode, we are an onboard link + * onboard links should only pass on messages from the same system ID */ + if(!(self->_mode != MAVLINK_MODE_NORMAL && msg->sysid != mavlink_system.sysid)) { + inst->pass_message(msg); + } } } } |