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

Fixed type errors

Browse Source 
- Some instances of stdint types were reintroduced by a merge conflicgt. They have now been converted back to language types.
This commit is contained in:
Jason Watkins
2015-04-23 14:52:38 -07:00
parent 7da82f40dc
commit 1950685675
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xpcPlugin/MessageHandlers.cpp
View File

@@ -119,7 +119,7 @@ namespace XPC
const unsigned char* buffer = msg.GetBuffer(); const unsigned char* buffer = msg.GetBuffer();
// Store new port // Store new port
std::uint16_t port = *((std::uint16_t*)(buffer + 5)); unsigned short port = *((unsigned short*)(buffer + 5));
sockaddr* sa = &connection.addr; sockaddr* sa = &connection.addr;
switch (sa->sa_family) switch (sa->sa_family)
{ {
@@ -604,7 +604,7 @@ namespace XPC
loopback.sin_family = AF_INET; loopback.sin_family = AF_INET;
loopback.sin_addr.s_addr = htonl(INADDR_LOOPBACK); loopback.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
loopback.sin_port = htons(49000); loopback.sin_port = htons(49000);
sock->SendTo((std::uint8_t*)msg.GetBuffer(), msg.GetSize(), (sockaddr*)&loopback); sock->SendTo(msg.GetBuffer(), msg.GetSize(), (sockaddr*)&loopback);
} }
void MessageHandlers::HandleUnknown(Message& msg) void MessageHandlers::HandleUnknown(Message& msg)

3
xpcPlugin/UDPSocket.cpp
View File

@@ -135,9 +135,8 @@ namespace XPC
return status; return status;
} }
void UDPSocket::SendTo(std::uint8_t* buffer, std::size_t len, sockaddr* remote) void UDPSocket::SendTo(const unsigned char* buffer, std::size_t len, sockaddr* remote)
{ {
buffer[4] = (std::uint8_t)len;
if (sendto(sock, (char*)buffer, (int)len, 0, remote, sizeof(*remote)) < 0) if (sendto(sock, (char*)buffer, (int)len, 0, remote, sizeof(*remote)) < 0)
{ {
#if LOG_VERBOSITY > 0 #if LOG_VERBOSITY > 0

2
xpcPlugin/UDPSocket.h
View File

@@ -55,7 +55,7 @@ namespace XPC
/// \param data The data to be sent. /// \param data The data to be sent.
/// \param len The number of bytes to send. /// \param len The number of bytes to send.
/// \param remote The destination socket. /// \param remote The destination socket.
void SendTo(std::uint8_t* buffer, std::size_t len, sockaddr* remote); void SendTo(const unsigned char* buffer, std::size_t len, sockaddr* remote);
/// Gets a string containing the IP address and port contained in the given sockaddr. /// Gets a string containing the IP address and port contained in the given sockaddr.
/// ///