* Minor improvements to the handling of landing gear by the SetGear and HandlePOSI functions * sendPOSI command change (double for lat/lon/h) (#111) * Updated POSI to use doubles for lat/lon/alt, as step size for floats was unacceptably large at high longitudes. * Updated Java library for MATLAB, updated Java project, and updated Windows plugin binaries * Rolled back Java version to 1.7 for MATLAB compatibility * Update MessageHandlers.cpp * Update DataManager.cpp * Added pause functionality for individual a/c Adds new cases such that: 0: Unpauses all a/c 1: Pauses all a/c 2: Switches case for all a/c 100:119: Pauses a/c 0:19 200:219: Unpauses a/c 0:19 Updates log messages. Keeps the 0,1,2 arguments as they previously were. * Finished individual pause functionality * Update DataManager.cpp * Updated flags to allow for individual pause commands * Individual pause command documentation * Updated flags to allow for individual pause commands * Adding individual pause to documentation * Updated flags to allow for individual pause commands * Requested changes, cleaning * Update CMakeLists.txt Include "-fno-stack-protector" for linking and compiling for systems that do not have this have this flag as a default. * Enabling AI after setting position (#118) Previously, the code enabled the AI before setting the position of a/c, which negated its purpose. * Updated XPlane SDK to version 2.1.3 * Resolve function ambiguity for std::abs on mac Fixes #126 * Update copyright notice * Update Windows binaries * Update Linux binaries * Update version numbers * fix osx abs ambiguity (#142) * fix indexing error (#143) * Runway camera location control (#144) * update ignore * basics working * set cam pos remotely * log cam position * keep default behaviour, if short view message is received Compatibility with existing software * all to tabs * rename variable * option to use camera direction fields * Added UDP multicast for plugin discovery (#153) * Added Timer * Added UDPSocket::GetAddr * Added MessageHandlers::SendBeacon() * PoC of starting a timer on PluginEnable * C++11 * Added Timer to xcode project * C++11 in cmake * added Timer to cmake * use function pointer in Timer * moved Timer to namespace + wait for thread to join when stopping the timer * Windows: changed uint to unisgned short * Windows: Added Timer.h/cpp to project * GetAddr static * Send xplane and plugin version with BECN * SendBeacon with params * fixed file copyrights * Include functional to fix Linux compile error * review fixes * Send plugin receive port in BECN * review fixes * Fixed tabs vs spaces indentations (#157) * Java client BECN implementation (#155) * Added MS Azure Dev Ops CI integration (#162) * Do not build for i386 on macOS Use ARCHS_STANDARD to avoid the error “The i386 architecture is deprecated. You should update your ARCHS build setting to remove the i386 architecture.” * Fixed missing include The Visual Studio solution was not compiling * Fixed isnan ambigious refernce Ambigious reference when compiling on travis https://stackoverflow.com/questions/33770374/why-is-isnan-ambiguous-and-how-to-avoid-it * Set MSVC warning level to 3 Too many warnings were generated when building a Release build making Travis job to fail because of too much output * Use default toolset for Visual Studio AppVeyor recommends to set the default toolset * #include <cstdint> * Use MSVC ToolsVersion="14.0" # Conflicts: # xpcPlugin/xpcPlugin/xpcPlugin.vcxproj * Removed binaries from repository # Conflicts: # xpcPlugin/XPlaneConnect/64/win.xpl # xpcPlugin/XPlaneConnect/win.xpl * Added ms azure ci xcode linux linux + macos linux + macos removed branch filter win tests win tests Test all platfroms artifacts tests * output all binaries to ‘XPlaneConnect’ All platforms produce a binary in xpcPlugin/XPlaneConnect/ xpcPlugin/XPlaneConnect/64/ * Added ms azure GH deploy deploy stage GH release test trigger tags * Clean up yml file - Added variables - Added job decriptions * Ignore script to ignore .exp files + fixed output path * Renamed ms azure GH connection * Update service connection for azure pipeline * Added Python3 compatible xpc client. (#156) * Update Azure Pipelines service connection
183 lines
4.9 KiB
C++
183 lines
4.9 KiB
C++
// Copyright (c) 2013-2018 United States Government as represented by the Administrator of the
|
|
// National Aeronautics and Space Administration. All Rights Reserved.
|
|
#include "Log.h"
|
|
#include "UDPSocket.h"
|
|
|
|
#include <cstring>
|
|
#include <cstdio>
|
|
|
|
namespace XPC
|
|
{
|
|
const static std::string tag = "SOCK";
|
|
|
|
UDPSocket::UDPSocket(unsigned short recvPort)
|
|
{
|
|
Log::FormatLine(LOG_TRACE, tag, "Opening socket (port:%d)", recvPort);
|
|
// Setup Port
|
|
struct sockaddr_in localAddr;
|
|
localAddr.sin_family = AF_INET;
|
|
localAddr.sin_addr.s_addr = INADDR_ANY;
|
|
localAddr.sin_port = htons(recvPort);
|
|
|
|
// Create and bind the socket
|
|
#ifdef _WIN32
|
|
WSADATA wsa;
|
|
int startResult = WSAStartup(MAKEWORD(2, 2), &wsa);
|
|
if (startResult != 0)
|
|
{
|
|
Log::FormatLine(LOG_FATAL, tag, "ERROR: WSAStartup failed with error code %i.", startResult);
|
|
this->sock = ~0;
|
|
return;
|
|
}
|
|
if ((this->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == INVALID_SOCKET)
|
|
{
|
|
int err = WSAGetLastError();
|
|
Log::FormatLine(LOG_FATAL, tag, "ERROR: Failed to open socket. (Error code %i)", err);
|
|
return;
|
|
}
|
|
#elif (__APPLE__ || __linux)
|
|
if ((this->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1)
|
|
{
|
|
Log::WriteLine(LOG_FATAL, tag, "ERROR: Failed to open socket");
|
|
return;
|
|
}
|
|
int optval = 1;
|
|
setsockopt(this->sock, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval));
|
|
setsockopt(this->sock, SOL_SOCKET, SO_REUSEPORT, &optval, sizeof(optval));
|
|
#endif
|
|
if (bind(this->sock, (struct sockaddr*)&localAddr, sizeof(localAddr)) != 0)
|
|
{
|
|
#ifdef _WIN32
|
|
int err = WSAGetLastError();
|
|
Log::FormatLine(LOG_FATAL, tag, "ERROR: Failed to bind socket. (Error code %i)", err);
|
|
#else
|
|
Log::WriteLine(LOG_FATAL, tag, "ERROR: Failed to bind socket.");
|
|
#endif
|
|
return;
|
|
}
|
|
|
|
// Set Timout
|
|
int usTimeOut = 500;
|
|
|
|
#ifdef _WIN32
|
|
DWORD msTimeOutWin = 1; // Minimum socket timeout in Windows is 1ms
|
|
if(setsockopt(this->sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&msTimeOutWin, sizeof(msTimeOutWin)) != 0)
|
|
{
|
|
int err = WSAGetLastError();
|
|
Log::FormatLine(LOG_ERROR, tag, "ERROR: Failed to set timeout. (Error code %i)", err);
|
|
}
|
|
#else
|
|
struct timeval tv;
|
|
tv.tv_sec = 0;
|
|
tv.tv_usec = usTimeOut;
|
|
setsockopt(this->sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(struct timeval));
|
|
#endif
|
|
}
|
|
|
|
UDPSocket::~UDPSocket()
|
|
{
|
|
Log::FormatLine(LOG_TRACE, tag, "Closing socket (%d)", this->sock);
|
|
#ifdef _WIN32
|
|
closesocket(this->sock);
|
|
#elif (__APPLE__ || __linux)
|
|
close(this->sock);
|
|
#endif
|
|
}
|
|
|
|
int UDPSocket::Read(unsigned char* dst, int maxLen, sockaddr* recvAddr) const
|
|
{
|
|
socklen_t recvaddrlen = sizeof(*recvAddr);
|
|
int status = 0;
|
|
|
|
#ifdef _WIN32
|
|
// Windows readUDP needs the select command- minimum timeout is 1ms.
|
|
// Without this playback becomes choppy
|
|
|
|
// Definitions
|
|
FD_SET stReadFDS;
|
|
FD_SET stExceptFDS;
|
|
timeval tv;
|
|
|
|
// Setup for Select
|
|
FD_ZERO(&stReadFDS);
|
|
FD_SET(sock, &stReadFDS);
|
|
FD_ZERO(&stExceptFDS);
|
|
FD_SET(sock, &stExceptFDS);
|
|
tv.tv_sec = 0;
|
|
tv.tv_usec = 250;
|
|
|
|
// Select Command
|
|
int result = select(-1, &stReadFDS, (FD_SET *)0, &stExceptFDS, &tv);
|
|
if (result == SOCKET_ERROR)
|
|
{
|
|
int err = WSAGetLastError();
|
|
Log::FormatLine(LOG_ERROR, tag, "ERROR: Select failed. (Error code %i)", err);
|
|
}
|
|
if (result <= 0) // No Data or error
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
// If no error: Read Data
|
|
status = recvfrom(sock, (char*)dst, maxLen, 0, recvAddr, &recvaddrlen);
|
|
#else
|
|
// For apple or linux-just read - will timeout in 0.5 ms
|
|
status = (int)recvfrom(sock, dst, 5000, 0, recvAddr, &recvaddrlen);
|
|
#endif
|
|
return status;
|
|
}
|
|
|
|
void UDPSocket::SendTo(const unsigned char* buffer, std::size_t len, sockaddr* remote) const
|
|
{
|
|
if (sendto(sock, (char*)buffer, (int)len, 0, remote, sizeof(*remote)) < 0)
|
|
{
|
|
Log::FormatLine(LOG_ERROR, tag, "Send failed. (remote: %s)", GetHost(remote).c_str());
|
|
}
|
|
else
|
|
{
|
|
Log::FormatLine(LOG_INFO, tag, "Send succeeded. (remote: %s)", GetHost(remote).c_str());
|
|
}
|
|
}
|
|
|
|
sockaddr UDPSocket::GetAddr(std::string address, unsigned short port)
|
|
{
|
|
struct sockaddr_in addr;
|
|
memset(&addr, 0, sizeof(addr));
|
|
addr.sin_family = AF_INET;
|
|
addr.sin_addr.s_addr = inet_addr(address.c_str());
|
|
addr.sin_port = htons(port);
|
|
|
|
sockaddr* sa = reinterpret_cast<sockaddr*>(&addr);
|
|
return *sa;
|
|
}
|
|
|
|
std::string UDPSocket::GetHost(sockaddr* sa)
|
|
{
|
|
char ip[INET6_ADDRSTRLEN + 6] = { 0 };
|
|
switch (sa->sa_family)
|
|
{
|
|
case AF_INET:
|
|
{
|
|
sockaddr_in* sin = reinterpret_cast<sockaddr_in*>(sa);
|
|
inet_ntop(AF_INET, &sin->sin_addr, ip, INET6_ADDRSTRLEN);
|
|
int len = strnlen(ip, INET6_ADDRSTRLEN);
|
|
ip[len++] = ':';
|
|
std::sprintf(ip + len, "%u", ntohs((*sin).sin_port));
|
|
break;
|
|
}
|
|
case AF_INET6:
|
|
{
|
|
sockaddr_in6* sin = reinterpret_cast<sockaddr_in6*>(sa);
|
|
inet_ntop(AF_INET6, &sin->sin6_addr, ip, INET6_ADDRSTRLEN);
|
|
int len = strnlen(ip, INET6_ADDRSTRLEN);
|
|
ip[len++] = ':';
|
|
std::sprintf(ip + len, "%u", ntohs((*sin).sin6_port));
|
|
break;
|
|
}
|
|
default:
|
|
return "UNKNOWN";
|
|
}
|
|
return std::string(ip);
|
|
}
|
|
}
|