meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

* RegionMap: get/set Home Region

Browse source 
* repeater: admin CLI, changed "allowf *", "denyf *", added "home"
This commit is contained in:
Scott Powell 2025-11-06 17:28:45 +11:00
parent 7419ed71f7
commit cf547da857
3 changed files with 42 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
examples/simple_repeater/MyMesh.cpp
View file

@ -637,7 +637,7 @@ void MyMesh::onControlDataRecv(mesh::Packet* packet) {
memcpy(&data[6], self_id.pub_key, PUB_KEY_SIZE);
auto resp = createControlData(data, sizeof(data));
if (resp) {
sendZeroHop(resp, getRetransmitDelay(resp)); // apply random delay, as multiple nodes can respond to this
sendZeroHop(resp, getRetransmitDelay(resp)*4); // apply random delay (widened x4), as multiple nodes can respond to this
}
}
}
@ -981,16 +981,16 @@ void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply
savePrefs();
bool success = region_map.save(_fs);
strcpy(reply, success ? "OK" : "Err - save failed");
} else if (n >= 2 && strcmp(parts[1], "allowf") == 0) {
auto region = n >= 3 ? region_map.findByNamePrefix(parts[2]) : &region_map.getWildcard();
} else if (n >= 3 && strcmp(parts[1], "allowf") == 0) {
auto region = strcmp(parts[2], "*") == 0 ? &region_map.getWildcard() : region_map.findByNamePrefix(parts[2]);
if (region) {
region->flags &= ~REGION_DENY_FLOOD;
strcpy(reply, "OK");
} else {
strcpy(reply, "Err - unknown region");
}
} else if (n >= 2 && strcmp(parts[1], "denyf") == 0) {
auto region = n >= 3 ? region_map.findByNamePrefix(parts[2]) : &region_map.getWildcard();
} else if (n >= 3 && strcmp(parts[1], "denyf") == 0) {
auto region = strcmp(parts[2], "*") == 0 ? &region_map.getWildcard() : region_map.findByNamePrefix(parts[2]);
if (region) {
region->flags |= REGION_DENY_FLOOD;
strcpy(reply, "OK");
@ -1004,6 +1004,17 @@ void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply
} else {
strcpy(reply, "Err - unknown region");
}
} else if (n >= 3 && strcmp(parts[1], "home") == 0) {
auto home = strcmp(parts[2], "*") == 0 ? &region_map.getWildcard() : region_map.findByNamePrefix(parts[2]);
if (home) {
region_map.setHomeRegion(home);
sprintf(reply, " home is now %s", home->name);
} else {
strcpy(reply, "Err - unknown region");
}
} else if (n == 2 && strcmp(parts[1], "home") == 0) {
auto home = region_map.getHomeRegion();
sprintf(reply, " home is %s", home ? home->name : "*");
} else {
strcpy(reply, "Err - ??");
}

32
src/helpers/RegionMap.cpp
View file

@ -3,10 +3,10 @@
#include <SHA256.h>
RegionMap::RegionMap(TransportKeyStore& store) : _store(&store) {
next_id = 1; num_regions = 0;
next_id = 1; num_regions = 0; home_id = 0;
wildcard.id = wildcard.parent = 0;
wildcard.flags = 0; // default behaviour, allow flood and direct
strcpy(wildcard.name, "(*)");
strcpy(wildcard.name, "*");
}
static File openWrite(FILESYSTEM* _fs, const char* filename) {
@ -31,9 +31,10 @@ bool RegionMap::load(FILESYSTEM* _fs) {
if (file) {
uint8_t pad[128];
num_regions = 0; next_id = 1;
num_regions = 0; next_id = 1; home_id = 0;
bool success = file.read(pad, 7) == 7; // reserved header
bool success = file.read(pad, 5) == 5; // reserved header
success = success && file.read((uint8_t *) &home_id, sizeof(home_id)) == sizeof(home_id);
success = success && file.read((uint8_t *) &wildcard.flags, sizeof(wildcard.flags)) == sizeof(wildcard.flags);
success = success && file.read((uint8_t *) &next_id, sizeof(next_id)) == sizeof(next_id);
@ -68,7 +69,8 @@ bool RegionMap::save(FILESYSTEM* _fs) {
uint8_t pad[128];
memset(pad, 0, sizeof(pad));
bool success = file.write(pad, 7) == 7; // reserved header
bool success = file.write(pad, 5) == 5; // reserved header
success = success && file.write((uint8_t *) &home_id, sizeof(home_id)) == sizeof(home_id);
success = success && file.write((uint8_t *) &wildcard.flags, sizeof(wildcard.flags)) == sizeof(wildcard.flags);
success = success && file.write((uint8_t *) &next_id, sizeof(next_id)) == sizeof(next_id);
@ -140,11 +142,15 @@ RegionEntry* RegionMap::findByName(const char* name) {
}
RegionEntry* RegionMap::findByNamePrefix(const char* prefix) {
RegionEntry* partial = NULL;
for (int i = 0; i < num_regions; i++) {
auto region = &regions[i];
if (memcmp(prefix, region->name, strlen(prefix)) == 0) return region;
if (strcmp(prefix, region->name) == 0) return region; // is a complete match, preference this one
if (memcmp(prefix, region->name, strlen(prefix)) == 0) {
partial = region;
}
}
return NULL; // not found
return partial;
}
RegionEntry* RegionMap::findById(uint16_t id) {
@ -157,6 +163,14 @@ RegionEntry* RegionMap::findById(uint16_t id) {
return NULL; // not found
}
RegionEntry* RegionMap::getHomeRegion() {
return findById(home_id);
}
void RegionMap::setHomeRegion(const RegionEntry* home) {
home_id = home ? home->id : 0;
}
bool RegionMap::removeRegion(const RegionEntry& region) {
if (region.id == 0) return false; // failed (cannot remove the wildcard Region)
@ -190,9 +204,9 @@ void RegionMap::printChildRegions(int indent, const RegionEntry* parent, Stream&
}
if (parent->flags & REGION_DENY_FLOOD) {
out.printf("%s\n", parent->name);
out.printf("%s%s\n", parent->name, parent->id == home_id ? "^" : "");
} else {
out.printf("%s F\n", parent->name);
out.printf("%s%s F\n", parent->name, parent->id == home_id ? "^" : "");
}
for (int i = 0; i < num_regions; i++) {

4
src/helpers/RegionMap.h
View file

@ -20,7 +20,7 @@ struct RegionEntry {
class RegionMap {
TransportKeyStore* _store;
uint16_t next_id;
uint16_t next_id, home_id;
uint16_t num_regions;
RegionEntry regions[MAX_REGION_ENTRIES];
RegionEntry wildcard;
@ -39,6 +39,8 @@ public:
RegionEntry* findByName(const char* name);
RegionEntry* findByNamePrefix(const char* prefix);
RegionEntry* findById(uint16_t id);
RegionEntry* getHomeRegion(); // NOTE: can be NULL
void setHomeRegion(const RegionEntry* home);
bool removeRegion(const RegionEntry& region);
bool clear();
void resetFrom(const RegionMap& src) { num_regions = 0; next_id = src.next_id; }