Make default_envs global and check against that list in add envs

Author: tynanford

client/castApp/src/caster.h

@@ -20,6 +20,8 @@
 epicsShareExtern double reccastTimeout;
 epicsShareExtern double reccastMaxHoldoff;
 
+extern const char* default_envs[];
+
 typedef enum {
   casterUDPSetup,
   casterTCPSetup,

client/castApp/src/castinit.c

@@ -125,7 +125,18 @@ void addReccasterEnvVars(caster_t* self, int argc, char **argv)
                 continue;
             }
             found_dup = 0;
-            /* check if dup in self->extra_envs. doesn't check if arg is in default_envs right now */
+            /* check if dup in self->default_envs */
+            for(j = 0; default_envs[j]; j++) {
+                if(strcmp(argv[i], default_envs[j]) == 0) {
+                    found_dup = 1;
+                    errlogSevPrintf(errlogMinor, "Env var %s is already in env list sent by reccaster by default\n", argv[i]);
+                    break;
+                }
+            }
+            if(found_dup) {
+                continue;
+            }
+            /* check if dup in self->extra_envs */
             for(j = 0; j < num_new_extra_envs; j++) {
                 if(new_extra_envs[j] == NULL) {
                     continue;

client/castApp/src/dbcb.c

@@ -10,7 +10,7 @@
 
 #include "caster.h"
 
-static const char* default_envs[] =
+const char* default_envs[] =
 {
     /* automatic (if unset) */
     "HOSTNAME",

client/castApp/src/testAddEnvVars.c

@@ -127,6 +127,20 @@ static void testAddEnvVars(void)
         testOk1(strcmp(caster.extra_envs[i], expectedExtraEnvs[i]) == 0);
     }
 
+    testDiag("Testing addReccasterEnvVars with a env vars from default list");
+    argvlist[1] = "EPICS_BASE";
+    argvlist[2] = "EPICS_CA_MAX_ARRAY_BYTES";
+    argvlist[3] = "PVAS_SERVER_PORT";
+    argvlist[4] = "RSRV_SERVER_PORT";
+    argvlist[5] = "ENGINEER";
+    argc = 6;
+    testOk1(caster.num_extra_envs==expectedNumExtraEnvs);
+    addReccasterEnvVars(&caster, argc, argvlist);
+    testOk1(caster.num_extra_envs==expectedNumExtraEnvs);
+    for(i=0; i < expectedNumExtraEnvs; i++) {
+        testOk1(strcmp(caster.extra_envs[i], expectedExtraEnvs[i]) == 0);
+    }
+
     epicsMutexUnlock(lock);
 
     epicsEventId sd;
@@ -139,7 +153,7 @@ static void testAddEnvVars(void)
 
 MAIN(testAddEnvVars)
 {
-    testPlan(40);
+    testPlan(48);
     testAddEnvVars();
     return testDone();
 }