error message 'unrecognized function enum' from detector or receiver prepended with Software version mismatch to handle enum start change between v6 and v7 (#680)

slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c

@@ -547,8 +547,8 @@ int M_nofunc(int file_des) {
     ret = FAIL;
     memset(mess, 0, sizeof(mess));
 
-    sprintf(mess, "Unrecognized Function enum %d. Please do not proceed.\n",
+    sprintf(mess, "%s Function enum %d. Please do not proceed.\n",
-            fnum);
+            UNRECOGNIZED_FNUM_ENUM, fnum);
     LOG(logERROR, (mess));
     return Server_SendResult(file_des, OTHER, NULL, 0);
 }
@@ -1916,55 +1916,57 @@ int acquire(int blocking, int file_des) {
 #ifdef EIGERD
             // check for hardware mac and hardware ip
             if (udpDetails[0].srcmac != getDetectorMAC()) {
-            ret = FAIL;
+                ret = FAIL;
-            uint64_t sourcemac = getDetectorMAC();
+                uint64_t sourcemac = getDetectorMAC();
-            char src_mac[MAC_ADDRESS_SIZE];
+                char src_mac[MAC_ADDRESS_SIZE];
-            getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac);
+                getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac);
-            sprintf(mess,
+                sprintf(
+                    mess,
                     "Invalid udp source mac address for this detector. Must be "
                     "same as hardware detector mac address %s\n",
                     src_mac);
-            LOG(logERROR, (mess));
+                LOG(logERROR, (mess));
-        } else if (!enableTenGigabitEthernet(GET_FLAG) &&
+            } else if (!enableTenGigabitEthernet(GET_FLAG) &&
-                   (udpDetails[0].srcip != getDetectorIP())) {
+                       (udpDetails[0].srcip != getDetectorIP())) {
-            ret = FAIL;
+                ret = FAIL;
-            uint32_t sourceip = getDetectorIP();
+                uint32_t sourceip = getDetectorIP();
-            char src_ip[INET_ADDRSTRLEN];
+                char src_ip[INET_ADDRSTRLEN];
-            getIpAddressinString(src_ip, sourceip);
+                getIpAddressinString(src_ip, sourceip);
-            sprintf(mess,
+                sprintf(
+                    mess,
                     "Invalid udp source ip address for this detector. Must be "
                     "same as hardware detector ip address %s in 1G readout "
                     "mode \n",
                     src_ip);
-            LOG(logERROR, (mess));
+                LOG(logERROR, (mess));
-        } else
+            } else
 #endif
-            if (configured == FAIL) {
+                if (configured == FAIL) {
-            ret = FAIL;
-            strcpy(mess, "Could not start acquisition because ");
-            strcat(mess, configureMessage);
-            LOG(logERROR, (mess));
-        } else if (sharedMemory_getScanStatus() == RUNNING) {
-            ret = FAIL;
-            strcpy(mess, "Could not start acquisition because a scan is "
-                         "already running!\n");
-            LOG(logERROR, (mess));
-        } else {
-            memset(scanErrMessage, 0, MAX_STR_LENGTH);
-            sharedMemory_setScanStop(0);
-            sharedMemory_setScanStatus(IDLE); // if it was error
-            if (pthread_create(&pthread_tid, NULL, &start_state_machine,
-                               &blocking)) {
                 ret = FAIL;
-                strcpy(mess, "Could not start acquisition thread!\n");
+                strcpy(mess, "Could not start acquisition because ");
+                strcat(mess, configureMessage);
+                LOG(logERROR, (mess));
+            } else if (sharedMemory_getScanStatus() == RUNNING) {
+                ret = FAIL;
+                strcpy(mess, "Could not start acquisition because a scan is "
+                             "already running!\n");
                 LOG(logERROR, (mess));
             } else {
-                // only does not wait for non blocking and scan
+                memset(scanErrMessage, 0, MAX_STR_LENGTH);
-                if (blocking || !scan) {
+                sharedMemory_setScanStop(0);
-                    pthread_join(pthread_tid, NULL);
+                sharedMemory_setScanStatus(IDLE); // if it was error
+                if (pthread_create(&pthread_tid, NULL, &start_state_machine,
+                                   &blocking)) {
+                    ret = FAIL;
+                    strcpy(mess, "Could not start acquisition thread!\n");
+                    LOG(logERROR, (mess));
+                } else {
+                    // only does not wait for non blocking and scan
+                    if (blocking || !scan) {
+                        pthread_join(pthread_tid, NULL);
+                    }
                 }
             }
-        }
     }
     return Server_SendResult(file_des, INT32, NULL, 0);
 }

slsReceiverSoftware/src/ClientInterface.cpp

@@ -234,8 +234,7 @@ int ClientInterface::decodeFunction(Interface &socket) {
     socket.Receive(fnum);
     socket.setFnum(fnum);
     if (fnum <= NUM_DET_FUNCTIONS || fnum >= NUM_REC_FUNCTIONS) {
-        throw RuntimeError("Unrecognized Function enum " +
+        throw RuntimeError(UNRECOGNIZED_FNUM_ENUM + std::to_string(fnum));
-                           std::to_string(fnum) + "\n");
     } else {
         LOG(logDEBUG1) << "calling function fnum: " << fnum << " ("
                        << getFunctionNameFromEnum((enum detFuncs)fnum) << ")";

slsSupportLib/include/sls/sls_detector_funcs.h

@@ -10,6 +10,8 @@
  *@short functions indices to call on server (detector/receiver)
  */
 
+#define UNRECOGNIZED_FNUM_ENUM "Unrecognized Function enum"
+
 enum detFuncs {
     F_EXEC_COMMAND = 0,
     F_GET_DETECTOR_TYPE,

slsSupportLib/src/ClientSocket.cpp

@@ -4,6 +4,7 @@
 #include "sls/logger.h"
 #include "sls/sls_detector_defs.h"
 #include "sls/sls_detector_exceptions.h"
+#include "sls/sls_detector_funcs.h"
 #include <arpa/inet.h>
 #include <cassert>
 #include <cstring>
@@ -76,9 +77,7 @@ void ClientSocket::readReply(int &ret, void *retval, size_t retval_size) {
     try {
         Receive(&ret, sizeof(ret));
         if (ret == slsDetectorDefs::FAIL) {
-            char mess[MAX_STR_LENGTH]{};
+            std::string mess = readErrorMessage();
-            // get error message
-            Receive(mess, sizeof(mess));
             // Do we need to know hostname here?
             // In that case save it???
             if (socketType == "Receiver") {
@@ -107,6 +106,9 @@ void ClientSocket::readReply(int &ret, void *retval, size_t retval_size) {
 std::string ClientSocket::readErrorMessage() {
     std::string error_msg(MAX_STR_LENGTH, '\0');
     Receive(&error_msg[0], error_msg.size());
+    if (error_msg.find(UNRECOGNIZED_FNUM_ENUM) != std::string::npos) {
+        error_msg.insert(0, "Software version mismatch. ");
+    }
     return error_msg;
 }