From 98aa2d93735989303d4d601411aeba509b83f764 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Thu, 25 May 2023 11:41:44 -0400
Subject: [PATCH] 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>
---
 ChangeLog          |  3 +++
 cae/cae_server.cpp | 20 +++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4cf5c8eb..358a7bbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24177,3 +24177,6 @@
 2023-05-25 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed a bug in rdvairplayd(8) that caused spurious 'sent
 	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.
diff --git a/cae/cae_server.cpp b/cae/cae_server.cpp
index 2a0b91db..f23f535d 100644
--- a/cae/cae_server.cpp
+++ b/cae/cae_server.cpp
@@ -2,7 +2,7 @@
 //
 // 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
 //   it under the terms of the GNU General Public License version 2 as
@@ -580,16 +580,18 @@ bool CaeServer::ProcessCommand(int id,const QString &cmd)
     }
   }
 
-  if((f0.at(0)=="ME")&&(f0.size()>=3)) {  // Meter Enable
-    uint16_t udp_port=0xFFFF&f0.at(1).toUInt(&ok);
-    if(ok) {
-      QList<unsigned> cards;
-      for(int i=2;i<f0.size();i++) {
-	cards.push_back(f0.at(i).toUInt());
+  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);
+      if(ok) {
+	QList<unsigned> cards;
+	for(int i=2;i<f0.size();i++) {
+	  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