FlightSim-Streaming/XPlaneConnectCSP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed types from fixed width types in stdint to language primitive types guaranteed to be at least as big.

Browse Source
This commit is contained in:
Jason Watkins
2015-04-16 10:13:18 -07:00
parent 4fdc6939c8
commit 1a3f658774
8 changed files with 72 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xpcPlugin/UDPSocket.cpp
View File

@@ -5,7 +5,7 @@
namespace XPC
{
UDPSocket::UDPSocket(std::uint16_t recvPort)
UDPSocket::UDPSocket(unsigned short recvPort)
{
#if LOG_VERBOSITY > 1
Log::FormatLine("[SOCK] Opening socket (port:%d)", recvPort);
@@ -86,7 +86,7 @@ namespace XPC
#endif
}
int UDPSocket::Read(std::uint8_t* dst, int maxLen, sockaddr* recvAddr)
int UDPSocket::Read(unsigned char* dst, int maxLen, sockaddr* recvAddr)
{
socklen_t recvaddrlen = sizeof(*recvAddr);
int status = 0;
@@ -132,7 +132,7 @@ namespace XPC
}
// TODO: Add IPV6 support
void UDPSocket::SendTo(std::uint8_t* buffer, std::size_t len, std::string remoteHost, std::uint16_t remotePort)
void UDPSocket::SendTo(unsigned char* buffer, std::size_t len, std::string remoteHost, unsigned short remotePort)
{
#if LOG_VERBOSITY > 4
Log::FormatLine("[SOCK] Sending message to %s:%u (length=%u)", remoteHost.c_str(), remotePort, len);
@@ -141,12 +141,12 @@ namespace XPC
{
remoteHost = "127.0.0.1";
}
std::uint32_t ip;
unsigned long ip;
inet_pton(AF_INET, remoteHost.c_str(), &ip);
SendTo(buffer, len, ip, remotePort);
}
void UDPSocket::SendTo(std::uint8_t* buffer, std::size_t len, std::uint32_t remoteIP, std::uint16_t remotePort)
void UDPSocket::SendTo(unsigned char* buffer, std::size_t len, unsigned long remoteIP, unsigned short remotePort)
{
struct sockaddr_in remoteAddr;
remoteAddr.sin_family = AF_INET;
@@ -160,7 +160,7 @@ namespace XPC
#endif
setsockopt(sock, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on));
buffer[4] = (std::uint8_t)len;
buffer[4] = (unsigned char)len;
if (sendto(sock, (char*)buffer, (int)len, 0, (const struct sockaddr *) &remoteAddr, sizeof(remoteAddr)) < 0)
{
#if LOG_VERBOSITY > 0