aaru-dps/aaruremote
1
0
Fork 0
mirror of https://github.com/aaru-dps/aaruremote.git synced 2025-12-16 19:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip packet if not managed.

Browse Source
This commit is contained in:
Natalia Portillo
2019-10-12 23:22:51 +01:00
parent b3904828a4
commit 3f61767f2d
1 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
main.c
View File

@@ -38,6 +38,8 @@ int main()
DicPacketHello * pkt_server_hello, *pkt_client_hello; DicPacketHello * pkt_server_hello, *pkt_client_hello;
DicPacketHeader* pkt_hdr; DicPacketHeader* pkt_hdr;
ssize_t recv_size; ssize_t recv_size;
char* dummy_buf;
int skip_next_hdr;
printf("DiscImageChef Remote Server %s\n", DICMOTE_VERSION); printf("DiscImageChef Remote Server %s\n", DICMOTE_VERSION);
printf("Copyright (C) 2019 Natalia Portillo\n"); printf("Copyright (C) 2019 Natalia Portillo\n");
@@ -230,8 +232,27 @@ int main()
free(pkt_client_hello); free(pkt_client_hello);
skip_next_hdr = 0;
for(;;) for(;;)
{ {
if(skip_next_hdr)
{
dummy_buf = malloc(pkt_hdr->len);
if(!dummy_buf)
{
printf("Fatal error %d allocating memory for packet, closing connection...\n", errno);
free(pkt_hdr);
close(cli_sock);
continue;
}
recv(cli_sock, dummy_buf, pkt_hdr->len, 0);
free(dummy_buf);
skip_next_hdr = 0;
}
recv_size = recv(cli_sock, pkt_hdr, sizeof(DicPacketHeader), MSG_PEEK); recv_size = recv(cli_sock, pkt_hdr, sizeof(DicPacketHeader), MSG_PEEK);
if(recv_size < 0) if(recv_size < 0)
@@ -252,27 +273,36 @@ int main()
if(pkt_hdr->id != DICMOTE_PACKET_ID) if(pkt_hdr->id != DICMOTE_PACKET_ID)
{ {
printf("Received data is not a correct dicremote packet, skipping...\n"); printf("Received data is not a correct dicremote packet, closing connection...\n");
continue; close(cli_sock);
free(pkt_hdr);
break;
} }
if(pkt_hdr->version != DICMOTE_PACKET_VERSION) if(pkt_hdr->version != DICMOTE_PACKET_VERSION)
{ {
printf("Unrecognized packet version, skipping...\n"); printf("Unrecognized packet version, skipping...\n");
skip_next_hdr = 1;
continue; continue;
} }
switch(pkt_hdr->packet_type) switch(pkt_hdr->packet_type)
{ {
case DICMOTE_PACKET_TYPE_HELLO: printf("Received hello packet out of order, skipping...\n"); continue; case DICMOTE_PACKET_TYPE_HELLO:
printf("Received hello packet out of order, skipping...\n");
skip_next_hdr = 1;
continue;
case DICMOTE_PACKET_TYPE_COMMAND_LIST_DEVICES: case DICMOTE_PACKET_TYPE_COMMAND_LIST_DEVICES:
printf("List devices not yet implemented, skipping...\n"); printf("List devices not yet implemented, skipping...\n");
skip_next_hdr = 1;
continue; continue;
case DICMOTE_PACKET_TYPE_RESPONSE_LIST_DEVICES: case DICMOTE_PACKET_TYPE_RESPONSE_LIST_DEVICES:
printf("Received response packet?! You should certainly not do that...\n"); printf("Received response packet?! You should certainly not do that...\n");
skip_next_hdr = 1;
continue; continue;
default: default:
printf("Received unrecognized packet with type %d, skipping...\n", pkt_hdr->packet_type); printf("Received unrecognized packet with type %d, skipping...\n", pkt_hdr->packet_type);
skip_next_hdr = 1;
continue; continue;
} }
} }