2023-05-25 Fred Gleason <fredg@paravelsystems.com>

* Fixed a bug in caed(8) that caused spurious 'sent unrecognized
	command "ME"' messages to be sent to the syslog.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2023-05-25 11:41:44 -04:00
parent 0c97de7bf5
commit 98aa2d9373
2 changed files with 14 additions and 9 deletions

View File

@ -24177,3 +24177,6 @@
2023-05-25 Fred Gleason <fredg@paravelsystems.com> 2023-05-25 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdvairplayd(8) that caused spurious 'sent * Fixed a bug in rdvairplayd(8) that caused spurious 'sent
unrecognized command "TS -1"' messages to be sent to the syslog. unrecognized command "TS -1"' messages to be sent to the syslog.
2023-05-25 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in caed(8) that caused spurious 'sent unrecognized
command "ME"' messages to be sent to the syslog.

View File

@ -2,7 +2,7 @@
// //
// Network server for caed(8). // Network server for caed(8).
// //
// (C) Copyright 2019-2021 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2019-2023 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -580,7 +580,8 @@ bool CaeServer::ProcessCommand(int id,const QString &cmd)
} }
} }
if((f0.at(0)=="ME")&&(f0.size()>=3)) { // Meter Enable if(f0.at(0)=="ME") { // Meter Enable
if(f0.size()>2) { // So we don't warn if no cards are specified
uint16_t udp_port=0xFFFF&f0.at(1).toUInt(&ok); uint16_t udp_port=0xFFFF&f0.at(1).toUInt(&ok);
if(ok) { if(ok) {
QList<unsigned> cards; QList<unsigned> cards;
@ -588,9 +589,10 @@ bool CaeServer::ProcessCommand(int id,const QString &cmd)
cards.push_back(f0.at(i).toUInt()); cards.push_back(f0.at(i).toUInt());
} }
emit meterEnableReq(id,udp_port,cards); emit meterEnableReq(id,udp_port,cards);
was_processed=true;
} }
} }
was_processed=true;
}
if(!was_processed) { // Send generic error response if(!was_processed) { // Send generic error response
sendCommand(id,f0.join(" ")+"-!"); sendCommand(id,f0.join(" ")+"-!");