sync with vanilla dev

This commit is contained in:
liquidraver
2026-07-04 12:50:37 +02:00
parent c36aec98b0
commit 6057670171
5 changed files with 13 additions and 7 deletions
+5 -2
View File
@@ -411,7 +411,10 @@ uint32_t RoomServerMesh::getDirectRetransmitDelay(const mesh::Packet* packet) {
return computeAdaptiveDirectDelay(packet);
}
bool RoomServerMesh::filterRecvFloodPacket(mesh::Packet* pkt) {
mesh::DispatcherAction RoomServerMesh::onRecvPacket(mesh::Packet* pkt) {
// Determine the request packet's region so sendFloodReply() can echo the same
// scope. Runs for every packet (not just floods) so recv_pkt_region is cleared
// for direct packets instead of inheriting the last flood's region.
if (pkt->getRouteType() == ROUTE_TYPE_TRANSPORT_FLOOD) {
recv_pkt_region = region_map.findMatch(pkt, REGION_DENY_FLOOD);
} else if (pkt->getRouteType() == ROUTE_TYPE_FLOOD) {
@@ -423,7 +426,7 @@ bool RoomServerMesh::filterRecvFloodPacket(mesh::Packet* pkt) {
} else {
recv_pkt_region = nullptr;
}
return false;
return Mesh::onRecvPacket(pkt);
}
void RoomServerMesh::onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, const mesh::Identity& sender, uint8_t* data, size_t len) {