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

C client API tweaks

Browse Source 
- Swaped names of openUDP and aopenUDP.
 - openUDP is now the "automatic" version, requiring only the X-Plane IP address.
 - aopenUDP is now the "advanced" version, requiring both the X-Plane port and a client port.
 - Added support for passing NULL to sendTEXT.
This commit is contained in:
Jason Watkins
2015-04-29 12:11:17 -07:00
parent 1765d0a3c4
commit 54368bb65a
3 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
C/src/xplaneConnect.c
View File

@@ -66,12 +66,12 @@ void printError(char *functionName, char *format, ...)
/*****************************************************************************/ /*****************************************************************************/
/**** Low Level UDP functions ****/ /**** Low Level UDP functions ****/
/*****************************************************************************/ /*****************************************************************************/
XPCSocket aopenUDP(const char *xpIP, unsigned short xpPort) XPCSocket openUDP(const char *xpIP)
{ {
return openUDP(xpIP, xpPort, 0); return aopenUDP(xpIP, 49009, 0);
} }
XPCSocket openUDP(const char *xpIP, unsigned short xpPort, unsigned short port) XPCSocket aopenUDP(const char *xpIP, unsigned short xpPort, unsigned short port)
{ {
XPCSocket sock; XPCSocket sock;
@@ -432,7 +432,7 @@ int getDREFResponse(XPCSocket sock, float* values[], unsigned char count, int si
// Read data. Try 40 times to read, then give up. // Read data. Try 40 times to read, then give up.
// TODO: Why not just set the timeout to 40ms? // TODO: Why not just set the timeout to 40ms?
int result; int result;
for (int i = 0; i < 40; ++i) for (int i = 0; i < 512; ++i)
{ {
result = readUDP(sock, buffer, 65536); result = readUDP(sock, buffer, 65536);
if (result > 0) if (result > 0)
@@ -613,6 +613,10 @@ int sendCTRL(XPCSocket sock, float values[], int size, char ac)
/*****************************************************************************/ /*****************************************************************************/
int sendTEXT(XPCSocket sock, char* msg, int x, int y) int sendTEXT(XPCSocket sock, char* msg, int x, int y)
{ {
if (msg == NULL)
{
msg = "";
}
size_t msgLen = strnlen(msg, 255); size_t msgLen = strnlen(msg, 255);
// Input Validation // Input Validation
if (x < -1) if (x < -1)

5
C/src/xplaneConnect.h
View File

@@ -67,9 +67,8 @@ typedef enum
/// Opens a new connection to XPC on an OS chosen port. /// Opens a new connection to XPC on an OS chosen port.
/// ///
/// \param xpIP A string representing the IP address of the host running X-Plane. /// \param xpIP A string representing the IP address of the host running X-Plane.
/// \param xpPort The port of the X-Plane Connect plugin is listening on. Usually 49009.
/// \returns An XPCSocket struct representing the newly created connection. /// \returns An XPCSocket struct representing the newly created connection.
XPCSocket aopenUDP(const char *xpIP, unsigned short xpPort); XPCSocket openUDP(const char *xpIP);
/// Opens a new connection to XPC on the specified port. /// Opens a new connection to XPC on the specified port.
/// ///
@@ -77,7 +76,7 @@ XPCSocket aopenUDP(const char *xpIP, unsigned short xpPort);
/// \param xpPort The port of the X-Plane Connect plugin is listening on. Usually 49009. /// \param xpPort The port of the X-Plane Connect plugin is listening on. Usually 49009.
/// \param port The local port to use when sending and receiving data from XPC. /// \param port The local port to use when sending and receiving data from XPC.
/// \returns An XPCSocket struct representing the newly created connection. /// \returns An XPCSocket struct representing the newly created connection.
XPCSocket openUDP(const char *xpIP, unsigned short xpPort, unsigned short port); XPCSocket aopenUDP(const char *xpIP, unsigned short xpPort, unsigned short port);
/// Closes the specified connection and releases resources associated with it. /// Closes the specified connection and releases resources associated with it.
/// ///

45
TestScripts/C Tests/main.c
View File

@@ -34,7 +34,7 @@ void runTest(int (*test)(), char* name)
int openTest() // openUDP Test int openTest() // openUDP Test
{ {
XPCSocket sock = openUDP("localhost", 49009, 49062); XPCSocket sock = openUDP("localhost");
int result = strncmp(sock.xpIP, "127.0.0.1", 16); int result = strncmp(sock.xpIP, "127.0.0.1", 16);
closeUDP(sock); closeUDP(sock);
return result; return result;
@@ -42,9 +42,9 @@ int openTest() // openUDP Test
int closeTest() // closeUDP test int closeTest() // closeUDP test
{ {
XPCSocket sendPort = openUDP("127.0.0.1", 49009, 49063); XPCSocket sendPort = aopenUDP("127.0.0.1", 49009, 49063);
closeUDP(sendPort); closeUDP(sendPort);
sendPort = openUDP("127.0.0.1", 49009, 49063); sendPort = aopenUDP("127.0.0.1", 49009, 49063);
closeUDP(sendPort); closeUDP(sendPort);
return 0; return 0;
} }
@@ -52,7 +52,7 @@ int closeTest() // closeUDP test
int sendTEXTTest() int sendTEXTTest()
{ {
// Setup // Setup
XPCSocket sendPort = openUDP("127.0.0.1", 49009, 49064); XPCSocket sendPort = openUDP("127.0.0.1");
int x = 100; int x = 100;
int y = 700; int y = 700;
char* msg = "This is an X-Plane Connect test message.\nThis should be a new line.\r\nThat will be parsed as two line breaks."; char* msg = "This is an X-Plane Connect test message.\nThis should be a new line.\r\nThat will be parsed as two line breaks.";
@@ -88,7 +88,7 @@ int getDREFTest() // Request DREF Test (Required for next tests)
}; };
float* data[GETD_COUNT]; float* data[GETD_COUNT];
int sizes[GETD_COUNT]; int sizes[GETD_COUNT];
XPCSocket sock = openUDP("127.0.0.1", 49009, 49064); XPCSocket sock = openUDP("127.0.0.1");
// Setup // Setup
for (int i = 0; i < GETD_COUNT; ++i) for (int i = 0; i < GETD_COUNT; ++i)
@@ -158,7 +158,7 @@ int sendDREFTest() // sendDREF test
}; };
float* data[DREF_COUNT]; float* data[DREF_COUNT];
int sizes[DREF_COUNT]; int sizes[DREF_COUNT];
XPCSocket sock = aopenUDP("127.0.0.1", 49009); XPCSocket sock = openUDP("localhost");
float* values[DREF_COUNT]; float* values[DREF_COUNT];
XPCSocket sock = openUDP("localhost"); XPCSocket sock = openUDP("localhost");
@@ -263,7 +263,6 @@ int sendDREFTest() // sendDREF test
{ {
return -7; return -7;
} }
// TODO: Verify that read-only dref was not set.
return 0; return 0;
} }
@@ -278,7 +277,7 @@ int sendDATATest() // sendDATA test
float* data[100]; // array for result of getDREFs float* data[100]; // array for result of getDREFs
int sizes[100]; int sizes[100];
float DATA[4][9]; // Array for sendDATA float DATA[4][9]; // Array for sendDATA
XPCSocket sock = openUDP("127.0.0.1", 49009, 49066); XPCSocket sock = openUDP("127.0.0.1");
// Setup // Setup
for (int i = 0; i < 100; ++i) for (int i = 0; i < 100; ++i)
@@ -335,7 +334,7 @@ int psendCTRLTest() // sendCTRL test
float* data[100]; float* data[100];
int sizes[100]; int sizes[100];
float CTRL[6] = { 0.0F, 0.0F, 0.0F, 0.8F, 1.0F, 0.5F }; float CTRL[6] = { 0.0F, 0.0F, 0.0F, 0.8F, 1.0F, 0.5F };
XPCSocket sock = openUDP("127.0.0.1", 49009, 49066); XPCSocket sock = openUDP("127.0.0.1");
// Setup // Setup
for (int i = 0; i < 100; i++) for (int i = 0; i < 100; i++)
@@ -365,7 +364,7 @@ int psendCTRLTest() // sendCTRL test
} }
} }
sock = aopenUDP("localhost", 49009); sock = openUDP("localhost");
// Execute 2 // Execute 2
// Set non-zero pitch, roll, & yaw. Also set throttle, gear, and flaps // Set non-zero pitch, roll, & yaw. Also set throttle, gear, and flaps
CTRL[0] = 0.2F; CTRL[0] = 0.2F;
@@ -390,7 +389,7 @@ int psendCTRLTest() // sendCTRL test
} }
} }
sock = aopenUDP("localhost", 49009); sock = openUDP("localhost");
// Execute 2 // Execute 2
// Set non-zero pitch, roll, & yaw. Also set throttle, gear, and flaps // Set non-zero pitch, roll, & yaw. Also set throttle, gear, and flaps
CTRL[0] = -998.0F; CTRL[0] = -998.0F;
@@ -433,7 +432,7 @@ int sendCTRLTest()
float* data[100]; float* data[100];
int sizes[100]; int sizes[100];
float CTRL[6] = { 0.0F, 0.0F, 0.0F, 0.8F, 1.0F, 0.5F }; float CTRL[6] = { 0.0F, 0.0F, 0.0F, 0.8F, 1.0F, 0.5F };
XPCSocket sock = openUDP("127.0.0.1", 49009, 49066); XPCSocket sock = openUDP("127.0.0.1");
// Setup // Setup
for (int i = 0; i < 100; i++) for (int i = 0; i < 100; i++)
@@ -463,7 +462,7 @@ int sendCTRLTest()
} }
} }
sock = aopenUDP("localhost", 49009); sock = openUDP("localhost");
// Execute 2 // Execute 2
// Set non-zero pitch, roll, & yaw. Also set throttle, gear, and flaps // Set non-zero pitch, roll, & yaw. Also set throttle, gear, and flaps
CTRL[0] = 0.2F; CTRL[0] = 0.2F;
@@ -488,7 +487,7 @@ int sendCTRLTest()
} }
} }
sock = aopenUDP("localhost", 49009); sock = openUDP("localhost");
// Execute 2 // Execute 2
// Set non-zero pitch, roll, & yaw. Also set throttle, gear, and flaps // Set non-zero pitch, roll, & yaw. Also set throttle, gear, and flaps
CTRL[0] = -998.0F; CTRL[0] = -998.0F;
@@ -533,7 +532,7 @@ int psendPOSITest() // sendPOSI test
float* data[100]; float* data[100];
int sizes[100]; int sizes[100];
float POSI[7] = { 37.524F, -122.06899F, 2500, 0, 0, 0, 1 }; float POSI[7] = { 37.524F, -122.06899F, 2500, 0, 0, 0, 1 };
XPCSocket sock = openUDP("127.0.0.1", 49009, 49063); XPCSocket sock = openUDP("127.0.0.1");
// Setup // Setup
for (i = 0; i < 100; i++) for (i = 0; i < 100; i++)
@@ -565,7 +564,7 @@ int psendPOSITest() // sendPOSI test
} }
// Setup 2 // Setup 2
sock = aopenUDP("localhost", 49009); sock = openUDP("localhost");
POSI[0] = -998.0F; POSI[0] = -998.0F;
POSI[1] = -998.0F; POSI[1] = -998.0F;
POSI[2] = -998.0F; POSI[2] = -998.0F;
@@ -610,7 +609,7 @@ int psendPOSITest() // sendPOSI test
} }
// Setup 3 // Setup 3
sock = aopenUDP("localhost", 49009); sock = openUDP("localhost");
POSI[0] = 37.524F; POSI[0] = 37.524F;
POSI[1] = -122.06899F; POSI[1] = -122.06899F;
POSI[2] = 20000; POSI[2] = 20000;
@@ -671,7 +670,7 @@ int psendPOSITest() // sendPOSI test
// float* data[100]; // float* data[100];
// int sizes[100]; // int sizes[100];
// float POSI[7] = { 37.524F, -122.06899F, 2500, 0, 0, 0, 1 }; // float POSI[7] = { 37.524F, -122.06899F, 2500, 0, 0, 0, 1 };
// XPCSocket sock = openUDP("127.0.0.1", 49009, 49063); // XPCSocket sock = openUDP("127.0.0.1");
// //
// // Setup // // Setup
// for (i = 0; i < 100; i++) // for (i = 0; i < 100; i++)
@@ -703,7 +702,7 @@ int psendPOSITest() // sendPOSI test
// } // }
// //
// // Setup 2 // // Setup 2
// sock = aopenUDP("localhost", 49009); // sock = openUDP("localhost");
// POSI[0] = -998.0F; // POSI[0] = -998.0F;
// POSI[1] = -998.0F; // POSI[1] = -998.0F;
// POSI[2] = -998.0F; // POSI[2] = -998.0F;
@@ -748,7 +747,7 @@ int psendPOSITest() // sendPOSI test
// } // }
// //
// // Setup 3 // // Setup 3
// sock = aopenUDP("localhost", 49009); // sock = openUDP("localhost");
// POSI[0] = 37.524F; // POSI[0] = 37.524F;
// POSI[1] = -122.06899; // POSI[1] = -122.06899;
// POSI[2] = 20000; // POSI[2] = 20000;
@@ -794,7 +793,7 @@ int psendPOSITest() // sendPOSI test
int sendWYPTTest() int sendWYPTTest()
{ {
// Setup // Setup
XPCSocket sock = openUDP("127.0.0.1", 49009, 49064); XPCSocket sock = openUDP("127.0.0.1");
float points[] = float points[] =
{ {
37.5245F, -122.06899F, 2500, 37.5245F, -122.06899F, 2500,
@@ -836,7 +835,7 @@ int pauseTest() // pauseSim test
}; };
float* data[100]; float* data[100];
int sizes[100]; int sizes[100];
XPCSocket sock = openUDP("127.0.0.1", 49009, 49064); XPCSocket sock = openUDP("127.0.0.1");
// Setup // Setup
for (int i = 0; i < 100; i++) for (int i = 0; i < 100; i++)
@@ -891,7 +890,7 @@ int connTest() // setConn test
}; };
float* data[100]; float* data[100];
int sizes[100]; int sizes[100];
XPCSocket sock = openUDP("127.0.0.1", 49009, 49067); XPCSocket sock = openUDP("127.0.0.1");
#if (__APPLE__ || __linux) #if (__APPLE__ || __linux)
usleep(0); usleep(0);
#endif #endif