CCB 2019-09-04: Merge #24 #4 #12 #6 #11 #5 #7 #14 #1

Reviewed and approved at 2019-09-04 CCB

.gitignore

@@ -0,0 +1,2 @@
+*.pyc
+cmdUtil

Guide-GroundSystem.txt

@@ -10,17 +10,17 @@ The Ground System contains a main window that lets you launch the different util
 
 Note: The Main Window needs to be opened at all times so that the telemetry messages can be forwarded to the Telemetry System.
 
-The Ground System will automatically detect the spacecraft when it starts sending the telemetry, and it will be added to the ip addresses list. You can select the spacecraft from the list, and start Telemetry System to receive its data. If ‘All’ spacecrafts are selected, you can start Telemetry System to display the packet count from multiple spacecrafts (if it detected more than one).
+The Ground System will automatically detect the spacecraft when it starts sending the telemetry, and it will be added to the ip addresses list. You can select the spacecraft from the list, and start Telemetry System to receive its data. If 'All' spacecrafts are selected, you can start Telemetry System to display the packet count from multiple spacecrafts (if it detected more than one).
 
 Future enhancements:
   1. Detect different spacecrafts based on telemetry header(spacecraft id) data instead of using the spacecraft ip address.
   2. Add instructions for Windows.
 
 
 Before launching the Ground System make sure that:
-  —> PyQt4 is installed.
-  —> PyZMQ is installed. 
-  —> cmdUtil is compiled.
+  -> PyQt4 is installed.
+  -> PyZMQ is installed. 
+  -> cmdUtil is compiled.
 
 
 Installing and running cFS Ground System on Mac:

Subsystems/Commands-Telemetry.txt

@@ -6,7 +6,7 @@ Telemetry ( tlmGUI/ directory ):
 UDP/IP packets. The "enable telemetry" command tells the TO_LAB application to start 
 sending packets to a UDP port on the "localhost" or a specified IP. 
 
-Start the telemetry system using the Ground System’s main window.
+Start the telemetry system using the Ground System's main window.
 
 Buttons are available for individual telemetry pages. 
 New pages can be added by adding to the "telemetry-pages.txt" text file. 
@@ -63,7 +63,7 @@ Commands ( cmdGUI/ directory)
 This is a simple Python / QT4 based Command GUI for the cmdUtil utility. 
 It provides a list of "command pages" with a list of commands to send to a subsystem.
 
-Start the command system using the Ground System’s main window.
+Start the command system using the Ground System's main window.
 
 The program is written in Python 2.x with the PyQT4 GUI. The dialogs were created
 in the QT4 designer program, and converted to python classes using the "pyuic4" 

Subsystems/cmdUtil/CMakeLists.txt

@@ -4,7 +4,7 @@ if (ENABLE_DATA_DICTIONARY)
   include_directories(${msglib_MISSION_DIR}/inc)
 endif()
 
-add_executable(cmdUtil cmdUtil.c sendUdp.c)
+add_executable(cmdUtil cmdUtil.c SendUdp.c)
 
 if (ENABLE_DATA_DICTIONARY)
   target_link_libraries(cmdUtil cfe_mission_dictionary msglib_full)

Subsystems/cmdUtil/Makefile

@@ -1,3 +1,3 @@
 all::
-	gcc -o cmdUtil sendUdp.c cmdUtil.c
+	gcc -o cmdUtil SendUdp.c cmdUtil.c
 

Subsystems/cmdUtil/sendUdp.c → Subsystems/cmdUtil/SendUdp.c

@@ -20,6 +20,8 @@
 **      Udp packet send routine
 */
 
+#include "SendUdp.h"
+
 #ifdef WIN32
     #pragma warning (disable:4786)
     #include <winsock2.h>
@@ -35,6 +37,7 @@
     #include <ctype.h>
     #include <stdio.h>
     #include <string.h>
+    #include <stdlib.h>
     #define SOCKET int
     #define closesocket(fd) close(fd)
 #endif
