Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-11-02 10:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

"Unknown command" replies

Browse Source
This commit is contained in:
Scott Powell
2026-08-23 19:35:43 +10:00
parent b4f7e941fa
commit 21179760d3
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/MyMesh.cpp
+7 -8
View File
@@ -533,10 +533,10 @@ void MyMesh::onMessageRecv(const ContactInfo &from, mesh::Packet *pkt, uint32_t
void MyMesh::onCommandDataRecv(const ContactInfo &from, mesh::Packet *pkt, uint32_t sender_timestamp, void MyMesh::onCommandDataRecv(const ContactInfo &from, mesh::Packet *pkt, uint32_t sender_timestamp,
const char *text, char* reply) { const char *text, char* reply) {
markConnectionActive(from); // in case this is from a server, and we have a connection markConnectionActive(from); // in case this is from a server, and we have a connection
if (from.isRemoteCLIAllowed() && handleCommand(text, sender_timestamp, reply)) { if (from.isRemoteCLIAllowed()) {
// CLI command was handled. Let BaseChatMesh handle the sending of the reply if (!handleCommand(text, sender_timestamp, reply)) {
} else { strcat(reply, "Unknown command"); // reply may have cmd prefix from 'text'
queueMessage(from, TXT_TYPE_CLI_DATA, pkt, sender_timestamp, NULL, 0, text); }
} }
} }
@@ -1095,14 +1095,13 @@ void MyMesh::handleCmdFrame(size_t len) {
text[tlen] = 0; // ensure null text[tlen] = 0; // ensure null
reply_buf[0] = 0; reply_buf[0] = 0;
if (handleCommand(text, 0, reply_buf)) { if (!handleCommand(text, 0, reply_buf)) {
strcat(reply_buf, "Unknown command"); // reply_buf may have cmd prefix from 'text'
}
out_frame[0] = RESP_CODE_CLI_REPLY; out_frame[0] = RESP_CODE_CLI_REPLY;
int rlen = strlen(reply_buf); int rlen = strlen(reply_buf);
memcpy(&out_frame[1], reply_buf, rlen); memcpy(&out_frame[1], reply_buf, rlen);
_serial->writeFrame(out_frame, 1 + rlen); _serial->writeFrame(out_frame, 1 + rlen);
} else {
writeErrFrame(ERR_CODE_ILLEGAL_ARG); // unsupported command
}
} else if (cmd_frame[0] == CMD_SEND_TXT_MSG && len >= 14) { } else if (cmd_frame[0] == CMD_SEND_TXT_MSG && len >= 14) {
int i = 1; int i = 1;
uint8_t txt_type = cmd_frame[i++]; uint8_t txt_type = cmd_frame[i++];