dandri/ZephCore
1
0
Fork 0
mirror of https://github.com/liquidraver/ZephCore.git synced 2026-09-01 21:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync with vanilla dev

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
zephcore/app/RepeaterMesh.cpp
+5 -2
View File
@@ -635,7 +635,10 @@ uint32_t RepeaterMesh::getDirectRetransmitDelay(const mesh::Packet* packet) {
return computeAdaptiveDirectDelay(packet);
}
bool RepeaterMesh::filterRecvFloodPacket(mesh::Packet* pkt) {
mesh::DispatcherAction RepeaterMesh::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) {
@@ -647,7 +650,7 @@ bool RepeaterMesh::filterRecvFloodPacket(mesh::Packet* pkt) {
} else {
recv_pkt_region = nullptr;
}
return false;
return Mesh::onRecvPacket(pkt);
}
void RepeaterMesh::onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, const mesh::Identity& sender, uint8_t* data, size_t len) {
zephcore/app/RepeaterMesh.h
+1 -1
View File
@@ -179,7 +179,7 @@ protected:
return _prefs.multi_acks;
}
bool filterRecvFloodPacket(mesh::Packet* pkt) override;
mesh::DispatcherAction onRecvPacket(mesh::Packet* pkt) override;
void onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, const mesh::Identity& sender, uint8_t* data, size_t len) override;
int searchPeersByHash(const uint8_t* hash) override;
zephcore/app/RoomServerMesh.cpp
+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) {
zephcore/app/RoomServerMesh.h
+1 -1
View File
@@ -148,7 +148,7 @@ protected:
return _prefs.multi_acks;
}
bool filterRecvFloodPacket(mesh::Packet* pkt) override;
mesh::DispatcherAction onRecvPacket(mesh::Packet* pkt) override;
void onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id, uint32_t timestamp, const uint8_t* app_data, size_t app_data_len) override;
void onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, const mesh::Identity& sender, uint8_t* data, size_t len) override;
zephcore/helpers/RegionMap.cpp
+1 -1
View File
@@ -114,7 +114,7 @@ bool RegionMap::save(const char* path) {
}
fs_close(&file);
LOG_INF("Saved %d regions to %s", num_regions, filepath);
return true;
return success;
}
RegionEntry* RegionMap::putRegion(const char* name, uint16_t parent_id, uint16_t id) {