@@ -45,11 +48,12 @@
 int SendUdp(char *hostname, char *portNum, char *packetData, int packetSize) {
     SOCKET              sd;
     int                 rc;
+    int                 port;
+    int                 errcode;
     unsigned int        i;
     struct sockaddr_in  cliAddr;
-    struct sockaddr_in  remoteServAddr;
-    struct hostent     *hostID;
-    int                 port;
+    struct addrinfo     hints;
+    struct addrinfo     *result;
 
     #ifdef WIN32
         WSADATA  wsaData;
@@ -59,39 +63,38 @@ int SendUdp(char *hostname, char *portNum, char *packetData, int packetSize) {
     if (hostname == NULL) {
         return -1;
     }
-
+	
     /*
-    ** get server IP address (no check if input is IP address or DNS name
+    ** Check port
     */
-    hostID = gethostbyname(hostname);
-    if (hostID == NULL) {
+    port = atoi(portNum);
+    if (port == -1) {
         return -2;
     }
-
+    
     /*
-    ** Check port
+    **Criteria for selecting socket address 
     */
-    port = atoi(portNum);
-    if (port == -1) {
+    memset(&hints, 0, sizeof(struct addrinfo));
+    hints.ai_family   = AF_INET; /*IPv4*/
+    hints.ai_socktype = SOCK_DGRAM; /*Datagram socket*/
+    hints.ai_flags    = AI_CANONNAME; 
+    hints.ai_protocol = 0; /*Any Protocol*/
+
+    errcode = getaddrinfo(hostname, portNum, &hints, &result);
+    if (errcode != 0) {
         return -3;
     }
 
-    printf("sending data to '%s' (IP : %s); port %d\n", hostID->h_name,
-        inet_ntoa(*(struct in_addr *)hostID->h_addr_list[0]), port);
-
-    /*
-    ** Setup socket structures
-    */
-    remoteServAddr.sin_family = hostID->h_addrtype;
-    memcpy((char *) &remoteServAddr.sin_addr.s_addr,
-        hostID->h_addr_list[0], hostID->h_length);
-    remoteServAddr.sin_port = htons(port);
+    printf("sending data to '%s' (IP : %s); port %d\n", result->ai_canonname,
+        inet_ntoa(((struct sockaddr_in*)result->ai_addr)->sin_addr), port);
 
     /*
     ** Create Socket
     */
-    sd = socket(AF_INET,SOCK_DGRAM,0);
-    if (sd < 0) {
+    sd = socket(AF_INET, SOCK_DGRAM, 0);
+
+    if(sd < 0){
         return -4;
     }
 
@@ -121,15 +124,17 @@ int SendUdp(char *hostname, char *portNum, char *packetData, int packetSize) {
     /*
     ** send the event
     */
-    rc = sendto(sd, (char*)packetData, packetSize, 0,
-        (struct sockaddr*)&remoteServAddr,
-        sizeof(remoteServAddr));
+    rc = sendto(sd, (char*)packetData, packetSize, 0, 
+           result->ai_addr, result->ai_addrlen); 
+
 
     if (rc < 0) {
+        freeaddrinfo(result);
         closesocket(sd);
         return -6;
     }
 
+    freeaddrinfo(result);
     closesocket(sd);
     return 0;
 }

Subsystems/cmdUtil/cmdUtil.c

@@ -32,11 +32,7 @@
 #include "getopt.h"
 #include <string.h>
 #include <limits.h>
-
-/*
-** sendUdp prototype -- Used to send the completed command to a UDP network socket.
-*/
-int SendUdp(char *hostname, char *portNum, char *packetData, int packetSize);
+#include "SendUdp.h"
 
 /*
 ** Defines
@@ -236,7 +232,7 @@ void ProcessStringArgument(char *optarg, CommandData_t *CommandData) {
     stringLenString[stringIndex] = '\0';
     stringLength = strtol(stringLenString, NULL, 10);
     if (CommandData->Verbose) {
-        printf("String Length is %d.\n", stringLength);
+        printf("String Length is %ld.\n", stringLength);
     }
 
     if (stringLength > 128) {
@@ -387,7 +383,6 @@ int main(int argc, char *argv[]) {
     int   opt = 0;
     int   longIndex = 0;
     int   retStat;
-    long  tempLong;
     short tempShort;
 
     /*