From cd5177f8b3338d676dbb6a17bacd4b1d799e231e Mon Sep 17 00:00:00 2001 From: avan989 Date: Wed, 4 Sep 2019 09:26:53 -0400 Subject: [PATCH 1/9] Fix #24, Use SendUdp prototype from header --- Subsystems/cmdUtil/CMakeLists.txt | 2 +- Subsystems/cmdUtil/Makefile | 2 +- Subsystems/cmdUtil/{sendUdp.c => SendUdp.c} | 2 ++ Subsystems/cmdUtil/{cmdUtil.h => SendUdp.h} | 0 Subsystems/cmdUtil/cmdUtil.c | 6 +----- 5 files changed, 5 insertions(+), 7 deletions(-) rename Subsystems/cmdUtil/{sendUdp.c => SendUdp.c} (99%) rename Subsystems/cmdUtil/{cmdUtil.h => SendUdp.h} (100%) diff --git a/Subsystems/cmdUtil/CMakeLists.txt b/Subsystems/cmdUtil/CMakeLists.txt index e151d17..43ebf09 100644 --- a/Subsystems/cmdUtil/CMakeLists.txt +++ b/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) diff --git a/Subsystems/cmdUtil/Makefile b/Subsystems/cmdUtil/Makefile index 42f2fd0..521f239 100644 --- a/Subsystems/cmdUtil/Makefile +++ b/Subsystems/cmdUtil/Makefile @@ -1,3 +1,3 @@ all:: - gcc -o cmdUtil sendUdp.c cmdUtil.c + gcc -o cmdUtil SendUdp.c cmdUtil.c diff --git a/Subsystems/cmdUtil/sendUdp.c b/Subsystems/cmdUtil/SendUdp.c similarity index 99% rename from Subsystems/cmdUtil/sendUdp.c rename to Subsystems/cmdUtil/SendUdp.c index d8f7500..874c18f 100644 --- a/Subsystems/cmdUtil/sendUdp.c +++ b/Subsystems/cmdUtil/SendUdp.c @@ -20,6 +20,8 @@ ** Udp packet send routine */ +#include "SendUdp.h" + #ifdef WIN32 #pragma warning (disable:4786) #include diff --git a/Subsystems/cmdUtil/cmdUtil.h b/Subsystems/cmdUtil/SendUdp.h similarity index 100% rename from Subsystems/cmdUtil/cmdUtil.h rename to Subsystems/cmdUtil/SendUdp.h diff --git a/Subsystems/cmdUtil/cmdUtil.c b/Subsystems/cmdUtil/cmdUtil.c index 7e3c88e..f0b1217 100644 --- a/Subsystems/cmdUtil/cmdUtil.c +++ b/Subsystems/cmdUtil/cmdUtil.c @@ -32,11 +32,7 @@ #include "getopt.h" #include #include - -/* -** 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 From 832747b8a0fba41f3e3f52c240e7652aa55f0e42 Mon Sep 17 00:00:00 2001 From: avan989 Date: Thu, 29 Aug 2019 09:32:45 -0400 Subject: [PATCH 2/9] Fix #4, Remove unused tempLong --- Subsystems/cmdUtil/cmdUtil.c | 1 - 1 file changed, 1 deletion(-) diff --git a/Subsystems/cmdUtil/cmdUtil.c b/Subsystems/cmdUtil/cmdUtil.c index f0b1217..b528228 100644 --- a/Subsystems/cmdUtil/cmdUtil.c +++ b/Subsystems/cmdUtil/cmdUtil.c @@ -383,7 +383,6 @@ int main(int argc, char *argv[]) { int opt = 0; int longIndex = 0; int retStat; - long tempLong; short tempShort; /* From 96a0bdeef2565d47d19b05efd841184d2f1bf9bc Mon Sep 17 00:00:00 2001 From: avan989 Date: Thu, 29 Aug 2019 10:22:09 -0400 Subject: [PATCH 3/9] Fix #12, Resolve build warnings --- Subsystems/cmdUtil/SendUdp.c | 1 + Subsystems/cmdUtil/cmdUtil.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Subsystems/cmdUtil/SendUdp.c b/Subsystems/cmdUtil/SendUdp.c index 874c18f..ea0a629 100644 --- a/Subsystems/cmdUtil/SendUdp.c +++ b/Subsystems/cmdUtil/SendUdp.c @@ -37,6 +37,7 @@ #include #include #include + #include #define SOCKET int #define closesocket(fd) close(fd) #endif diff --git a/Subsystems/cmdUtil/cmdUtil.c b/Subsystems/cmdUtil/cmdUtil.c index b528228..3ab4dfe 100644 --- a/Subsystems/cmdUtil/cmdUtil.c +++ b/Subsystems/cmdUtil/cmdUtil.c @@ -232,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) { From c9e68527ffb3a87de1f12d9e733836f82b127995 Mon Sep 17 00:00:00 2001 From: avan989 Date: Thu, 29 Aug 2019 08:12:15 -0400 Subject: [PATCH 4/9] Fix #6, Remove visual studio file --- Subsystems/cmdUtil/cmdUtil.vcproj | 148 ------------------------------ 1 file changed, 148 deletions(-) delete mode 100644 Subsystems/cmdUtil/cmdUtil.vcproj diff --git a/Subsystems/cmdUtil/cmdUtil.vcproj b/Subsystems/cmdUtil/cmdUtil.vcproj deleted file mode 100644 index 58d36ed..0000000 --- a/Subsystems/cmdUtil/cmdUtil.vcproj +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 2f33937d2fabd40613fd90645f658ca5930f575d Mon Sep 17 00:00:00 2001 From: avan989 Date: Thu, 29 Aug 2019 11:01:36 -0400 Subject: [PATCH 5/9] Fix #11, Remove unused gitopt_long.c --- Subsystems/cmdUtil/getopt_long.c | 548 ------------------------------- 1 file changed, 548 deletions(-) delete mode 100644 Subsystems/cmdUtil/getopt_long.c diff --git a/Subsystems/cmdUtil/getopt_long.c b/Subsystems/cmdUtil/getopt_long.c deleted file mode 100644 index f093caf..0000000 --- a/Subsystems/cmdUtil/getopt_long.c +++ /dev/null @@ -1,548 +0,0 @@ -/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */ -/* $FreeBSD: src/lib/libc/stdlib/getopt_long.c,v 1.2 2002/10/16 22:18:42 alfred Exp $ */ - -/*- - * Copyright (c) 2000 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Dieter Baron and Thomas Klausner. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - - -#include "getopt.h" -#include -#include - -#ifdef _WIN32 - -/* Windows needs warnx(). We change the definition though: - * 1. (another) global is defined, opterrmsg, which holds the error message - * 2. errors are always printed out on stderr w/o the program name - * Note that opterrmsg always gets set no matter what opterr is set to. The - * error message will not be printed if opterr is 0 as usual. - */ - -#include -#include - -extern char opterrmsg[128]; -char opterrmsg[128]; /* last error message is stored here */ - -static void warnx(int print_error, const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - if (fmt != NULL) - _vsnprintf(opterrmsg, 128, fmt, ap); - else - opterrmsg[0]='\0'; - va_end(ap); - if (print_error) { - fprintf(stderr, opterrmsg); - fprintf(stderr, "\n"); - } -} - -#endif /*_WIN32*/ - -/* not part of the original file */ -#ifndef _DIAGASSERT -#define _DIAGASSERT(X) -#endif - -#if HAVE_CONFIG_H && !HAVE_GETOPT_LONG && !HAVE_DECL_OPTIND -#define REPLACE_GETOPT -#endif - -#ifdef REPLACE_GETOPT -#ifdef __weak_alias -__weak_alias(getopt,_getopt) -#endif -int opterr = 1; /* if error message should be printed */ -int optind = 1; /* index into parent argv vector */ -int optopt = '?'; /* character checked for validity */ -int optreset; /* reset getopt */ -char *optarg; /* argument associated with option */ -#elif HAVE_CONFIG_H && !HAVE_DECL_OPTRESET -static int optreset; -#endif - -#ifdef __weak_alias -__weak_alias(getopt_long,_getopt_long) -#endif - -#if !HAVE_GETOPT_LONG -#define IGNORE_FIRST (*options == '-' || *options == '+') -#define PRINT_ERROR ((opterr) && ((*options != ':') \ - || (IGNORE_FIRST && options[1] != ':'))) -#define IS_POSIXLY_CORRECT (getenv("POSIXLY_CORRECT") != NULL) -#define PERMUTE (!IS_POSIXLY_CORRECT && !IGNORE_FIRST) -/* XXX: GNU ignores PC if *options == '-' */ -#define IN_ORDER (!IS_POSIXLY_CORRECT && *options == '-') - -/* return values */ -#define BADCH (int)'?' -#define BADARG ((IGNORE_FIRST && options[1] == ':') \ - || (*options == ':') ? (int)':' : (int)'?') -#define INORDER (int)1 - -#define EMSG "" - -static int getopt_internal(int, char * const *, const char *); -static int gcd(int, int); -static void permute_args(int, int, int, char * const *); - -static char *place = EMSG; /* option letter processing */ - -/* XXX: set optreset to 1 rather than these two */ -static int nonopt_start = -1; /* first non option argument (for permute) */ -static int nonopt_end = -1; /* first option after non options (for permute) */ - -/* Error messages */ -static const char recargchar[] = "option requires an argument -- %c"; -static const char recargstring[] = "option requires an argument -- %s"; -static const char ambig[] = "ambiguous option -- %.*s"; -static const char noarg[] = "option doesn't take an argument -- %.*s"; -static const char illoptchar[] = "unknown option -- %c"; -static const char illoptstring[] = "unknown option -- %s"; - - -/* - * Compute the greatest common divisor of a and b. - */ -static int -gcd(a, b) - int a; - int b; -{ - int c; - - c = a % b; - while (c != 0) { - a = b; - b = c; - c = a % b; - } - - return b; -} - -/* - * Exchange the block from nonopt_start to nonopt_end with the block - * from nonopt_end to opt_end (keeping the same order of arguments - * in each block). - */ -static void -permute_args(panonopt_start, panonopt_end, opt_end, nargv) - int panonopt_start; - int panonopt_end; - int opt_end; - char * const *nargv; -{ - int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos; - char *swap; - - _DIAGASSERT(nargv != NULL); - - /* - * compute lengths of blocks and number and size of cycles - */ - nnonopts = panonopt_end - panonopt_start; - nopts = opt_end - panonopt_end; - ncycle = gcd(nnonopts, nopts); - cyclelen = (opt_end - panonopt_start) / ncycle; - - for (i = 0; i < ncycle; i++) { - cstart = panonopt_end+i; - pos = cstart; - for (j = 0; j < cyclelen; j++) { - if (pos >= panonopt_end) - pos -= nnonopts; - else - pos += nopts; - swap = nargv[pos]; - /* LINTED const cast */ - ((char **) nargv)[pos] = nargv[cstart]; - /* LINTED const cast */ - ((char **)nargv)[cstart] = swap; - } - } -} - -/* - * getopt_internal -- - * Parse argc/argv argument vector. Called by user level routines. - * Returns -2 if -- is found (can be long option or end of options marker). - */ -static int -getopt_internal(nargc, nargv, options) - int nargc; - char * const *nargv; - const char *options; -{ - char *oli; /* option letter list index */ - int optchar; - - _DIAGASSERT(nargv != NULL); - _DIAGASSERT(options != NULL); - - optarg = NULL; - - /* - * XXX Some programs (like rsyncd) expect to be able to - * XXX re-initialize optind to 0 and have getopt_long(3) - * XXX properly function again. Work around this braindamage. - */ - if (optind == 0) - optind = 1; - - if (optreset) - nonopt_start = nonopt_end = -1; -start: - if (optreset || !*place) { /* update scanning pointer */ - optreset = 0; - if (optind >= nargc) { /* end of argument vector */ - place = EMSG; - if (nonopt_end != -1) { - /* do permutation, if we have to */ - permute_args(nonopt_start, nonopt_end, - optind, nargv); - optind -= nonopt_end - nonopt_start; - } - else if (nonopt_start != -1) { - /* - * If we skipped non-options, set optind - * to the first of them. - */ - optind = nonopt_start; - } - nonopt_start = nonopt_end = -1; - return -1; - } - if ((*(place = nargv[optind]) != '-') - || (place[1] == '\0')) { /* found non-option */ - place = EMSG; - if (IN_ORDER) { - /* - * GNU extension: - * return non-option as argument to option 1 - */ - optarg = nargv[optind++]; - return INORDER; - } - if (!PERMUTE) { - /* - * if no permutation wanted, stop parsing - * at first non-option - */ - return -1; - } - /* do permutation */ - if (nonopt_start == -1) - nonopt_start = optind; - else if (nonopt_end != -1) { - permute_args(nonopt_start, nonopt_end, - optind, nargv); - nonopt_start = optind - - (nonopt_end - nonopt_start); - nonopt_end = -1; - } - optind++; - /* process next argument */ - goto start; - } - if (nonopt_start != -1 && nonopt_end == -1) - nonopt_end = optind; - if (place[1] && *++place == '-') { /* found "--" */ - place++; - return -2; - } - } - if ((optchar = (int)*place++) == (int)':' || - (oli = strchr(options + (IGNORE_FIRST ? 1 : 0), optchar)) == NULL) { - /* option letter unknown or ':' */ - if (!*place) - ++optind; -#ifndef _WIN32 - if (PRINT_ERROR) - warnx(illoptchar, optchar); -#else - warnx(PRINT_ERROR, illoptchar, optchar); -#endif - optopt = optchar; - return BADCH; - } - if (optchar == 'W' && oli[1] == ';') { /* -W long-option */ - /* XXX: what if no long options provided (called by getopt)? */ - if (*place) - return -2; - - if (++optind >= nargc) { /* no arg */ - place = EMSG; -#ifndef _WIN32 - if (PRINT_ERROR) - warnx(recargchar, optchar); -#else - warnx(PRINT_ERROR, recargchar, optchar); -#endif - optopt = optchar; - return BADARG; - } else /* white space */ - place = nargv[optind]; - /* - * Handle -W arg the same as --arg (which causes getopt to - * stop parsing). - */ - return -2; - } - if (*++oli != ':') { /* doesn't take argument */ - if (!*place) - ++optind; - } else { /* takes (optional) argument */ - optarg = NULL; - if (*place) /* no white space */ - optarg = place; - /* XXX: disable test for :: if PC? (GNU doesn't) */ - else if (oli[1] != ':') { /* arg not optional */ - if (++optind >= nargc) { /* no arg */ - place = EMSG; -#ifndef _WIN32 - if (PRINT_ERROR) - warnx(recargchar, optchar); -#else - warnx(PRINT_ERROR, recargchar, optchar); -#endif - optopt = optchar; - return BADARG; - } else - optarg = nargv[optind]; - } - place = EMSG; - ++optind; - } - /* dump back option letter */ - return optchar; -} - -#ifdef REPLACE_GETOPT -/* - * getopt -- - * Parse argc/argv argument vector. - * - * [eventually this will replace the real getopt] - */ -int -getopt(nargc, nargv, options) - int nargc; - char * const *nargv; - const char *options; -{ - int retval; - - _DIAGASSERT(nargv != NULL); - _DIAGASSERT(options != NULL); - - if ((retval = getopt_internal(nargc, nargv, options)) == -2) { - ++optind; - /* - * We found an option (--), so if we skipped non-options, - * we have to permute. - */ - if (nonopt_end != -1) { - permute_args(nonopt_start, nonopt_end, optind, - nargv); - optind -= nonopt_end - nonopt_start; - } - nonopt_start = nonopt_end = -1; - retval = -1; - } - return retval; -} -#endif - -/* - * getopt_long -- - * Parse argc/argv argument vector. - */ -int -getopt_long(nargc, nargv, options, long_options, idx) - int nargc; - char * const *nargv; - const char *options; - const struct option *long_options; - int *idx; -{ - int retval; - - _DIAGASSERT(nargv != NULL); - _DIAGASSERT(options != NULL); - _DIAGASSERT(long_options != NULL); - /* idx may be NULL */ - - if ((retval = getopt_internal(nargc, nargv, options)) == -2) { - char *current_argv, *has_equal; - size_t current_argv_len; - int i, match; - - current_argv = place; - match = -1; - - optind++; - place = EMSG; - - if (*current_argv == '\0') { /* found "--" */ - /* - * We found an option (--), so if we skipped - * non-options, we have to permute. - */ - if (nonopt_end != -1) { - permute_args(nonopt_start, nonopt_end, - optind, nargv); - optind -= nonopt_end - nonopt_start; - } - nonopt_start = nonopt_end = -1; - return -1; - } - if ((has_equal = strchr(current_argv, '=')) != NULL) { - /* argument found (--option=arg) */ - current_argv_len = has_equal - current_argv; - has_equal++; - } else - current_argv_len = strlen(current_argv); - - for (i = 0; long_options[i].name; i++) { - /* find matching long option */ - if (strncmp(current_argv, long_options[i].name, - current_argv_len)) - continue; - - if (strlen(long_options[i].name) == - (unsigned)current_argv_len) { - /* exact match */ - match = i; - break; - } - if (match == -1) /* partial match */ - match = i; - else { - /* ambiguous abbreviation */ -#ifndef _WIN32 - if (PRINT_ERROR) - warnx(ambig, (int)current_argv_len, - current_argv); -#else - warnx(PRINT_ERROR, ambig, (int)current_argv_len, - current_argv); -#endif - optopt = 0; - return BADCH; - } - } - if (match != -1) { /* option found */ - if (long_options[match].has_arg == no_argument - && has_equal) { -#ifndef _WIN32 - if (PRINT_ERROR) - warnx(noarg, (int)current_argv_len, - current_argv); -#else - warnx(PRINT_ERROR, noarg, (int)current_argv_len, - current_argv); -#endif - /* - * XXX: GNU sets optopt to val regardless of - * flag - */ - if (long_options[match].flag == NULL) - optopt = long_options[match].val; - else - optopt = 0; - return BADARG; - } - if (long_options[match].has_arg == required_argument || - long_options[match].has_arg == optional_argument) { - if (has_equal) - optarg = has_equal; - else if (long_options[match].has_arg == - required_argument) { - /* - * optional argument doesn't use - * next nargv - */ - optarg = nargv[optind++]; - } - } - if ((long_options[match].has_arg == required_argument) - && (optarg == NULL)) { - /* - * Missing argument; leading ':' - * indicates no error should be generated - */ -#ifndef _WIN32 - if (PRINT_ERROR) - warnx(recargstring, current_argv); -#else - warnx(PRINT_ERROR, recargstring, current_argv); -#endif - /* - * XXX: GNU sets optopt to val regardless - * of flag - */ - if (long_options[match].flag == NULL) - optopt = long_options[match].val; - else - optopt = 0; - --optind; - return BADARG; - } - } else { /* unknown option */ -#ifndef _WIN32 - if (PRINT_ERROR) - warnx(illoptstring, current_argv); -#else - warnx(PRINT_ERROR, illoptstring, current_argv); -#endif - optopt = 0; - return BADCH; - } - if (long_options[match].flag) { - *long_options[match].flag = long_options[match].val; - retval = 0; - } else - retval = long_options[match].val; - if (idx) - *idx = match; - } - return retval; -} -#endif /* !GETOPT_LONG */ - From fac2dc571f84a93eb9ca4889d80f498449208f31 Mon Sep 17 00:00:00 2001 From: avan989 Date: Wed, 28 Aug 2019 15:43:17 -0400 Subject: [PATCH 6/9] Fix #5, Replace gethostbyname use --- Subsystems/cmdUtil/SendUdp.c | 54 +++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/Subsystems/cmdUtil/SendUdp.c b/Subsystems/cmdUtil/SendUdp.c index ea0a629..9626651 100644 --- a/Subsystems/cmdUtil/SendUdp.c +++ b/Subsystems/cmdUtil/SendUdp.c @@ -48,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; @@ -62,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; } @@ -124,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; } From 2f1018795bbdb30cc9aff5a25f518afc4f46d0f5 Mon Sep 17 00:00:00 2001 From: avan989 Date: Mon, 26 Aug 2019 15:51:02 -0400 Subject: [PATCH 7/9] Fix #7, Make scripts executable --- Subsystems/cmdUtil/es-delete-app.sh | 0 Subsystems/cmdUtil/to-enable-tlm.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Subsystems/cmdUtil/es-delete-app.sh mode change 100644 => 100755 Subsystems/cmdUtil/to-enable-tlm.sh diff --git a/Subsystems/cmdUtil/es-delete-app.sh b/Subsystems/cmdUtil/es-delete-app.sh old mode 100644 new mode 100755 diff --git a/Subsystems/cmdUtil/to-enable-tlm.sh b/Subsystems/cmdUtil/to-enable-tlm.sh old mode 100644 new mode 100755 From a4ef7c6ce20fad832bbf3882be2c053089505923 Mon Sep 17 00:00:00 2001 From: Jake Hageman Date: Mon, 1 Jul 2019 16:32:16 -0400 Subject: [PATCH 8/9] Fix #1, Gitignore *.pyc and cmdUtil --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..34bf494 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.pyc +cmdUtil From f8c2fc7fa9122ebe582c593fb700d3e27e81b2ab Mon Sep 17 00:00:00 2001 From: Declan Sullivan Date: Thu, 1 Aug 2019 17:52:07 -0700 Subject: [PATCH 9/9] Fix #14, Replace non-ascii characters --- Guide-GroundSystem.txt | 8 ++++---- Subsystems/Commands-Telemetry.txt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Guide-GroundSystem.txt b/Guide-GroundSystem.txt index 03328bc..860f49d 100644 --- a/Guide-GroundSystem.txt +++ b/Guide-GroundSystem.txt @@ -10,7 +10,7 @@ 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. @@ -18,9 +18,9 @@ Future enhancements: 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: diff --git a/Subsystems/Commands-Telemetry.txt b/Subsystems/Commands-Telemetry.txt index a1e8c53..50faca2 100644 --- a/Subsystems/Commands-Telemetry.txt +++ b/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"