Skip to content

Commit df1e12d

Browse files
committed
* Repeater, room server: rule change for sendFloodReply()
1 parent d2fdd6f commit df1e12d

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

examples/simple_repeater/MyMesh.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,13 +416,13 @@ bool MyMesh::isLooped(const mesh::Packet* packet, const uint8_t max_counters[])
416416
void MyMesh::sendFloodReply(mesh::Packet* packet, unsigned long delay_millis, uint8_t path_hash_size) {
417417
if (recv_pkt_region) { // if _request_ packet scope is known, send reply with same scope
418418
TransportKey scope;
419-
if (region_map.getTransportKeysFor(*recv_pkt_region, &scope, 1) == 0) {
420-
sendFloodScoped(default_scope, packet, delay_millis, path_hash_size);
421-
} else {
419+
if (region_map.getTransportKeysFor(*recv_pkt_region, &scope, 1) > 0) {
422420
sendFloodScoped(scope, packet, delay_millis, path_hash_size);
421+
} else {
422+
sendFlood(packet, delay_millis, path_hash_size); // send un-scoped
423423
}
424424
} else {
425-
sendFloodScoped(default_scope, packet, delay_millis, path_hash_size);
425+
sendFlood(packet, delay_millis, path_hash_size); // send un-scoped
426426
}
427427
}
428428

examples/simple_room_server/MyMesh.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -718,13 +718,13 @@ void MyMesh::sendFloodScoped(const TransportKey& scope, mesh::Packet* pkt, uint3
718718
void MyMesh::sendFloodReply(mesh::Packet* packet, unsigned long delay_millis, uint8_t path_hash_size) {
719719
if (recv_pkt_region) { // if _request_ packet scope is known, send reply with same scope
720720
TransportKey scope;
721-
if (region_map.getTransportKeysFor(*recv_pkt_region, &scope, 1) == 0) {
722-
sendFloodScoped(default_scope, packet, delay_millis, path_hash_size);
723-
} else {
721+
if (region_map.getTransportKeysFor(*recv_pkt_region, &scope, 1) > 0) {
724722
sendFloodScoped(scope, packet, delay_millis, path_hash_size);
723+
} else {
724+
sendFlood(packet, delay_millis, path_hash_size); // send un-scoped
725725
}
726726
} else {
727-
sendFloodScoped(default_scope, packet, delay_millis, path_hash_size);
727+
sendFlood(packet, delay_millis, path_hash_size); // send un-scoped
728728
}
729729
}
730730

0 commit comments

Comments
 (0)