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

Add multi SD/MMC commands packet processing.

Browse Source
This commit is contained in:
Natalia Portillo
2020-12-14 01:26:39 +00:00
parent 2ca77bb255
commit 76cfb2c072
2 changed files with 194 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
aaruremote.h
View File

@@ -62,7 +62,9 @@
#define AARUREMOTE_PACKET_TYPE_COMMAND_CLOSE_DEVICE 25 #define AARUREMOTE_PACKET_TYPE_COMMAND_CLOSE_DEVICE 25
#define AARUREMOTE_PACKET_TYPE_COMMAND_AM_I_ROOT 26 #define AARUREMOTE_PACKET_TYPE_COMMAND_AM_I_ROOT 26
#define AARUREMOTE_PACKET_TYPE_RESPONSE_AM_I_ROOT 27 #define AARUREMOTE_PACKET_TYPE_RESPONSE_AM_I_ROOT 27
#define AARUREMOTE_PROTOCOL_MAX 1 #define AARUREMOTE_PACKET_TYPE_MULTI_COMMAND_SDHCI 28
#define AARUREMOTE_PACKET_TYPE_RESPONSE_MULTI_SDHCI 29
#define AARUREMOTE_PROTOCOL_MAX 2
#define AARUREMOTE_PACKET_NOP_REASON_OOO 0 #define AARUREMOTE_PACKET_NOP_REASON_OOO 0
#define AARUREMOTE_PACKET_NOP_REASON_NOT_IMPLEMENTED 1 #define AARUREMOTE_PACKET_NOP_REASON_NOT_IMPLEMENTED 1
#define AARUREMOTE_PACKET_NOP_REASON_NOT_RECOGNIZED 2 #define AARUREMOTE_PACKET_NOP_REASON_NOT_RECOGNIZED 2
@@ -356,26 +358,36 @@ typedef struct
typedef struct typedef struct
{ {
AaruPacketHeader hdr; uint8_t command;
uint8_t command; uint8_t write;
uint8_t write; uint8_t application;
uint8_t application; uint32_t flags;
uint32_t flags; uint32_t argument;
uint32_t argument; uint32_t block_size;
uint32_t block_size; uint32_t blocks;
uint32_t blocks; uint32_t buf_len;
uint32_t buf_len; uint32_t timeout;
uint32_t timeout; } AaruCmdSdhci;
} AaruPacketCmdSdhci;
typedef struct typedef struct
{ {
AaruPacketHeader hdr; AaruPacketHeader hdr;
uint32_t buf_len; AaruCmdSdhci command;
uint32_t response[4]; } AaruPacketCmdSdhci;
uint32_t duration;
uint32_t sense; typedef struct
uint32_t error_no; {
uint32_t buf_len;
uint32_t response[4];
uint32_t duration;
uint32_t sense;
uint32_t error_no;
} AaruResSdhci;
typedef struct
{
AaruPacketHeader hdr;
AaruResSdhci res;
} AaruPacketResSdhci; } AaruPacketResSdhci;
typedef struct typedef struct
@@ -471,8 +483,36 @@ typedef struct
uint32_t am_i_root; uint32_t am_i_root;
} AaruPacketResAmIRoot; } AaruPacketResAmIRoot;
typedef struct
{
AaruPacketHeader hdr;
uint64_t cmd_count;
AaruCmdSdhci commands[0];
} AaruPacketMultiCmdSdhci;
typedef struct
{
AaruPacketHeader hdr;
uint64_t cmd_count;
AaruResSdhci responses[0];
} AaruPacketMultiResSdhci;
#pragma pack(pop) #pragma pack(pop)
typedef struct
{
uint32_t argument;
uint32_t blocks;
uint32_t block_size;
uint32_t buf_len;
char* buffer;
uint8_t command;
uint32_t flags;
uint8_t application;
uint32_t response[4];
uint8_t write;
} MmcSingleCommand;
DeviceInfoList* ListDevices(); DeviceInfoList* ListDevices();
void FreeDeviceInfoList(DeviceInfoList* start); void FreeDeviceInfoList(DeviceInfoList* start);
uint16_t DeviceInfoListCount(DeviceInfoList* start); uint16_t DeviceInfoListCount(DeviceInfoList* start);
@@ -563,6 +603,11 @@ int32_t SendSdhciCommand(void* device_ctx,
uint32_t* response, uint32_t* response,
uint32_t* duration, uint32_t* duration,
uint32_t* sense); uint32_t* sense);
int32_t SendMultiSdhciCommand(void* device_ctx,
uint64_t count,
MmcSingleCommand commands[],
uint32_t* duration,
uint32_t* sense);
AaruPacketHello* GetHello(); AaruPacketHello* GetHello();
int PrintNetworkAddresses(); int PrintNetworkAddresses();
char* PrintIpv4Address(struct in_addr addr); char* PrintIpv4Address(struct in_addr addr);

151
worker.c
View File

@@ -53,6 +53,7 @@ void* WorkingLoop(void* arguments)
AaruPacketCmdOpen* pkt_dev_open; AaruPacketCmdOpen* pkt_dev_open;
AaruPacketCmdScsi* pkt_cmd_scsi; AaruPacketCmdScsi* pkt_cmd_scsi;
AaruPacketCmdSdhci* pkt_cmd_sdhci; AaruPacketCmdSdhci* pkt_cmd_sdhci;
AaruPacketMultiCmdSdhci* pkt_cmd_multi_sdhci;
AaruPacketHeader* pkt_hdr; AaruPacketHeader* pkt_hdr;
AaruPacketHello* pkt_server_hello; AaruPacketHello* pkt_server_hello;
AaruPacketHello* pkt_client_hello; AaruPacketHello* pkt_client_hello;
@@ -69,6 +70,7 @@ void* WorkingLoop(void* arguments)
AaruPacketResListDevs* pkt_res_devinfo; AaruPacketResListDevs* pkt_res_devinfo;
AaruPacketResScsi* pkt_res_scsi; AaruPacketResScsi* pkt_res_scsi;
AaruPacketResSdhci* pkt_res_sdhci; AaruPacketResSdhci* pkt_res_sdhci;
AaruPacketMultiResSdhci* pkt_res_multi_sdhci;
int skip_next_hdr; int skip_next_hdr;
int ret; int ret;
socklen_t cli_len; socklen_t cli_len;
@@ -84,6 +86,7 @@ void* WorkingLoop(void* arguments)
void* net_ctx = NULL; void* net_ctx = NULL;
void* cli_ctx = NULL; void* cli_ctx = NULL;
long off; long off;
MmcSingleCommand* multi_sdhci_commands;
if(!arguments) if(!arguments)
{ {
@@ -984,7 +987,7 @@ void* WorkingLoop(void* arguments)
// TODO: Check size of buffers + size of packet is not bigger than size in header // TODO: Check size of buffers + size of packet is not bigger than size in header
if(le32toh(pkt_cmd_sdhci->buf_len) > 0) buffer = in_buf + sizeof(AaruPacketCmdSdhci); if(le32toh(pkt_cmd_sdhci->command.buf_len) > 0) buffer = in_buf + sizeof(AaruPacketCmdSdhci);
else else
buffer = NULL; buffer = NULL;
@@ -993,21 +996,21 @@ void* WorkingLoop(void* arguments)
duration = 0; duration = 0;
sense = 1; sense = 1;
ret = SendSdhciCommand(device_ctx, ret = SendSdhciCommand(device_ctx,
pkt_cmd_sdhci->command, pkt_cmd_sdhci->command.command,
pkt_cmd_sdhci->write, pkt_cmd_sdhci->command.write,
pkt_cmd_sdhci->application, pkt_cmd_sdhci->command.application,
le32toh(pkt_cmd_sdhci->flags), le32toh(pkt_cmd_sdhci->command.flags),
le32toh(pkt_cmd_sdhci->argument), le32toh(pkt_cmd_sdhci->command.argument),
le32toh(pkt_cmd_sdhci->block_size), le32toh(pkt_cmd_sdhci->command.block_size),
le32toh(pkt_cmd_sdhci->blocks), le32toh(pkt_cmd_sdhci->command.blocks),
buffer, buffer,
le32toh(pkt_cmd_sdhci->buf_len), le32toh(pkt_cmd_sdhci->command.buf_len),
le32toh(pkt_cmd_sdhci->timeout), le32toh(pkt_cmd_sdhci->command.timeout),
(uint32_t*)&sdhci_response, (uint32_t*)&sdhci_response,
&duration, &duration,
&sense); &sense);
out_buf = malloc(sizeof(AaruPacketResSdhci) + le32toh(pkt_cmd_sdhci->buf_len)); out_buf = malloc(sizeof(AaruPacketResSdhci) + le32toh(pkt_cmd_sdhci->command.buf_len));
if(!out_buf) if(!out_buf)
{ {
@@ -1019,9 +1022,11 @@ void* WorkingLoop(void* arguments)
} }
pkt_res_sdhci = (AaruPacketResSdhci*)out_buf; pkt_res_sdhci = (AaruPacketResSdhci*)out_buf;
if(buffer) memcpy(out_buf + sizeof(AaruPacketResSdhci), buffer, le32toh(pkt_cmd_sdhci->buf_len)); if(buffer)
memcpy(out_buf + sizeof(AaruPacketResSdhci), buffer, le32toh(pkt_cmd_sdhci->command.buf_len));
pkt_res_sdhci->hdr.len = htole32(sizeof(AaruPacketResSdhci) + le32toh(pkt_cmd_sdhci->buf_len)); pkt_res_sdhci->hdr.len =
htole32(sizeof(AaruPacketResSdhci) + le32toh(pkt_cmd_sdhci->command.buf_len));
pkt_res_sdhci->hdr.packet_type = AARUREMOTE_PACKET_TYPE_RESPONSE_SDHCI; pkt_res_sdhci->hdr.packet_type = AARUREMOTE_PACKET_TYPE_RESPONSE_SDHCI;
pkt_res_sdhci->hdr.version = AARUREMOTE_PACKET_VERSION; pkt_res_sdhci->hdr.version = AARUREMOTE_PACKET_VERSION;
pkt_res_sdhci->hdr.remote_id = htole32(AARUREMOTE_REMOTE_ID); pkt_res_sdhci->hdr.remote_id = htole32(AARUREMOTE_REMOTE_ID);
@@ -1032,11 +1037,11 @@ void* WorkingLoop(void* arguments)
sdhci_response[2] = htole32(sdhci_response[2]); sdhci_response[2] = htole32(sdhci_response[2]);
sdhci_response[3] = htole32(sdhci_response[3]); sdhci_response[3] = htole32(sdhci_response[3]);
memcpy((char*)&pkt_res_sdhci->response, (char*)&sdhci_response, sizeof(uint32_t) * 4); memcpy((char*)&pkt_res_sdhci->res.response, (char*)&sdhci_response, sizeof(uint32_t) * 4);
pkt_res_sdhci->buf_len = pkt_cmd_sdhci->buf_len; pkt_res_sdhci->res.buf_len = pkt_cmd_sdhci->command.buf_len;
pkt_res_sdhci->duration = htole32(duration); pkt_res_sdhci->res.duration = htole32(duration);
pkt_res_sdhci->sense = htole32(sense); pkt_res_sdhci->res.sense = htole32(sense);
pkt_res_sdhci->error_no = htole32(ret); pkt_res_sdhci->res.error_no = htole32(ret);
NetWrite(cli_ctx, pkt_res_sdhci, le32toh(pkt_res_sdhci->hdr.len)); NetWrite(cli_ctx, pkt_res_sdhci, le32toh(pkt_res_sdhci->hdr.len));
free(pkt_cmd_sdhci); free(pkt_cmd_sdhci);
@@ -1081,6 +1086,114 @@ void* WorkingLoop(void* arguments)
NetWrite(cli_ctx, pkt_res_am_i_root, le32toh(pkt_res_am_i_root->hdr.len)); NetWrite(cli_ctx, pkt_res_am_i_root, le32toh(pkt_res_am_i_root->hdr.len));
free(pkt_res_am_i_root); free(pkt_res_am_i_root);
continue;
case AARUREMOTE_PACKET_TYPE_MULTI_COMMAND_SDHCI:
in_buf = malloc(le32toh(pkt_hdr->len));
if(!in_buf)
{
printf("Fatal error %d allocating memory for packet, closing connection...\n", errno);
free(pkt_hdr);
NetClose(cli_ctx);
continue;
}
NetRecv(cli_ctx, in_buf, le32toh(pkt_hdr->len), 0);
pkt_cmd_multi_sdhci = (AaruPacketMultiCmdSdhci*)in_buf;
pkt_cmd_multi_sdhci->cmd_count = le64toh(pkt_cmd_multi_sdhci->cmd_count);
// TODO: Check size of buffers + size of packet is not bigger than size in header
multi_sdhci_commands = malloc(sizeof(MmcSingleCommand) * pkt_cmd_multi_sdhci->cmd_count);
if(!multi_sdhci_commands)
{
printf("Fatal error %d allocating memory for commands, closing connection...\n", errno);
free(pkt_hdr);
free(in_buf);
NetClose(cli_ctx);
continue;
}
memset(multi_sdhci_commands, 0, sizeof(MmcSingleCommand) * pkt_cmd_multi_sdhci->cmd_count);
for(n = 0; n < pkt_cmd_multi_sdhci->cmd_count; n++)
{
multi_sdhci_commands[n].argument = le32toh(pkt_cmd_multi_sdhci->commands[n].argument);
multi_sdhci_commands[n].block_size = le32toh(pkt_cmd_multi_sdhci->commands[n].block_size);
multi_sdhci_commands[n].blocks = le32toh(pkt_cmd_multi_sdhci->commands[n].blocks);
multi_sdhci_commands[n].command = pkt_cmd_multi_sdhci->commands[n].command;
multi_sdhci_commands[n].flags = le32toh(pkt_cmd_multi_sdhci->commands[n].flags);
multi_sdhci_commands[n].application = pkt_cmd_multi_sdhci->commands[n].application;
multi_sdhci_commands[n].write = pkt_cmd_multi_sdhci->commands[n].write;
multi_sdhci_commands[n].buf_len = le32toh(pkt_cmd_multi_sdhci->commands[n].buf_len);
}
off = (long)(sizeof(AaruPacketMultiCmdSdhci) +
(sizeof(AaruCmdSdhci) * pkt_cmd_multi_sdhci->cmd_count));
for(n = 0; n < pkt_cmd_multi_sdhci->cmd_count; n++)
{
multi_sdhci_commands[n].buffer = (char*)pkt_cmd_multi_sdhci + off;
off += multi_sdhci_commands[n].buf_len;
}
ret = SendMultiSdhciCommand(
device_ctx, pkt_cmd_multi_sdhci->cmd_count, multi_sdhci_commands, &duration, &sense);
off =
(long)(sizeof(AaruPacketMultiResSdhci) + sizeof(AaruResSdhci) * pkt_cmd_multi_sdhci->cmd_count);
for(n = 0; n < pkt_cmd_multi_sdhci->cmd_count; n++) off += multi_sdhci_commands[n].buf_len;
out_buf = malloc(off);
if(!out_buf)
{
printf("Fatal error %d allocating memory for packet, continuing...\n", errno);
free(multi_sdhci_commands);
free(pkt_hdr);
free(in_buf);
NetClose(cli_ctx);
continue;
}
pkt_res_multi_sdhci = (AaruPacketMultiResSdhci*)out_buf;
pkt_res_multi_sdhci->hdr.len = htole32(off);
pkt_res_multi_sdhci->hdr.packet_type = AARUREMOTE_PACKET_TYPE_RESPONSE_MULTI_SDHCI;
pkt_res_multi_sdhci->hdr.version = AARUREMOTE_PACKET_VERSION;
pkt_res_multi_sdhci->hdr.remote_id = htole32(AARUREMOTE_REMOTE_ID);
pkt_res_multi_sdhci->hdr.packet_id = htole32(AARUREMOTE_PACKET_ID);
pkt_res_multi_sdhci->cmd_count = htole64(pkt_cmd_multi_sdhci->cmd_count);
for(n = 0; n < pkt_cmd_multi_sdhci->cmd_count; n++)
{
pkt_res_multi_sdhci->responses[n].duration = htole32(duration);
pkt_res_multi_sdhci->responses[n].error_no = htole32(ret);
pkt_res_multi_sdhci->responses[n].sense = htole32(sense);
pkt_res_multi_sdhci->responses[n].buf_len = htole32(multi_sdhci_commands[n].buf_len);
pkt_res_multi_sdhci->responses[n].response[0] = htole32(multi_sdhci_commands[n].response[0]);
pkt_res_multi_sdhci->responses[n].response[1] = htole32(multi_sdhci_commands[n].response[1]);
pkt_res_multi_sdhci->responses[n].response[2] = htole32(multi_sdhci_commands[n].response[2]);
pkt_res_multi_sdhci->responses[n].response[3] = htole32(multi_sdhci_commands[n].response[3]);
}
off =
(long)(sizeof(AaruPacketMultiResSdhci) + sizeof(AaruResSdhci) * pkt_cmd_multi_sdhci->cmd_count);
for(n = 0; n < pkt_cmd_multi_sdhci->cmd_count; n++)
{
memcpy(out_buf + off, multi_sdhci_commands[n].buffer, multi_sdhci_commands->buf_len);
off += multi_sdhci_commands->buf_len;
}
NetWrite(cli_ctx, pkt_res_sdhci, le32toh(pkt_res_sdhci->hdr.len));
free(multi_sdhci_commands);
free(pkt_cmd_sdhci);
free(pkt_res_sdhci);
continue; continue;
default: default:
pkt_nop->reason_code = AARUREMOTE_PACKET_NOP_REASON_NOT_RECOGNIZED; pkt_nop->reason_code = AARUREMOTE_PACKET_NOP_REASON_NOT_RECOGNIZED;
@@ -1103,6 +1216,6 @@ void* WorkingLoop(void* arguments)
} }
} }
} }
free(pkt_nop); free(pkt_nop);
} }