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

Use 32-bit fields for packet ID.

Browse Source
This commit is contained in:
Natalia Portillo
2019-10-26 15:34:28 +01:00
parent a85efd0463
commit ac619c274a
5 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/runConfigurations/dicremote_x86_64.xml generated
View File

@@ -1,7 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="dicremote-x86_64" type="CMakeRunConfiguration" factoryName="Application" PASS_PARENT_ENVS_2="true" PROJECT_NAME="dicremote" TARGET_NAME="dicremote-x86_64" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="dicremote" RUN_TARGET_NAME="dicremote-x86_64">
<method v="2">
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
</method>
</configuration>
</component>

6
dicmote.h
View File

@@ -34,7 +34,8 @@
#define DICMOTE_NAME "DiscImageChef Remote Server" #define DICMOTE_NAME "DiscImageChef Remote Server"
#define DICMOTE_VERSION "0.99" #define DICMOTE_VERSION "0.99"
#define DICMOTE_PORT 6666 #define DICMOTE_PORT 6666
#define DICMOTE_PACKET_ID 0x6873678065677584 // "DICPACKT" #define DICMOTE_REMOTE_ID 0x52434944 // "DICR"
#define DICMOTE_PACKET_ID 0x544B4350 // "PCKT"
#define DICMOTE_PACKET_VERSION 1 #define DICMOTE_PACKET_VERSION 1
#define DICMOTE_PACKET_TYPE_NOP -1 #define DICMOTE_PACKET_TYPE_NOP -1
#define DICMOTE_PACKET_TYPE_HELLO 1 #define DICMOTE_PACKET_TYPE_HELLO 1
@@ -102,7 +103,8 @@
typedef struct typedef struct
{ {
uint64_t id; uint32_t remote_id;
uint32_t packet_id;
uint32_t len; uint32_t len;
uint8_t version; uint8_t version;
int8_t packet_type; int8_t packet_type;

3
unix/hello.c
View File

@@ -37,7 +37,8 @@ DicPacketHello* GetHello()
memset(pkt_server_hello, 0, sizeof(DicPacketHello)); memset(pkt_server_hello, 0, sizeof(DicPacketHello));
pkt_server_hello->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_server_hello->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_server_hello->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
pkt_server_hello->hdr.len = htole32(sizeof(DicPacketHello)); pkt_server_hello->hdr.len = htole32(sizeof(DicPacketHello));
pkt_server_hello->hdr.version = DICMOTE_PACKET_VERSION; pkt_server_hello->hdr.version = DICMOTE_PACKET_VERSION;
pkt_server_hello->hdr.packet_type = DICMOTE_PACKET_TYPE_HELLO; pkt_server_hello->hdr.packet_type = DICMOTE_PACKET_TYPE_HELLO;

3
wii/hello.c
View File

@@ -33,7 +33,8 @@ DicPacketHello* GetHello()
memset(pkt_server_hello, 0, sizeof(DicPacketHello)); memset(pkt_server_hello, 0, sizeof(DicPacketHello));
pkt_server_hello->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_server_hello->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_server_hello->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
pkt_server_hello->hdr.len = htole32(sizeof(DicPacketHello)); pkt_server_hello->hdr.len = htole32(sizeof(DicPacketHello));
pkt_server_hello->hdr.version = DICMOTE_PACKET_VERSION; pkt_server_hello->hdr.version = DICMOTE_PACKET_VERSION;
pkt_server_hello->hdr.packet_type = DICMOTE_PACKET_TYPE_HELLO; pkt_server_hello->hdr.packet_type = DICMOTE_PACKET_TYPE_HELLO;

40
worker.c
View File

@@ -120,7 +120,8 @@ void* WorkingLoop(void* arguments)
memset(pkt_nop, 0, sizeof(DicPacketNop)); memset(pkt_nop, 0, sizeof(DicPacketNop));
pkt_nop->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_nop->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_nop->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
pkt_nop->hdr.len = htole32(sizeof(DicPacketNop)); pkt_nop->hdr.len = htole32(sizeof(DicPacketNop));
pkt_nop->hdr.version = DICMOTE_PACKET_VERSION; pkt_nop->hdr.version = DICMOTE_PACKET_VERSION;
pkt_nop->hdr.packet_type = DICMOTE_PACKET_TYPE_NOP; pkt_nop->hdr.packet_type = DICMOTE_PACKET_TYPE_NOP;
@@ -173,7 +174,7 @@ void* WorkingLoop(void* arguments)
continue; continue;
} }
if(pkt_hdr->id != htole64(DICMOTE_PACKET_ID)) if(pkt_hdr->remote_id != htole32(DICMOTE_REMOTE_ID) || pkt_hdr->packet_id != htole32(DICMOTE_PACKET_ID))
{ {
printf("Received data is not a correct dicremote packet, closing connection...\n"); printf("Received data is not a correct dicremote packet, closing connection...\n");
free(pkt_hdr); free(pkt_hdr);
@@ -266,7 +267,7 @@ void* WorkingLoop(void* arguments)
break; break;
} }
if(pkt_hdr->id != htole64(DICMOTE_PACKET_ID)) if(pkt_hdr->remote_id != htole32(DICMOTE_REMOTE_ID) || pkt_hdr->packet_id != htole32(DICMOTE_PACKET_ID))
{ {
printf("Received data is not a correct dicremote packet, closing connection...\n"); printf("Received data is not a correct dicremote packet, closing connection...\n");
NetClose(cli_sock); NetClose(cli_sock);
@@ -328,7 +329,8 @@ void* WorkingLoop(void* arguments)
free(pkt_res_devinfo); free(pkt_res_devinfo);
pkt_res_devinfo = (DicPacketResListDevs*)in_buf; pkt_res_devinfo = (DicPacketResListDevs*)in_buf;
pkt_res_devinfo->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_res_devinfo->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_res_devinfo->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
pkt_res_devinfo->hdr.version = DICMOTE_PACKET_VERSION; pkt_res_devinfo->hdr.version = DICMOTE_PACKET_VERSION;
pkt_res_devinfo->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_LIST_DEVICES; pkt_res_devinfo->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_LIST_DEVICES;
@@ -423,7 +425,8 @@ void* WorkingLoop(void* arguments)
pkt_dev_type->hdr.len = htole32(sizeof(DicPacketResGetDeviceType)); pkt_dev_type->hdr.len = htole32(sizeof(DicPacketResGetDeviceType));
pkt_dev_type->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_GET_DEVTYPE; pkt_dev_type->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_GET_DEVTYPE;
pkt_dev_type->hdr.version = DICMOTE_PACKET_VERSION; pkt_dev_type->hdr.version = DICMOTE_PACKET_VERSION;
pkt_dev_type->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_dev_type->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_dev_type->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
pkt_dev_type->device_type = htole32(GetDeviceType(device_path)); pkt_dev_type->device_type = htole32(GetDeviceType(device_path));
NetWrite(cli_sock, pkt_dev_type, sizeof(DicPacketResGetDeviceType)); NetWrite(cli_sock, pkt_dev_type, sizeof(DicPacketResGetDeviceType));
@@ -492,7 +495,8 @@ void* WorkingLoop(void* arguments)
pkt_res_scsi->hdr.len = htole32(sizeof(DicPacketResScsi) + sense_len + pkt_cmd_scsi->buf_len); pkt_res_scsi->hdr.len = htole32(sizeof(DicPacketResScsi) + sense_len + pkt_cmd_scsi->buf_len);
pkt_res_scsi->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_SCSI; pkt_res_scsi->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_SCSI;
pkt_res_scsi->hdr.version = DICMOTE_PACKET_VERSION; pkt_res_scsi->hdr.version = DICMOTE_PACKET_VERSION;
pkt_res_scsi->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_res_scsi->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_res_scsi->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
pkt_res_scsi->sense_len = htole32(sense_len); pkt_res_scsi->sense_len = htole32(sense_len);
pkt_res_scsi->buf_len = pkt_cmd_scsi->buf_len; pkt_res_scsi->buf_len = pkt_cmd_scsi->buf_len;
@@ -530,7 +534,8 @@ void* WorkingLoop(void* arguments)
} }
memset(pkt_res_sdhci_registers, 0, sizeof(DicPacketResGetSdhciRegisters)); memset(pkt_res_sdhci_registers, 0, sizeof(DicPacketResGetSdhciRegisters));
pkt_res_sdhci_registers->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_res_sdhci_registers->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_res_sdhci_registers->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
pkt_res_sdhci_registers->hdr.version = DICMOTE_PACKET_VERSION; pkt_res_sdhci_registers->hdr.version = DICMOTE_PACKET_VERSION;
pkt_res_sdhci_registers->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_GET_SDHCI_REGISTERS; pkt_res_sdhci_registers->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_GET_SDHCI_REGISTERS;
pkt_res_sdhci_registers->hdr.len = htole32(sizeof(DicPacketResGetSdhciRegisters)); pkt_res_sdhci_registers->hdr.len = htole32(sizeof(DicPacketResGetSdhciRegisters));
@@ -608,7 +613,8 @@ void* WorkingLoop(void* arguments)
} }
memset(pkt_res_usb, 0, sizeof(DicPacketResGetUsbData)); memset(pkt_res_usb, 0, sizeof(DicPacketResGetUsbData));
pkt_res_usb->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_res_usb->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_res_usb->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
pkt_res_usb->hdr.version = DICMOTE_PACKET_VERSION; pkt_res_usb->hdr.version = DICMOTE_PACKET_VERSION;
pkt_res_usb->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_GET_USB_DATA; pkt_res_usb->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_GET_USB_DATA;
pkt_res_usb->hdr.len = htole32(sizeof(DicPacketResGetUsbData)); pkt_res_usb->hdr.len = htole32(sizeof(DicPacketResGetUsbData));
@@ -653,7 +659,8 @@ void* WorkingLoop(void* arguments)
} }
memset(pkt_res_firewire, 0, sizeof(DicPacketResGetFireWireData)); memset(pkt_res_firewire, 0, sizeof(DicPacketResGetFireWireData));
pkt_res_firewire->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_res_firewire->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_res_firewire->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
pkt_res_firewire->hdr.version = DICMOTE_PACKET_VERSION; pkt_res_firewire->hdr.version = DICMOTE_PACKET_VERSION;
pkt_res_firewire->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_GET_FIREWIRE_DATA; pkt_res_firewire->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_GET_FIREWIRE_DATA;
pkt_res_firewire->hdr.len = htole32(sizeof(DicPacketResGetFireWireData)); pkt_res_firewire->hdr.len = htole32(sizeof(DicPacketResGetFireWireData));
@@ -694,7 +701,8 @@ void* WorkingLoop(void* arguments)
} }
memset(pkt_res_pcmcia, 0, sizeof(DicPacketResGetPcmciaData)); memset(pkt_res_pcmcia, 0, sizeof(DicPacketResGetPcmciaData));
pkt_res_pcmcia->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_res_pcmcia->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_res_pcmcia->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
pkt_res_pcmcia->hdr.version = DICMOTE_PACKET_VERSION; pkt_res_pcmcia->hdr.version = DICMOTE_PACKET_VERSION;
pkt_res_pcmcia->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_GET_PCMCIA_DATA; pkt_res_pcmcia->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_GET_PCMCIA_DATA;
pkt_res_pcmcia->hdr.len = htole32(sizeof(DicPacketResGetPcmciaData)); pkt_res_pcmcia->hdr.len = htole32(sizeof(DicPacketResGetPcmciaData));
@@ -765,7 +773,8 @@ void* WorkingLoop(void* arguments)
pkt_res_ata_chs->hdr.len = htole32(sizeof(DicPacketResAtaChs) + htole32(pkt_cmd_ata_chs->buf_len)); pkt_res_ata_chs->hdr.len = htole32(sizeof(DicPacketResAtaChs) + htole32(pkt_cmd_ata_chs->buf_len));
pkt_res_ata_chs->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_ATA_CHS; pkt_res_ata_chs->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_ATA_CHS;
pkt_res_ata_chs->hdr.version = DICMOTE_PACKET_VERSION; pkt_res_ata_chs->hdr.version = DICMOTE_PACKET_VERSION;
pkt_res_ata_chs->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_res_ata_chs->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_res_ata_chs->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
pkt_res_ata_chs->registers = ata_chs_error_regs; pkt_res_ata_chs->registers = ata_chs_error_regs;
pkt_res_ata_chs->buf_len = pkt_cmd_ata_chs->buf_len; pkt_res_ata_chs->buf_len = pkt_cmd_ata_chs->buf_len;
@@ -837,7 +846,8 @@ void* WorkingLoop(void* arguments)
htole32(sizeof(DicPacketResAtaLba28) + le32toh(pkt_cmd_ata_lba28->buf_len)); htole32(sizeof(DicPacketResAtaLba28) + le32toh(pkt_cmd_ata_lba28->buf_len));
pkt_res_ata_lba28->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_ATA_LBA_28; pkt_res_ata_lba28->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_ATA_LBA_28;
pkt_res_ata_lba28->hdr.version = DICMOTE_PACKET_VERSION; pkt_res_ata_lba28->hdr.version = DICMOTE_PACKET_VERSION;
pkt_res_ata_lba28->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_res_ata_lba28->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_res_ata_lba28->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
pkt_res_ata_lba28->registers = ata_lba28_error_regs; pkt_res_ata_lba28->registers = ata_lba28_error_regs;
pkt_res_ata_lba28->buf_len = pkt_cmd_ata_lba28->buf_len; pkt_res_ata_lba28->buf_len = pkt_cmd_ata_lba28->buf_len;
@@ -914,7 +924,8 @@ void* WorkingLoop(void* arguments)
htole32(sizeof(DicPacketResAtaLba48) + le32toh(pkt_cmd_ata_lba48->buf_len)); htole32(sizeof(DicPacketResAtaLba48) + le32toh(pkt_cmd_ata_lba48->buf_len));
pkt_res_ata_lba48->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_ATA_LBA_48; pkt_res_ata_lba48->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_ATA_LBA_48;
pkt_res_ata_lba48->hdr.version = DICMOTE_PACKET_VERSION; pkt_res_ata_lba48->hdr.version = DICMOTE_PACKET_VERSION;
pkt_res_ata_lba48->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_res_ata_lba48->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_res_ata_lba48->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
// Swapping // Swapping
ata_lba48_error_regs.lba_high = htole16(ata_lba48_error_regs.lba_high); ata_lba48_error_regs.lba_high = htole16(ata_lba48_error_regs.lba_high);
@@ -990,7 +1001,8 @@ void* WorkingLoop(void* arguments)
pkt_res_sdhci->hdr.len = htole32(sizeof(DicPacketResSdhci) + le32toh(pkt_cmd_sdhci->buf_len)); pkt_res_sdhci->hdr.len = htole32(sizeof(DicPacketResSdhci) + le32toh(pkt_cmd_sdhci->buf_len));
pkt_res_sdhci->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_SDHCI; pkt_res_sdhci->hdr.packet_type = DICMOTE_PACKET_TYPE_RESPONSE_SDHCI;
pkt_res_sdhci->hdr.version = DICMOTE_PACKET_VERSION; pkt_res_sdhci->hdr.version = DICMOTE_PACKET_VERSION;
pkt_res_sdhci->hdr.id = htole64(DICMOTE_PACKET_ID); pkt_res_sdhci->hdr.remote_id = htole32(DICMOTE_REMOTE_ID);
pkt_res_sdhci->hdr.packet_id = htole32(DICMOTE_PACKET_ID);
sdhci_response[0] = htole32(sdhci_response[0]); sdhci_response[0] = htole32(sdhci_response[0]);
sdhci_response[1] = htole32(sdhci_response[1]); sdhci_response[1] = htole32(sdhci_response[1]);