From 0ee0f429bf0128eba1f3351e7b307667456b8b0d Mon Sep 17 00:00:00 2001 From: Scott Duensing Date: Mon, 29 Nov 2021 20:28:32 -0600 Subject: [PATCH] Client/Server coms working! Actual packets next! --- client/src/linux/linux.c | 11 ++++------- server/src/main.c | 3 --- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/client/src/linux/linux.c b/client/src/linux/linux.c index 62b8d1c..89905d1 100644 --- a/client/src/linux/linux.c +++ b/client/src/linux/linux.c @@ -442,24 +442,21 @@ static void processEvent(void) { static void processNetworkEvent(void) { - ENetEvent *event = NULL; + ENetEvent event = { 0 }; if (_host) { - while (enet_host_service(_host, event, 1)) { - switch (event->type) { + while (enet_host_service(_host, &event, 1) > 0) { + switch (event.type) { case ENET_EVENT_TYPE_CONNECT: - logWrite("Connected!\n"); _connected = 1; break; 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; case ENET_EVENT_TYPE_DISCONNECT: case ENET_EVENT_TYPE_DISCONNECT_TIMEOUT: - logWrite("Disconnected!\n"); _connected = 0; _modemCommandMode = 1; comAddToBuffer("\13NO CARRIER\13", 12); diff --git a/server/src/main.c b/server/src/main.c index 2d92f90..08ff37d 100644 --- a/server/src/main.c +++ b/server/src/main.c @@ -128,9 +128,6 @@ static void *serverThread(void *data) { // Tell the console. enet_address_get_host_ip(&event.peer->address, buffer, 2047); 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; case ENET_EVENT_TYPE_RECEIVE: