Public_Skunkworks/kpmpgsmkii
Public_Skunkworks/kpmpgsmkii
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Client/Server coms working! Actual packets next!

Browse source
This commit is contained in:
Scott Duensing 2021-11-29 20:28:32 -06:00
parent ae1bb486cd
commit 0ee0f429bf
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
client/src/linux/linux.c
View file

@ -442,24 +442,21 @@ static void processEvent(void) {
static void processNetworkEvent(void) { static void processNetworkEvent(void) {
ENetEvent *event = NULL; ENetEvent event = { 0 };
if (_host) { if (_host) {
while (enet_host_service(_host, event, 1)) { while (enet_host_service(_host, &event, 1) > 0) {
switch (event->type) { switch (event.type) {
case ENET_EVENT_TYPE_CONNECT: case ENET_EVENT_TYPE_CONNECT:
logWrite("Connected!\n");
_connected = 1; _connected = 1;
break; break;
case ENET_EVENT_TYPE_RECEIVE: case ENET_EVENT_TYPE_RECEIVE:
logWrite("Packet in: %d\n", event->packet->dataLength); comAddToBuffer((char *)event.packet->data, event.packet->dataLength);
comAddToBuffer((char *)event->packet->data, event->packet->dataLength);
break; break;
case ENET_EVENT_TYPE_DISCONNECT: case ENET_EVENT_TYPE_DISCONNECT:
case ENET_EVENT_TYPE_DISCONNECT_TIMEOUT: case ENET_EVENT_TYPE_DISCONNECT_TIMEOUT:
logWrite("Disconnected!\n");
_connected = 0; _connected = 0;
_modemCommandMode = 1; _modemCommandMode = 1;
comAddToBuffer("\13NO CARRIER\13", 12); comAddToBuffer("\13NO CARRIER\13", 12);

3
server/src/main.c
View file

@ -128,9 +128,6 @@ static void *serverThread(void *data) {
// Tell the console. // Tell the console.
enet_address_get_host_ip(&event.peer->address, buffer, 2047); enet_address_get_host_ip(&event.peer->address, buffer, 2047);
consoleMessageQueue("%ld: [%s] connected.\n", client->threadIndex, buffer); consoleMessageQueue("%ld: [%s] connected.\n", client->threadIndex, buffer);
// Blargh.
ENetPacket *packet = enet_packet_create("KPMPGSMKII\r", 11, ENET_PACKET_FLAG_RELIABLE);
enet_peer_send(event.peer, 0, packet);
break; break;
case ENET_EVENT_TYPE_RECEIVE: case ENET_EVENT_TYPE_RECEIVE: