Integration Candidate 2020-03-18

README.md

@@ -7,6 +7,10 @@ This lab application is a non-flight utility to send commands to the cFS Bundle.
 ci_lab is a simple command uplink application that accepts CCSDS telecommand packets over a UDP/IP port. It does not provide a full CCSDS Telecommand stack implementation.
 
 ## Version Notes
+
+- 2.3.3: DEVELOPMENT
+  - Offset UDP base port in multi-cpu configurations
+  - Minor changes, see https://github.com/nasa/ci_lab/pull/44
 - 2.3.2: DEVELOPMENT
   - Use OSAL socket API instead of BSD sockets
   - Remove PDU introspection code

fsw/src/ci_lab_app.c

@@ -154,7 +154,8 @@ void CI_LAB_delete_callback(void)
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
 void CI_LAB_TaskInit(void)
 {
-    int32 status;
+    int32  status;
+    uint16 DefaultListenPort;
 
     memset(&CI_LAB_Global, 0, sizeof(CI_LAB_Global));
 
@@ -176,7 +177,8 @@ void CI_LAB_TaskInit(void)
     else
     {
         OS_SocketAddrInit(&CI_LAB_Global.SocketAddress, OS_SocketDomain_INET);
-        OS_SocketAddrSetPort(&CI_LAB_Global.SocketAddress, cfgCI_LAB_PORT);
+        DefaultListenPort = CI_LAB_BASE_UDP_PORT + CFE_PSP_GetProcessorId() - 1;
+        OS_SocketAddrSetPort(&CI_LAB_Global.SocketAddress, DefaultListenPort);
 
         status = OS_SocketBind(CI_LAB_Global.SocketID, &CI_LAB_Global.SocketAddress);
 
@@ -188,6 +190,7 @@ void CI_LAB_TaskInit(void)
         else
         {
             CI_LAB_Global.SocketConnected = true;
+            CFE_ES_WriteToSysLog("CI_LAB listening on UDP port: %u\n", (unsigned int)DefaultListenPort);
         }
     }
 

fsw/src/ci_lab_app.h

@@ -46,9 +46,9 @@
 
 /****************************************************************************/
 
-#define cfgCI_LAB_PORT    1234
-#define CI_LAB_MAX_INGEST 768
-#define CI_LAB_PIPE_DEPTH 32
+#define CI_LAB_BASE_UDP_PORT 1234
+#define CI_LAB_MAX_INGEST    768
+#define CI_LAB_PIPE_DEPTH    32
 
 /************************************************************************
 ** Type Definitions

fsw/src/ci_lab_version.h

@@ -31,7 +31,7 @@
 
 #define CI_LAB_MAJOR_VERSION 2
 #define CI_LAB_MINOR_VERSION 3
-#define CI_LAB_REVISION      2
+#define CI_LAB_REVISION      3
 #define CI_LAB_MISSION_REV   0
 
 #endif /* _ci_lab_version_h_ */