The-Homebrew-Cloud/wiiload_plugin
2
0
Fork 0
mirror of https://github.com/wiiu-env/wiiload_plugin.git synced 2024-11-25 12:06:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some more cleanup

Browse Source
This commit is contained in:
Maschell 2024-03-16 19:52:37 +01:00
parent d4984dafbe
commit 38355c1c3e
2 changed files with 104 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
src/utils/TcpReceiver.cpp
View File

@ -245,18 +245,17 @@ TcpReceiver::eLoadResults TcpReceiver::loadBinary(void *data, uint32_t fileSize)
return UNSUPPORTED_FORMAT; return UNSUPPORTED_FORMAT;
} }
TcpReceiver::eLoadResults TcpReceiver::uncompressIfNeeded(const uint8_t *haxx, uint32_t fileSize, uint32_t fileSizeUnc, std::unique_ptr<uint8_t> &&in_data, std::unique_ptr<uint8_t> &out_data, uint32_t &fileSizeOut) { std::unique_ptr<uint8_t[]> TcpReceiver::uncompressData(uint32_t fileSize, uint32_t fileSizeUnc, std::unique_ptr<uint8_t[]> &&inData, uint32_t &fileSizeOut, eLoadResults &err) {
// Do we need to unzip this thing? std::unique_ptr<uint8_t[]> inflatedData;
if (haxx[4] > 0 || haxx[5] > 4) { uint8_t *in_data_raw = inData.get();
std::unique_ptr<uint8_t> inflatedData;
uint8_t *in_data_raw = in_data.get();
// We need to unzip... // We need to unzip...
if (in_data_raw[0] == 'P' && in_data_raw[1] == 'K' && in_data_raw[2] == 0x03 && in_data_raw[3] == 0x04) { if (in_data_raw[0] == 'P' && in_data_raw[1] == 'K' && in_data_raw[2] == 0x03 && in_data_raw[3] == 0x04) {
// Section is compressed, inflate // Section is compressed, inflate
inflatedData = make_unique_nothrow<uint8_t>(fileSizeUnc); inflatedData = make_unique_nothrow<uint8_t[]>(fileSizeUnc);
if (!inflatedData) { if (!inflatedData) {
DEBUG_FUNCTION_LINE_ERR("malloc failed"); DEBUG_FUNCTION_LINE_ERR("malloc failed");
return NOT_ENOUGH_MEMORY; err = NOT_ENOUGH_MEMORY;
return {};
} }
int32_t ret; int32_t ret;
@ -269,7 +268,8 @@ TcpReceiver::eLoadResults TcpReceiver::uncompressIfNeeded(const uint8_t *haxx, u
ret = inflateInit(&s); ret = inflateInit(&s);
if (ret != Z_OK) { if (ret != Z_OK) {
DEBUG_FUNCTION_LINE_ERR("inflateInit failed %i", ret); DEBUG_FUNCTION_LINE_ERR("inflateInit failed %i", ret);
return FILE_UNCOMPRESS_ERROR; err = FILE_UNCOMPRESS_ERROR;
return {};
} }
s.avail_in = fileSize; s.avail_in = fileSize;
@ -281,73 +281,51 @@ TcpReceiver::eLoadResults TcpReceiver::uncompressIfNeeded(const uint8_t *haxx, u
ret = inflate(&s, Z_FINISH); ret = inflate(&s, Z_FINISH);
if (ret != Z_OK && ret != Z_STREAM_END) { if (ret != Z_OK && ret != Z_STREAM_END) {
DEBUG_FUNCTION_LINE_ERR("inflate failed %i", ret); DEBUG_FUNCTION_LINE_ERR("inflate failed %i", ret);
return FILE_UNCOMPRESS_ERROR; err = FILE_UNCOMPRESS_ERROR;
return {};
} }
inflateEnd(&s); inflateEnd(&s);
fileSizeOut = fileSizeUnc;
out_data = std::move(inflatedData);
return SUCCESS;
} else { } else {
// Section is compressed, inflate // Section is compressed, inflate
inflatedData = make_unique_nothrow<uint8_t>(fileSizeUnc); inflatedData = make_unique_nothrow<uint8_t[]>(fileSizeUnc);
if (!inflatedData) { if (!inflatedData) {
DEBUG_FUNCTION_LINE_ERR("malloc failed"); DEBUG_FUNCTION_LINE_ERR("malloc failed");
return NOT_ENOUGH_MEMORY; err = NOT_ENOUGH_MEMORY;
return {};
} }
uLongf f = fileSizeUnc; uLongf f = fileSizeUnc;
int32_t result = uncompress((Bytef *) inflatedData.get(), &f, (Bytef *) in_data_raw, fileSize); int32_t result = uncompress((Bytef *) inflatedData.get(), &f, (Bytef *) in_data_raw, fileSize);
if (result != Z_OK) { if (result != Z_OK) {
DEBUG_FUNCTION_LINE_ERR("uncompress failed %i", result); DEBUG_FUNCTION_LINE_ERR("uncompress failed %i", result);
return FILE_UNCOMPRESS_ERROR; err = FILE_UNCOMPRESS_ERROR;
return {};
} }
fileSizeUnc = f; fileSizeUnc = f;
}
fileSizeOut = fileSizeUnc; fileSizeOut = fileSizeUnc;
out_data = std::move(inflatedData); err = SUCCESS;
return SUCCESS; return inflatedData;
}
}
fileSizeOut = fileSize;
out_data = std::move(in_data);
return SUCCESS;
}
TcpReceiver::eLoadResults TcpReceiver::loadToMemory(int32_t clientSocket, uint32_t ipAddress) {
DEBUG_FUNCTION_LINE("Loading file from ip %08X", ipAddress);
uint32_t fileSize = 0;
uint32_t fileSizeUnc = 0;
unsigned char haxx[8] = {};
//skip haxx
if (recvwait(clientSocket, haxx, sizeof(haxx)) != 0) {
return RECV_ERROR;
}
if (recvwait(clientSocket, (unsigned char *) &fileSize, sizeof(fileSize)) != 0) {
return RECV_ERROR;
}
if (haxx[4] > 0 || haxx[5] > 4) {
if (recvwait(clientSocket, (unsigned char *) &fileSizeUnc, sizeof(fileSizeUnc)) != 0) { // Compressed protocol, read another 4 bytes
return RECV_ERROR;
}
} }
std::unique_ptr<uint8_t[]> TcpReceiver::receiveData(int32_t clientSocket, uint32_t fileSize, eLoadResults &err) {
uint32_t bytesRead = 0; uint32_t bytesRead = 0;
auto dataOut = make_unique_nothrow<uint8_t[]>(fileSize);
auto receivedData = make_unique_nothrow<uint8_t>(fileSize); if (!dataOut) {
if (!receivedData) { err = NOT_ENOUGH_MEMORY;
return NOT_ENOUGH_MEMORY; return {};
} }
// Copy rpl in memory // Copy binary in memory
while (bytesRead < fileSize) { while (bytesRead < fileSize) {
uint32_t blockSize = 0x1000; uint32_t blockSize = 0x1000;
if (blockSize > (fileSize - bytesRead)) if (blockSize > (fileSize - bytesRead))
blockSize = fileSize - bytesRead; blockSize = fileSize - bytesRead;
int32_t ret = recv(clientSocket, receivedData.get() + bytesRead, blockSize, 0); int32_t ret = recv(clientSocket, dataOut.get() + bytesRead, blockSize, 0);
if (ret <= 0) { if (ret <= 0) {
DEBUG_FUNCTION_LINE_ERR("Failed to receive file"); DEBUG_FUNCTION_LINE_ERR("Failed to receive file");
break; break;
@ -358,15 +336,42 @@ TcpReceiver::eLoadResults TcpReceiver::loadToMemory(int32_t clientSocket, uint32
if (bytesRead != fileSize) { if (bytesRead != fileSize) {
DEBUG_FUNCTION_LINE_ERR("File loading not finished, %i of %i bytes received", bytesRead, fileSize); DEBUG_FUNCTION_LINE_ERR("File loading not finished, %i of %i bytes received", bytesRead, fileSize);
err = RECV_ERROR;
return {};
}
err = SUCCESS;
return dataOut;
}
TcpReceiver::eLoadResults TcpReceiver::loadToMemory(int32_t clientSocket, uint32_t ipAddress) {
DEBUG_FUNCTION_LINE("Loading file from ip %08X", ipAddress);
uint32_t fileSize = 0;
uint32_t fileSizeUnc = 0;
uint8_t haxx[8] = {};
// read header
if (recvwait(clientSocket, haxx, sizeof(haxx)) != 0) {
return RECV_ERROR; return RECV_ERROR;
} }
if (recvwait(clientSocket, (void *) &fileSize, sizeof(fileSize)) != 0) {
return RECV_ERROR;
std::unique_ptr<uint8_t> finalData; }
eLoadResults err; bool compressedData = (haxx[4] > 0 || haxx[5] > 4);
if ((err = uncompressIfNeeded(haxx, fileSize, fileSizeUnc, std::move(receivedData), finalData, fileSize)) != SUCCESS) { if (compressedData) {
if (recvwait(clientSocket, (void *) &fileSizeUnc, sizeof(fileSizeUnc)) != 0) { // Compressed protocol, read another 4 bytes
return RECV_ERROR;
}
}
TcpReceiver::eLoadResults err = UNSUPPORTED_FORMAT;
auto receivedData = receiveData(clientSocket, fileSize, err);
if (err != SUCCESS) {
return err;
} else if (compressedData) {
receivedData = uncompressData(fileSize, fileSizeUnc, std::move(receivedData), fileSize, err);
if (!receivedData || err != SUCCESS) {
return err; return err;
} }
}
return loadBinary(finalData.get(), fileSize);
return loadBinary(receivedData.get(), fileSize);
} }

3
src/utils/TcpReceiver.h
View File

@ -36,7 +36,8 @@ private:
static TcpReceiver::eLoadResults tryLoadRPX(uint8_t *data, uint32_t fileSize, std::string &loadedPathOut); static TcpReceiver::eLoadResults tryLoadRPX(uint8_t *data, uint32_t fileSize, std::string &loadedPathOut);
static TcpReceiver::eLoadResults tryLoadWPS(uint8_t *data, uint32_t fileSize); static TcpReceiver::eLoadResults tryLoadWPS(uint8_t *data, uint32_t fileSize);
static TcpReceiver::eLoadResults loadBinary(void *data, uint32_t fileSize); static TcpReceiver::eLoadResults loadBinary(void *data, uint32_t fileSize);
static TcpReceiver::eLoadResults uncompressIfNeeded(const uint8_t *haxx, uint32_t fileSize, uint32_t fileSizeUnc, std::unique_ptr<uint8_t> &&in_data, std::unique_ptr<uint8_t> &out_data, uint32_t &fileSizeOut); static std::unique_ptr<uint8_t[]> receiveData(int32_t clientSocket, uint32_t fileSize, eLoadResults &err);
static std::unique_ptr<uint8_t[]> uncompressData(uint32_t fileSize, uint32_t fileSizeUnc, std::unique_ptr<uint8_t[]> &&in_out_data, uint32_t &fileSizeOut, eLoadResults &err);
bool exitRequested; bool exitRequested;
int32_t serverPort; int32_t serverPort;