Merge pull request #101 from nasa/integration-candidate

Integration Candidate: 2020-05-27
nasa · Jun 10, 2020 · 52f706b · 52f706b
2 parents 3263506 + 78c5766
commit 52f706b
Show file tree

Hide file tree

Showing 9 changed files with 977 additions and 515 deletions.
diff --git a/Guide-GroundSystem.md b/Guide-GroundSystem.md
@@ -1,4 +1,4 @@
-# cFS Ground System Version 2.1.10
+# cFS Ground System Version 2.1.11
 
 ## cFS Ground System Info
 

diff --git a/Guide-GroundSystem.txt b/Guide-GroundSystem.txt
@@ -1,4 +1,4 @@
-cFS Ground System Version 2.1.10
+cFS Ground System Version 2.1.11
 
 cFS Ground System Info:
 

diff --git a/README.md b/README.md
@@ -8,6 +8,11 @@ See [Guide-GroundSystem.md](https://github.com/nasa/cFS-GroundSystem/blob/master
 
 ## Version History
 
+### Development Build: 2.1.11
+
+- Default behavior is the same except adds checksum and doesn't actually require fields. Adds all the packet fields, overrides, more supported data types, etc.
+- See <https://github.com/nasa/cFS-GroundSystem/pull/101>
+
 ### Development Build: 2.1.10
 
 - Change documentation for table loading guide to markdown

diff --git a/Subsystems/cmdUtil/Makefile b/Subsystems/cmdUtil/Makefile
@@ -1,3 +1,9 @@
-all::
+all:
 	gcc -o cmdUtil SendUdp.c cmdUtil.c
 
+debug:
+	gcc -o cmdUtil -DDEBUG -g SendUdp.c cmdUtil.c
+
+thirtytwo:
+	gcc -o cmdUtil -DDEBUG -g -m32 SendUdp.c cmdUtil.c
+
diff --git a/Subsystems/cmdUtil/SendUdp.c b/Subsystems/cmdUtil/SendUdp.c
@@ -23,99 +23,107 @@
 #include "SendUdp.h"
 
 #ifdef WIN32
-    #pragma warning (disable:4786)
-    #include <winsock2.h>
-    #include <ws2tcpip.h>
-    #include <windows.h>
-    typedef int socklen_t;
+#pragma warning(disable : 4786)
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
+typedef int socklen_t;
 #else
-    #include <sys/types.h>
-    #include <sys/socket.h>
-    #include <arpa/inet.h>
-    #include <netdb.h>
-    #include <unistd.h>
-    #include <ctype.h>
-    #include <stdio.h>
-    #include <string.h>
-    #include <stdlib.h>
-    #define SOCKET int
-    #define closesocket(fd) close(fd)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#define SOCKET          int
+#define closesocket(fd) close(fd)
 #endif
 
 /*
 ** SendUdp
 */
-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 addrinfo     hints;
-    struct addrinfo     *result;
-
-    #ifdef WIN32
-        WSADATA  wsaData;
-        WSAStartup(WINSOCK_VERSION, &wsaData);
-    #endif
-
-    if (hostname == NULL) {
+int SendUdp(char *hostname, char *portNum, unsigned char *packetData, int packetSize)
+{
+    SOCKET             sd;
+    int                rc;
+    int                port;
+    int                errcode;
+    unsigned int       i;
+    struct sockaddr_in cliAddr;
+    struct addrinfo    hints;
+    struct addrinfo *  result;
+
+#ifdef WIN32
+    WSADATA wsaData;
+    WSAStartup(WINSOCK_VERSION, &wsaData);
+#endif
+
+    if (hostname == NULL)
+    {
         return -1;
     }
-	
+
     /*
     ** Check port
     */
     port = atoi(portNum);
-    if (port == -1) {
+    if (port == -1)
+    {
         return -2;
     }
-    
+
     /*
-    **Criteria for selecting socket address 
+    **Criteria for selecting socket address
     */
     memset(&hints, 0, sizeof(struct addrinfo));
-    hints.ai_family   = AF_INET; /*IPv4*/
+    hints.ai_family   = AF_INET;    /*IPv4*/
     hints.ai_socktype = SOCK_DGRAM; /*Datagram socket*/
-    hints.ai_flags    = AI_CANONNAME; 
+    hints.ai_flags    = AI_CANONNAME;
     hints.ai_protocol = 0; /*Any Protocol*/
-	
+
     errcode = getaddrinfo(hostname, portNum, &hints, &result);
-    if (errcode != 0) {
+    if (errcode != 0)
+    {
         return -3;
     }
 
     printf("sending data to '%s' (IP : %s); port %d\n", result->ai_canonname,
-        inet_ntoa(((struct sockaddr_in*)result->ai_addr)->sin_addr), port);
+           inet_ntoa(((struct sockaddr_in *)result->ai_addr)->sin_addr), port);
 
     /*
     ** Create Socket
     */
     sd = socket(AF_INET, SOCK_DGRAM, 0);
 
-    if(sd < 0){
+    if (sd < 0)
+    {
         return -4;
     }
 
     /*
     ** bind any port
     */
-    cliAddr.sin_family = AF_INET;
+    cliAddr.sin_family      = AF_INET;
     cliAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-    cliAddr.sin_port = htons(0);
+    cliAddr.sin_port        = htons(0);
 
-    rc = bind(sd, (struct sockaddr *) &cliAddr, sizeof(cliAddr));
-    if (rc < 0) {
+    rc = bind(sd, (struct sockaddr *)&cliAddr, sizeof(cliAddr));
+    if (rc < 0)
+    {
         printf("%s: cannot bind port\n", portNum);
         return -5;
     }
 
     printf("Data to send:\n");
     i = 0;
-    while (i < packetSize) {
+    while (i < packetSize)
+    {
         printf("0x%02X ", packetData[i] & 0xFF);
-        if (++i % 8 == 0) {
+        if (++i % 8 == 0)
+        {
             puts("");
         }
     }
@@ -124,11 +132,10 @@ int SendUdp(char *hostname, char *portNum, char *packetData, int packetSize) {
     /*
     ** send the event
     */
-    rc = sendto(sd, (char*)packetData, packetSize, 0, 
-           result->ai_addr, result->ai_addrlen); 
-
+    rc = sendto(sd, (char *)packetData, packetSize, 0, result->ai_addr, result->ai_addrlen);
 
-    if (rc < 0) {
+    if (rc < 0)
+    {
         freeaddrinfo(result);
         closesocket(sd);
         return -6;

diff --git a/Subsystems/cmdUtil/SendUdp.h b/Subsystems/cmdUtil/SendUdp.h
@@ -17,5 +17,9 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 */
-int SendUdp(char *hostname, char *portNum, char *packetData, int packetSize);
+#ifndef _sendudp_
+#define _sendudp_
 
+int SendUdp(char *hostname, char *portNum, unsigned char *packetData, int packetSize);
+
+#endif /* _sendudp_ */