Integration of upstrem PR #1810
This commit is contained in:
@@ -514,7 +514,10 @@ bool MyMesh::filterRecvFloodPacket(mesh::Packet* pkt) {
|
|||||||
if (pkt->getRouteType() == ROUTE_TYPE_TRANSPORT_FLOOD) {
|
if (pkt->getRouteType() == ROUTE_TYPE_TRANSPORT_FLOOD) {
|
||||||
recv_pkt_region = region_map.findMatch(pkt, REGION_DENY_FLOOD);
|
recv_pkt_region = region_map.findMatch(pkt, REGION_DENY_FLOOD);
|
||||||
} else if (pkt->getRouteType() == ROUTE_TYPE_FLOOD) {
|
} else if (pkt->getRouteType() == ROUTE_TYPE_FLOOD) {
|
||||||
if (region_map.getWildcard().flags & REGION_DENY_FLOOD) {
|
if ((pkt->getPayloadType() == PAYLOAD_TYPE_GRP_TXT ||
|
||||||
|
pkt->getPayloadType() == PAYLOAD_TYPE_GRP_DATA ||
|
||||||
|
pkt->getPayloadType() == PAYLOAD_TYPE_ADVERT) &&
|
||||||
|
region_map.getWildcard().flags & REGION_DENY_FLOOD) {
|
||||||
recv_pkt_region = NULL;
|
recv_pkt_region = NULL;
|
||||||
} else {
|
} else {
|
||||||
recv_pkt_region = ®ion_map.getWildcard();
|
recv_pkt_region = ®ion_map.getWildcard();
|
||||||
|
|||||||
Reference in New Issue
Block a user