git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stg-2.409'
[stg.git]
/
projects
/
stargazer
/
plugins
/
other
/
smux
/
smux.cpp
diff --git
a/projects/stargazer/plugins/other/smux/smux.cpp
b/projects/stargazer/plugins/other/smux/smux.cpp
index d1af2dbc6c389058f9c76f4d33490f4e9da222b6..4586807c9c4c6c581fa38466a2e2522573eefe3f 100644
(file)
--- a/
projects/stargazer/plugins/other/smux/smux.cpp
+++ b/
projects/stargazer/plugins/other/smux/smux.cpp
@@
-24,9
+24,6
@@
namespace
{
PLUGIN_CREATOR<SMUX> smc;
{
PLUGIN_CREATOR<SMUX> smc;
-bool SPrefixLess(const Sensors::value_type & a,
- const Sensors::value_type & b);
-
bool SPrefixLess(const Sensors::value_type & a,
const Sensors::value_type & b)
{
bool SPrefixLess(const Sensors::value_type & a,
const Sensors::value_type & b)
{
@@
-57,7
+54,7
@@
int p;
pv.param = "Port";
pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
pv.param = "Port";
pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end()
|| pvi->value.empty()
)
{
errorStr = "Parameter \'Port\' not found.";
printfd(__FILE__, "Parameter 'Port' not found\n");
{
errorStr = "Parameter \'Port\' not found.";
printfd(__FILE__, "Parameter 'Port' not found\n");
@@
-73,7
+70,7
@@
port = static_cast<uint16_t>(p);
pv.param = "Password";
pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
pv.param = "Password";
pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end()
|| pvi->value.empty()
)
{
errorStr = "Parameter \'Password\' not found.";
printfd(__FILE__, "Parameter 'Password' not found\n");
{
errorStr = "Parameter \'Password\' not found.";
printfd(__FILE__, "Parameter 'Password' not found\n");
@@
-86,7
+83,7
@@
else
pv.param = "Server";
pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
pv.param = "Server";
pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end()
|| pvi->value.empty()
)
{
errorStr = "Parameter \'Server\' not found.";
printfd(__FILE__, "Parameter 'Server' not found\n");
{
errorStr = "Parameter \'Server\' not found.";
printfd(__FILE__, "Parameter 'Server' not found\n");
@@
-272,7
+269,7
@@
printfd(__FILE__, "SMUX::Stop() - After\n");
return 0;
}
return 0;
}
-int SMUX::Reload(const MODULE_SETTINGS &
ms
)
+int SMUX::Reload(const MODULE_SETTINGS &
/*ms*/
)
{
if (Stop())
return -1;
{
if (Stop())
return -1;