XPlane/MQTT-Gateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

less magic numbers and generic send function

Browse Source
This commit is contained in:
damage 2024-01-21 13:14:47 +01:00
parent 0104e542e1
commit 56bb116ab9
3 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command.c
View File

@ -20,7 +20,7 @@ int main(int argc, char *argv[]) {
} }
// send payload // send payload
if (sendCommand(xPlaneSocket, argv[1]) < 0) { if (sendToXPlane(xPlaneSocket, "CMND", argv[1]) < 0) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

36
network.c
View File

@ -12,31 +12,31 @@
#include "network.h" #include "network.h"
char* printable(char *str) { const int DGRAM_MSG_START = 0;
char *ret = strdup(str); const int DGRAM_PAYLOAD_START = DGRAM_MSG_START + DGRAM_MSG_LENGTH + DGRAM_NULL_LENGTH;
for (int i = strlen(ret); i >= 0; i--) { int sendToXPlane(int sock, char *msg, char *payload) {
if (ret[i] == '\r' || ret[i] == '\n') { char bytesToSend[SEND_BUFFER];
ret[i] = '\0'; memset(bytesToSend, 0, SEND_BUFFER);
}
// msg is always 4 bytes long
if (strlen(msg) != DGRAM_MSG_LENGTH) {
return -10;
} }
return ret; // payload shouldn't exceed buffer
} if (strlen(payload) > (SEND_BUFFER - DGRAM_MSG_LENGTH - DGRAM_NULL_LENGTH)) {
return -11;
}
int sendCommand(int sock, char *cmd) { strcpy(&bytesToSend[DGRAM_MSG_START], msg);
char bytesToSend[COMMAND_BUFFER]; strcpy(&bytesToSend[DGRAM_PAYLOAD_START], payload);
memset(bytesToSend, 0, COMMAND_BUFFER);
strcpy(&bytesToSend[0], "CMND"); int numBytesSend = send(sock, bytesToSend, DGRAM_MSG_LENGTH + DGRAM_NULL_LENGTH + strlen(payload), 0);
strcpy(&bytesToSend[5], cmd);
int numBytesSend = send(sock, bytesToSend, 5 + strlen(cmd), 0);
if (numBytesSend >= 0) { if (numBytesSend >= 0) {
//printf("Send %d bytes to %s:%d: %s\n", numBytesSend, SERVER, PORT, printable(bytesToSend));
return numBytesSend; return numBytesSend;
} else { } else {
fprintf(stderr, "Failed to send message to %s:%d (%d): %s", SERVER, PORT, errno, strerror(errno)); fprintf(stderr, "Failed to send message (%d): %s", errno, strerror(errno));
return -1; return -1;
} }
} }
@ -62,7 +62,7 @@ int connectXPlane(char *addr, int port) {
// connect to xPlane // connect to xPlane
err = connect(xPlaneSocket, (struct sockaddr *)&xPlaneAddress, sizeof(xPlaneAddress)); err = connect(xPlaneSocket, (struct sockaddr *)&xPlaneAddress, sizeof(xPlaneAddress));
if (err) { if (err) {
fprintf(stderr, "Error connecting %s:%d (%d): %s\n", SERVER, PORT, err, gai_strerror(err)); fprintf(stderr, "Error connecting %s:%d (%d): %s\n", addr, port, err, gai_strerror(err));
return -1; return -1;
} }

11
network.h
View File

@ -1,9 +1,14 @@
#define SERVER "::1" #define SERVER "::1"
#define PORT 49000 #define PORT 49000
#define COMMAND_BUFFER 256 #define SEND_BUFFER 256
char* printable(char *str); #define DGRAM_MSG_LENGTH 4
int sendCommand(int sock, char *cmd); #define DGRAM_NULL_LENGTH 1
extern const int DGRAM_MSG_START;
extern const int DGRAM_PAYLOAD_START;
int sendToXPlane(int sock, char *msg, char *payload);
int connectXPlane(char *addr, int port); int connectXPlane(char *addr, int port);
int disconnectXPlane(int sock); int disconnectXPlane(int sock);