Compare commits

..

No commits in common. "60cfcf0bc7085d6b789167199c8a20f6d54115cd" and "7134969e2a99bc8f2683ee55148947305f6c6628" have entirely different histories.

7 changed files with 264 additions and 400 deletions

View File

@ -4,27 +4,23 @@
#include "network.h" #include "network.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[]) {
{
int xPlaneSocket; int xPlaneSocket;
// check argument // check argument
if (argc != 2) if (argc != 2) {
{
fprintf(stderr, "Usage: %s <command>\n", argv[0]); fprintf(stderr, "Usage: %s <command>\n", argv[0]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// network // network
xPlaneSocket = createSocket(SRC_PORT); xPlaneSocket = createSocket(SRC_PORT);
if (xPlaneSocket < 0) if (xPlaneSocket < 0) {
{
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// send payload // send payload
if (sendToXPlane(xPlaneSocket, DEST_SERVER, DEST_PORT, "CMND", argv[1], strlen(argv[1])) < 0) if (sendToXPlane(xPlaneSocket, DEST_SERVER, DEST_PORT, "CMND", argv[1], strlen(argv[1])) < 0) {
{
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

View File

@ -15,21 +15,18 @@
const int DGRAM_MSG_START = 0; const int DGRAM_MSG_START = 0;
const int DGRAM_PAYLOAD_START = DGRAM_MSG_START + DGRAM_MSG_LENGTH + DGRAM_NULL_LENGTH; const int DGRAM_PAYLOAD_START = DGRAM_MSG_START + DGRAM_MSG_LENGTH + DGRAM_NULL_LENGTH;
int sendToXPlane(int sock, char *destAddr, int destPort, char *msg, void *payload, int lengthOfPayload) int sendToXPlane(int sock, char *destAddr, int destPort, char *msg, void *payload, int lengthOfPayload) {
{
char bytesToSend[SEND_BUFFER]; char bytesToSend[SEND_BUFFER];
struct sockaddr_in6 xPlaneAddress; struct sockaddr_in6 xPlaneAddress;
memset(bytesToSend, 0, SEND_BUFFER); memset(bytesToSend, 0, SEND_BUFFER);
// msg is always 4 bytes long // msg is always 4 bytes long
if (strlen(msg) != DGRAM_MSG_LENGTH) if (strlen(msg) != DGRAM_MSG_LENGTH) {
{
return -10; return -10;
} }
// payload shouldn't exceed buffer // payload shouldn't exceed buffer
if (lengthOfPayload > (SEND_BUFFER - DGRAM_MSG_LENGTH - DGRAM_NULL_LENGTH)) if (lengthOfPayload > (SEND_BUFFER - DGRAM_MSG_LENGTH - DGRAM_NULL_LENGTH)) {
{
return -11; return -11;
} }
@ -42,45 +39,35 @@ int sendToXPlane(int sock, char *destAddr, int destPort, char *msg, void *payloa
inet_pton(AF_INET6, destAddr, &xPlaneAddress.sin6_addr.s6_addr); inet_pton(AF_INET6, destAddr, &xPlaneAddress.sin6_addr.s6_addr);
int numBytesSend = sendto(sock, bytesToSend, DGRAM_MSG_LENGTH + DGRAM_NULL_LENGTH + lengthOfPayload, 0, (struct sockaddr *)&xPlaneAddress, sizeof(xPlaneAddress)); int numBytesSend = sendto(sock, bytesToSend, DGRAM_MSG_LENGTH + DGRAM_NULL_LENGTH + lengthOfPayload, 0, (struct sockaddr *)&xPlaneAddress, sizeof(xPlaneAddress));
if (numBytesSend >= 0) if (numBytesSend >= 0) {
{
return numBytesSend; return numBytesSend;
} } else {
else
{
fprintf(stderr, "Failed to send message (%d): %s", errno, strerror(errno)); fprintf(stderr, "Failed to send message (%d): %s", errno, strerror(errno));
return -1; return -1;
} }
} }
int recvFromXPlane(int sock, char msg[DGRAM_MSG_LENGTH], void *payload, int maxLength) int recvFromXPlane(int sock, char msg[DGRAM_MSG_LENGTH], void *payload, int maxLength) {
{
char buf[maxLength + DGRAM_MSG_LENGTH]; char buf[maxLength + DGRAM_MSG_LENGTH];
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
int recvBytes = recv(sock, buf, maxLength + DGRAM_MSG_LENGTH, 0); int recvBytes = recv(sock, buf, maxLength + DGRAM_MSG_LENGTH, 0);
if (recvBytes >= 0) if (recvBytes >= 0) {
{ if (recvBytes >= DGRAM_MSG_LENGTH) {
if (recvBytes >= DGRAM_MSG_LENGTH)
{
memcpy(msg, &buf[0], DGRAM_MSG_LENGTH); memcpy(msg, &buf[0], DGRAM_MSG_LENGTH);
memcpy(payload, &buf[DGRAM_MSG_LENGTH], maxLength); memcpy(payload, &buf[DGRAM_MSG_LENGTH], maxLength);
return recvBytes - DGRAM_MSG_LENGTH; return recvBytes - DGRAM_MSG_LENGTH;
} } else {
else
{
fprintf(stderr, "Received data without message header?!"); fprintf(stderr, "Received data without message header?!");
return -11; return -11;
} }
} } else {
else
{
fprintf(stderr, "Error receiving data (%d): %s", errno, strerror(errno)); fprintf(stderr, "Error receiving data (%d): %s", errno, strerror(errno));
return -1; return -1;
} }
} }
int createSocket(int srcPort) int createSocket(int srcPort) {
{
int xPlaneSocket; int xPlaneSocket;
struct sockaddr_in6 localAddress; struct sockaddr_in6 localAddress;
@ -88,8 +75,7 @@ int createSocket(int srcPort)
// create socket // create socket
xPlaneSocket = socket(AF_INET6, SOCK_DGRAM, 0); xPlaneSocket = socket(AF_INET6, SOCK_DGRAM, 0);
if (xPlaneSocket == -1) if (xPlaneSocket == -1) {
{
fprintf(stderr, "Error creating socket (%d): %s\n", errno, strerror(errno)); fprintf(stderr, "Error creating socket (%d): %s\n", errno, strerror(errno));
return -1; return -1;
} }
@ -101,8 +87,7 @@ int createSocket(int srcPort)
// bind to local port // bind to local port
err = bind(xPlaneSocket, (struct sockaddr *)&localAddress, sizeof(localAddress)); err = bind(xPlaneSocket, (struct sockaddr *)&localAddress, sizeof(localAddress));
if (err) if (err) {
{
fprintf(stderr, "Error binding [::]:%d (%d): %s\n", srcPort, errno, gai_strerror(errno)); fprintf(stderr, "Error binding [::]:%d (%d): %s\n", srcPort, errno, gai_strerror(errno));
return -1; return -1;
} }
@ -110,7 +95,6 @@ int createSocket(int srcPort)
return xPlaneSocket; return xPlaneSocket;
} }
void closeSocket(int sock) void closeSocket(int sock) {
{
close(sock); close(sock);
} }

View File

@ -5,52 +5,46 @@
#include "network.h" #include "network.h"
struct dref_struct_in struct dref_struct_in {
{
int32_t dref_freq; int32_t dref_freq;
int32_t dref_sender_index; // the index the customer is using to define this dataref int32_t dref_sender_index; // the index the customer is using to define this dataref
char dref_string[400]; char dref_string[400];
}; };
struct dref_struct_out struct dref_struct_out {
{
int32_t dref_sender_index; int32_t dref_sender_index;
float dref_flt_value; float dref_flt_value;
}; };
int main(int argc, char *argv[]) int main(int argc, char *argv[]) {
{
int xPlaneSocket; int xPlaneSocket;
char *wtf; char *wtf;
// check argument // check argument
if (argc != 1 && (argc - 1) % 3 != 0) if (argc != 1 && (argc - 1) % 3 != 0) {
{
fprintf(stderr, "Usage: %s [<dataref> <frequency> <id> [<dataref> <frequency> <id> ... ]]\n", argv[0]); fprintf(stderr, "Usage: %s [<dataref> <frequency> <id> [<dataref> <frequency> <id> ... ]]\n", argv[0]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// network // network
xPlaneSocket = createSocket(SRC_PORT); xPlaneSocket = createSocket(SRC_PORT);
if (xPlaneSocket < 0) if (xPlaneSocket < 0) {
{
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// char drefsToRead[413 * ((argc - 1) / 3)]; // char drefsToRead[413 * ((argc - 1) / 3)];
// memset(drefsToRead, 0, sizeof(drefsToRead)); // memset(drefsToRead, 0, sizeof(drefsToRead));
for (int i = 1; i < argc; i = i + 3) for (int i = 1; i < argc; i = i + 3) {
{
// prepare struct to send, make sure padding is with NULL bytes // prepare struct to send, make sure padding is with NULL bytes
struct dref_struct_in drefToRead = { struct dref_struct_in drefToRead = {
.dref_freq = strtoimax(argv[i + 1], &wtf, 10), .dref_freq = strtoimax(argv[i + 1], &wtf, 10),
.dref_sender_index = strtoimax(argv[i + 2], &wtf, 10)}; .dref_sender_index = strtoimax(argv[i + 2], &wtf, 10)
};
memset(drefToRead.dref_string, 0, sizeof(drefToRead.dref_string)); memset(drefToRead.dref_string, 0, sizeof(drefToRead.dref_string));
strcpy(drefToRead.dref_string, argv[i]); strcpy(drefToRead.dref_string, argv[i]);
// send payload // send payload
if (sendToXPlane(xPlaneSocket, DEST_SERVER, DEST_PORT, "RREF", (char *)&drefToRead, sizeof(drefToRead)) < 0) if (sendToXPlane(xPlaneSocket, DEST_SERVER, DEST_PORT, "RREF", (char *)&drefToRead, sizeof(drefToRead)) < 0) {
{
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -60,40 +54,29 @@ int main(int argc, char *argv[])
// read from network // read from network
char msg[DGRAM_MSG_LENGTH + 1]; char msg[DGRAM_MSG_LENGTH + 1];
char payload[RECV_BUFFER]; char payload[RECV_BUFFER];
while (1) while (1) {
{
int payloadBytes = recvFromXPlane(xPlaneSocket, msg, payload, RECV_BUFFER); int payloadBytes = recvFromXPlane(xPlaneSocket, msg, payload, RECV_BUFFER);
if (payloadBytes > 0) if (payloadBytes > 0) {
{
printf("Received message type %s\n", msg); printf("Received message type %s\n", msg);
printf("Received message data (%d) ", payloadBytes); printf("Received message data (%d) ", payloadBytes);
for (int i = 0; i < payloadBytes; i++) for (int i = 0; i < payloadBytes; i++) {
{
printf("%02x", payload[i]); printf("%02x", payload[i]);
} }
printf("\n"); printf("\n");
if (strcmp(msg, "RREF") == 0) if (strcmp(msg, "RREF") == 0) {
{ if ((payloadBytes - 1) % 8 == 0) {
if ((payloadBytes - 1) % 8 == 0)
{
// XXX: loop // XXX: loop
struct dref_struct_out drefRead; struct dref_struct_out drefRead;
memcpy(&drefRead, &payload[1], 8); memcpy(&drefRead, &payload[1], 8);
printf("%d: %f\n", drefRead.dref_sender_index, drefRead.dref_flt_value); printf("%d: %f\n", drefRead.dref_sender_index, drefRead.dref_flt_value);
} } else {
else
{
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} } else {
else
{
// unknown to me // unknown to me
} }
} } else {
else
{
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }

2
test/.gitignore vendored
View File

@ -1,4 +1,2 @@
airspeed airspeed
heading heading
mqtt
mqtt.h

View File

@ -15,14 +15,11 @@
#define COMMAND_BUFFER 256 #define COMMAND_BUFFER 256
char *printable(char *str) char* printable(char *str) {
{
char *ret = strdup(str); char *ret = strdup(str);
for (int i = strlen(ret); i >= 0; i--) for (int i = strlen(ret); i >= 0; i--) {
{ if (ret[i] == '\r' || ret[i] == '\n') {
if (ret[i] == '\r' || ret[i] == '\n')
{
ret[i] = '\0'; ret[i] = '\0';
} }
} }
@ -30,8 +27,7 @@ char *printable(char *str)
return ret; return ret;
} }
void sendCommand(int sock, char *cmd) void sendCommand(int sock, char *cmd) {
{
char bytesToSend[COMMAND_BUFFER]; char bytesToSend[COMMAND_BUFFER];
memset(bytesToSend, 0, COMMAND_BUFFER); memset(bytesToSend, 0, COMMAND_BUFFER);
@ -39,35 +35,29 @@ void sendCommand(int sock, char *cmd)
strcpy(&bytesToSend[5], cmd); strcpy(&bytesToSend[5], cmd);
int numBytesSend = send(sock, bytesToSend, 5 + strlen(cmd), 0); 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)); //printf("Send %d bytes to %s:%d: %s\n", numBytesSend, SERVER, PORT, printable(bytesToSend));
} } else {
else
{
fprintf(stderr, "Failed to send message to %s:%d (%d): %s", SERVER, PORT, errno, strerror(errno)); fprintf(stderr, "Failed to send message to %s:%d (%d): %s", SERVER, PORT, errno, strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[]) {
{
int xplaneSocket; int xplaneSocket;
struct sockaddr_in6 xplaneAddress; struct sockaddr_in6 xplaneAddress;
int err; int err;
// check argument // check argument
if (argc != 2 || (strcmp(argv[1], "up") != 0 && strcmp(argv[1], "down") != 0)) if (argc != 2 || (strcmp(argv[1], "up") != 0 && strcmp(argv[1], "down") != 0)) {
{
fprintf(stderr, "Usage: %s <up|down>\n", argv[0]); fprintf(stderr, "Usage: %s <up|down>\n", argv[0]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// create socket // create socket
xplaneSocket = socket(AF_INET6, SOCK_DGRAM, 0); xplaneSocket = socket(AF_INET6, SOCK_DGRAM, 0);
if (xplaneSocket == -1) if (xplaneSocket == -1) {
{
fprintf(stderr, "Error creating socket (%d): %s\n", errno, strerror(errno)); fprintf(stderr, "Error creating socket (%d): %s\n", errno, strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -79,23 +69,17 @@ int main(int argc, char *argv[])
// 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", SERVER, PORT, err, gai_strerror(err));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// send payload // send payload
if (strcmp(argv[1], "up") == 0) if (strcmp(argv[1], "up") == 0) {
{
sendCommand(xplaneSocket, "sim/autopilot/airspeed_up"); sendCommand(xplaneSocket, "sim/autopilot/airspeed_up");
} } else if (strcmp(argv[1], "down") == 0) {
else if (strcmp(argv[1], "down") == 0)
{
sendCommand(xplaneSocket, "sim/autopilot/airspeed_down"); sendCommand(xplaneSocket, "sim/autopilot/airspeed_down");
} } else {
else
{
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

View File

@ -15,14 +15,11 @@
#define COMMAND_BUFFER 256 #define COMMAND_BUFFER 256
char *printable(char *str) char* printable(char *str) {
{
char *ret = strdup(str); char *ret = strdup(str);
for (int i = strlen(ret); i >= 0; i--) for (int i = strlen(ret); i >= 0; i--) {
{ if (ret[i] == '\r' || ret[i] == '\n') {
if (ret[i] == '\r' || ret[i] == '\n')
{
ret[i] = '\0'; ret[i] = '\0';
} }
} }
@ -30,8 +27,7 @@ char *printable(char *str)
return ret; return ret;
} }
void sendCommand(int sock, char *cmd) void sendCommand(int sock, char *cmd) {
{
char bytesToSend[COMMAND_BUFFER]; char bytesToSend[COMMAND_BUFFER];
memset(bytesToSend, 0, COMMAND_BUFFER); memset(bytesToSend, 0, COMMAND_BUFFER);
@ -39,35 +35,29 @@ void sendCommand(int sock, char *cmd)
strcpy(&bytesToSend[5], cmd); strcpy(&bytesToSend[5], cmd);
int numBytesSend = send(sock, bytesToSend, 5 + strlen(cmd), 0); 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)); //printf("Send %d bytes to %s:%d: %s\n", numBytesSend, SERVER, PORT, printable(bytesToSend));
} } else {
else
{
fprintf(stderr, "Failed to send message to %s:%d (%d): %s", SERVER, PORT, errno, strerror(errno)); fprintf(stderr, "Failed to send message to %s:%d (%d): %s", SERVER, PORT, errno, strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[]) {
{
int xplaneSocket; int xplaneSocket;
struct sockaddr_in6 xplaneAddress; struct sockaddr_in6 xplaneAddress;
int err; int err;
// check argument // check argument
if (argc != 2 || (strcmp(argv[1], "up") != 0 && strcmp(argv[1], "down") != 0)) if (argc != 2 || (strcmp(argv[1], "up") != 0 && strcmp(argv[1], "down") != 0)) {
{
fprintf(stderr, "Usage: %s <up|down>\n", argv[0]); fprintf(stderr, "Usage: %s <up|down>\n", argv[0]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// create socket // create socket
xplaneSocket = socket(AF_INET6, SOCK_DGRAM, 0); xplaneSocket = socket(AF_INET6, SOCK_DGRAM, 0);
if (xplaneSocket == -1) if (xplaneSocket == -1) {
{
fprintf(stderr, "Error creating socket (%d): %s\n", errno, strerror(errno)); fprintf(stderr, "Error creating socket (%d): %s\n", errno, strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -79,23 +69,17 @@ int main(int argc, char *argv[])
// 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", SERVER, PORT, err, gai_strerror(err));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// send payload // send payload
if (strcmp(argv[1], "up") == 0) if (strcmp(argv[1], "up") == 0) {
{
sendCommand(xplaneSocket, "sim/autopilot/heading_up"); sendCommand(xplaneSocket, "sim/autopilot/heading_up");
} } else if (strcmp(argv[1], "down") == 0) {
else if (strcmp(argv[1], "down") == 0)
{
sendCommand(xplaneSocket, "sim/autopilot/heading_down"); sendCommand(xplaneSocket, "sim/autopilot/heading_down");
} } else {
else
{
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

View File

@ -1,65 +0,0 @@
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <string.h>
// https://mosquitto.org/api/files/mosquitto-h.html
#include <mosquitto.h>
#include "mqtt.h"
int main(int argc, char *argv[])
{
int err;
struct mosquitto *mqtt;
err = mosquitto_lib_init();
if (err)
{
fprintf(stderr, "Error initalizing mosquitto lib (%d): %s\n", err, mosquitto_strerror(err));
exit(EXIT_FAILURE);
}
mqtt = mosquitto_new(MQTT_USER, true, NULL);
if (mqtt == NULL)
{
fprintf(stderr, "Error creating mosquitto instance (%d): %s\n", errno, strerror(errno));
exit(EXIT_FAILURE);
}
err = mosquitto_username_pw_set(mqtt, MQTT_USER, MQTT_PASS);
if (err)
{
fprintf(stderr, "Error setting username & password (%d): %s\n", err, mosquitto_strerror(err));
exit(EXIT_FAILURE);
}
err = mosquitto_connect(mqtt, "openhab.sugarland.lan", 1883, 10);
if (err)
{
fprintf(stderr, "Error on connection of type ");
if (err == MOSQ_ERR_ERRNO)
{
fprintf(stderr, "system (%d): %s\n", errno, strerror(errno));
}
else
{
fprintf(stderr, "mosquitto (%d): %s\n", err, mosquitto_strerror(err));
}
exit(EXIT_FAILURE);
}
char *foo = "blah";
err = mosquitto_publish(mqtt, NULL, "/xplane/foo", strlen(foo), foo, 0, false);
if (err)
{
fprintf(stderr, "Error publishing message (%d): %s\n", err, mosquitto_strerror(err));
exit(EXIT_FAILURE);
}
err = mosquitto_disconnect(mqtt);
// ignore error
mosquitto_destroy(mqtt);
}