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

Merge pull request #20 from jwatkins42/master

Browse Source 
Removed duplicate socket initialization and clarified socket timeout.
This commit is contained in:
Christopher Teubert
2014-12-03 10:24:56 -08:00
parent a5c75f4a64 d70148b98d
commit 044b613e32
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
C/src/xplaneConnect.c
View File

@@ -140,8 +140,6 @@ struct xpcSocket openUDP(unsigned short port_number, const char *xpIP, unsigned
} }
#elif (__APPLE__ || __linux) #elif (__APPLE__ || __linux)
// Create a SOCKET // Create a SOCKET
theSocket.sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if ((theSocket.sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) if ((theSocket.sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1)
{ {
perror((char*) "ERROR: openUDP- "); perror((char*) "ERROR: openUDP- ");
@@ -161,10 +159,10 @@ struct xpcSocket openUDP(unsigned short port_number, const char *xpIP, unsigned
#endif #endif
//Set Timout //Set Timout
int msTimeOut = 500; int usTimeOut = 500;
#ifdef _WIN32 #ifdef _WIN32
DWORD msTimeOutWin = 1; DWORD msTimeOutWin = 1; // Minimum socket timeout in Windows is 1ms
setsockopt(theSocket.sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&msTimeOutWin, sizeof(msTimeOutWin)); setsockopt(theSocket.sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&msTimeOutWin, sizeof(msTimeOutWin));
#else #else
tv.tv_sec = 0; /* Sec Timeout */ tv.tv_sec = 0; /* Sec Timeout */