Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cFS Header Version 2 (includes CCSDS Extended header) support and major update #92

Merged
merged 6 commits into from
Jun 2, 2020
Merged

cFS Header Version 2 (includes CCSDS Extended header) support and major update #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c14375
Merge pull request #90 from nasa/integration-candidate
astrogeco May 22, 2020
3de6e98
Fix #55, Apply standard code style
skliper May 21, 2020
dae41fa
Fix #43, Resolve LGTM issues
skliper May 21, 2020
3e62ff8
Fix #2, #3, #48, #80, General Upgrade
skliper May 23, 2020
22d5bc9
Fix #80, Removed unused structure fields
skliper May 27, 2020
eb15866
Fix #80, Checksum now matches cFS
skliper May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Subsystems/cmdUtil/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

111 changes: 59 additions & 52 deletions Subsystems/cmdUtil/SendUdp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has this been built on WIN32 to ensure that these pragma changes still work with the spacing changed? Sometimes these can be picky.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope. I'm actually inclined to remove the special WIN32 logic. We don't test it and nothing else does special handling to support it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although I am curious what works and doesn't in WSL... but that's a different issue.

#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("");
}
}
Expand All @@ -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;
Expand Down
6 changes: 5 additions & 1 deletion Subsystems/cmdUtil/SendUdp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
Loading