sync with vanilla dev

This commit is contained in:
liquidraver
2026-05-24 21:07:38 +02:00
parent 051adef93e
commit 99279fd9fa
4 changed files with 66 additions and 2 deletions
+61
View File
@@ -1177,6 +1177,48 @@ void RepeaterMesh::resetDutyCycleTimeoutRestarts() {
getRadioDriver(_radio).resetDutyCycleTimeoutRestarts();
}
/* ---------- region def helpers ---------- */
static char* skipSpaces(char* s) { while (*s == ' ') s++; return s; }
static void rtrimSpaces(char* s) { char* e = s + strlen(s); while (e > s && e[-1] == ' ') *--e = '\0'; }
static char* takeToken(char** cursor) {
char* p = skipSpaces(*cursor);
if (*p == '\0') { *cursor = p; return nullptr; }
char* tok = p;
while (*p && *p != ' ') p++;
if (*p) *p++ = '\0';
*cursor = p;
return tok;
}
static char* splitNameJump(char* tok) {
for (char* q = tok; *q; q++) {
if (*q == '|' || *q == ',') {
*q = '\0';
char* jump = skipSpaces(q + 1);
rtrimSpaces(jump);
return jump;
}
}
return nullptr;
}
static bool processRegionDefSegment(RegionMap* map, char* tok, RegionEntry** cursor, char* reply) {
char* jump = splitNameJump(tok);
char* name = skipSpaces(tok);
if (*name == '\0') { snprintf(reply, 160, "Err - empty name"); return false; }
if (jump && *jump == '\0') { snprintf(reply, 160, "Err - empty jump"); return false; }
RegionEntry* r = map->putRegion(name, (*cursor)->id);
if (r == NULL) { snprintf(reply, 160, "Err - put failed: %s", name); return false; }
r->flags = 0;
if (jump) {
RegionEntry* j = map->findByNamePrefix(jump);
if (j == NULL) { snprintf(reply, 160, "Err - unknown jump: %s", jump); return false; }
*cursor = j;
} else {
*cursor = r;
}
return true;
}
/* ---------------------------------------- */
void RepeaterMesh::handleCommand(uint32_t sender_timestamp, char* command, char* reply) {
if (region_load_active) {
if (StrHelper::isBlank(command)) {
@@ -1278,6 +1320,23 @@ void RepeaterMesh::handleCommand(uint32_t sender_timestamp, char* command, char*
reply[0] = 0;
} else if (memcmp(command, "region", 6) == 0) {
reply[0] = 0;
// `region def`: cursor-walk bulk region builder — must run before parseTextParts
// mutates and truncates the buffer to 4 segments.
char* cmd = skipSpaces(command);
if (strncmp(cmd, "region def", 10) == 0 && (cmd[10] == ' ' || cmd[10] == '\0')) {
char* payload = skipSpaces(cmd + 10);
rtrimSpaces(payload);
if (*payload == '\0') { snprintf(reply, 160, "Err - empty def"); goto region_done; }
RegionEntry* cursor = &region_map.getWildcard();
for (char* tok; (tok = takeToken(&payload)) != nullptr; ) {
if (!processRegionDefSegment(&region_map, tok, &cursor, reply)) goto region_done;
}
region_map.exportTo(reply, 160);
goto region_done;
}
{
const char* parts[4];
int n = mesh::Utils::parseTextParts(command, parts, 4, ' ');
@@ -1400,6 +1459,8 @@ void RepeaterMesh::handleCommand(uint32_t sender_timestamp, char* command, char*
} else {
strcpy(reply, "Err - ??");
}
} // end parseTextParts scope
region_done:;
} else if (memcmp(command, "discover.neighbors", 18) == 0) {
const char* sub = command + 18;
while (*sub == ' ') sub++;