nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow define in write direction if given more than once

Browse Source
This commit is contained in:
John
2024-06-28 18:41:44 +02:00
parent a8362bd087
commit 20982e5e3e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mainloop.cpp
+7 -4
View File
@@ -613,7 +613,7 @@ result_t MainLoop::executeAuth(const vector<string>& args, string* user, ostring
result_t MainLoop::executeRead(const vector<string>& args, const string& levels, ostringstream* ostream) { result_t MainLoop::executeRead(const vector<string>& args, const string& levels, ostringstream* ostream) {
size_t argPos = 1; size_t argPos = 1;
bool hex = false, newDefinition = false; bool hex = false, newDefinition = false, writeDirection = false;
OutputFormat verbosity = OF_NONE; OutputFormat verbosity = OF_NONE;
time_t maxAge = 5*60; time_t maxAge = 5*60;
string circuit, params; string circuit, params;
@@ -627,6 +627,9 @@ result_t MainLoop::executeRead(const vector<string>& args, const string& levels,
*ostream << "ERR: option not enabled"; *ostream << "ERR: option not enabled";
return RESULT_OK; return RESULT_OK;
} }
if (newDefinition) {
writeDirection = true;
}
newDefinition = true; newDefinition = true;
} else if (args[argPos] == "-f") { } else if (args[argPos] == "-f") {
maxAge = 0; maxAge = 0;
@@ -742,7 +745,7 @@ result_t MainLoop::executeRead(const vector<string>& args, const string& levels,
" NAME NAME of the message to send\n" " NAME NAME of the message to send\n"
" FIELD only retrieve the field named FIELD\n" " FIELD only retrieve the field named FIELD\n"
" N only retrieve the N'th field named FIELD (0-based)\n" " N only retrieve the N'th field named FIELD (0-based)\n"
" -def read with explicit message definition (only if enabled):\n" " -def read with explicit message definition (only if enabled, allow write direction if given more than once):\n"
" DEFINITION message definition to use instead of known definition\n" " DEFINITION message definition to use instead of known definition\n"
" -h send hex read message (or answer from cache):\n" " -h send hex read message (or answer from cache):\n"
" ZZ destination address\n" " ZZ destination address\n"
@@ -842,9 +845,9 @@ result_t MainLoop::executeRead(const vector<string>& args, const string& levels,
return RESULT_OK; return RESULT_OK;
} }
deque<Message*> messages; deque<Message*> messages;
m_newlyDefinedMessages->findAll("", "", levels, false, true, false, false, true, false, 0, 0, false, &messages); m_newlyDefinedMessages->findAll("", "", levels, false, true, writeDirection, false, true, false, 0, 0, false, &messages);
if (messages.empty()) { if (messages.empty()) {
*ostream << "ERR: bad definition: no read message"; *ostream << "ERR: bad definition: no read" << (writeDirection?"/write":"") << " message";
return RESULT_OK; return RESULT_OK;
} }
message = *messages.begin(); message = *messages.begin();