yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

mavlink: only try broadcast if valid address found

Browse Source
This commit is contained in:
Julian Oes
2016-04-05 13:36:29 +02:00
parent 832dde7531
commit 66567baf89
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/mavlink/mavlink_main.cpp
View File

@@ -179,7 +179,7 @@ Mavlink::Mavlink() :
_src_addr{},
_bcast_addr{},
_src_addr_initialized(false),
_broadcast_reported(false),
_broadcast_address_found(false),
#endif
_socket_fd(-1),
_protocol(SERIAL),
@@ -885,15 +885,13 @@ Mavlink::send_message(const uint8_t msgid, const void *msg, uint8_t component_ID
if ((_mode != MAVLINK_MODE_ONBOARD) &&
(!get_client_source_initialized()
|| (hrt_elapsed_time(&tstatus.heartbeat_time) > 3 * 1000 * 1000))
&& (msgid == MAVLINK_MSG_ID_HEARTBEAT)) {
&& (msgid == MAVLINK_MSG_ID_HEARTBEAT)
&& _broadcast_address_found) {
int bret = sendto(_socket_fd, buf, packet_len, 0, (struct sockaddr *)&_bcast_addr, sizeof(_bcast_addr));
if (bret <= 0) {
if (!_broadcast_reported) {
PX4_WARN("sending broadcast failed, errno: %d: %s", errno, strerror(errno));
_broadcast_reported = true;
}
}
}
@@ -1013,8 +1011,6 @@ Mavlink::init_udp()
return;
}
bool network_interface_found = false;
for (int i = 0; i < (ifconf.ifc_len/sizeof(struct ifreq)) && (i < MAX_IFREQS); ++i) {
// ignore loopback network
if (strcmp(ifreqs[i].ifr_name, "lo") == 0) {
@@ -1043,7 +1039,7 @@ Mavlink::init_udp()
continue;
}
if (!network_interface_found) {
if (!_broadcast_address_found) {
PX4_INFO("using network interface %s, IP: %s", ifreqs[i].ifr_name, inet_ntoa(sin_addr));
struct in_addr &bc_addr = ((struct sockaddr_in *)&bc_ifreq.ifr_broadaddr)->sin_addr;
@@ -1052,15 +1048,15 @@ Mavlink::init_udp()
_bcast_addr.sin_family = AF_INET;
_bcast_addr.sin_addr = bc_addr;
network_interface_found = true;
_broadcast_address_found = true;
} else {
PX4_INFO("ignoring additional network interface %s, IP: %s",
ifreqs[i].ifr_name, inet_ntoa(sin_addr));
}
}
if (!network_interface_found) {
PX4_WARN("no networking interface for local network found");
if (!_broadcast_address_found) {
PX4_WARN("no broadcasting address found");
return;
}

2
src/modules/mavlink/mavlink_main.h
View File

@@ -435,7 +435,7 @@ private:
struct sockaddr_in _src_addr;
struct sockaddr_in _bcast_addr;
bool _src_addr_initialized;
bool _broadcast_reported;
bool _broadcast_address_found;
#endif
int _socket_fd;