Client/Server coms working! Actual packets next!
This commit is contained in:
parent
ae1bb486cd
commit
0ee0f429bf
2 changed files with 4 additions and 10 deletions
|
@ -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);
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Add table
Reference in a new issue