mirror of
https://github.com/wiiu-env/homebrew_launcher.git
synced 2024-11-05 20:45:08 +01:00
Remove the TCPReceiver.
This commit is contained in:
Maschell
parent
764bfbcd3c
commit
cc2fd2e414
@ -46,11 +46,8 @@ HomebrewWindow::HomebrewWindow(int w, int h)
|
||||
, touchTrigger(GuiTrigger::CHANNEL_1, GuiTrigger::VPAD_TOUCH)
|
||||
, wpadTouchTrigger(GuiTrigger::CHANNEL_2 | GuiTrigger::CHANNEL_3 | GuiTrigger::CHANNEL_4 | GuiTrigger::CHANNEL_5, GuiTrigger::BUTTON_A)
|
||||
, buttonLTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_L | GuiTrigger::BUTTON_LEFT, true)
|
||||
, buttonRTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_R | GuiTrigger::BUTTON_RIGHT, true)
|
||||
, tcpReceiver(DEFAULT_WIILOAD_PORT) {
|
||||
tcpReceiver.serverReceiveStart.connect(this, &HomebrewWindow::OnTcpReceiveStart);
|
||||
tcpReceiver.serverReceiveFinished.connect(this, &HomebrewWindow::OnTcpReceiveFinish);
|
||||
|
||||
, buttonRTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_R | GuiTrigger::BUTTON_RIGHT, true) {
|
||||
|
||||
targetLeftPosition = 0;
|
||||
currentLeftPosition = 0;
|
||||
listOffset = 0;
|
||||
@ -287,30 +284,3 @@ void HomebrewWindow::draw(CVideo *pVideo) {
|
||||
|
||||
GuiFrame::draw(pVideo);
|
||||
}
|
||||
|
||||
void HomebrewWindow::OnCloseTcpReceiverFinish(GuiElement *element) {
|
||||
//! remove element from draw list and push to delete queue
|
||||
remove(element);
|
||||
clearState(STATE_DISABLED);
|
||||
}
|
||||
|
||||
void HomebrewWindow::OnTcpReceiveStart(GuiElement *element, uint32_t ip) {
|
||||
element->setEffect(EFFECT_FADE, 15, 255);
|
||||
element->effectFinished.connect(this, &HomebrewWindow::OnOpenEffectFinish);
|
||||
append(element);
|
||||
}
|
||||
|
||||
void HomebrewWindow::OnTcpReceiveFinish(GuiElement *element, uint32_t ip, int result) {
|
||||
element->setState(GuiElement::STATE_DISABLED);
|
||||
element->setEffect(EFFECT_FADE, -10, 0);
|
||||
element->effectFinished.connect(this, &HomebrewWindow::OnCloseTcpReceiverFinish);
|
||||
|
||||
if(result >= 0) {
|
||||
if(HomebrewLoader::loadToMemory(HBL_TEMP_RPX_FILE) > 0) {
|
||||
SYSRelaunchTitle(0,NULL);
|
||||
}
|
||||
} else {
|
||||
DEBUG_FUNCTION_LINE("TCP loading failed with error code %d\n", result);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
|
||||
#include "gui/Gui.h"
|
||||
#include "gui/GuiFrame.h"
|
||||
#include "TcpReceiver.h"
|
||||
|
||||
class HomebrewWindow : public GuiFrame, public sigslot::has_slots<> {
|
||||
public:
|
||||
@ -36,10 +35,6 @@ private:
|
||||
void OnLeftArrowClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger);
|
||||
void OnRightArrowClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger);
|
||||
|
||||
void OnCloseTcpReceiverFinish(GuiElement *element);
|
||||
void OnTcpReceiveStart(GuiElement *element, uint32_t ip);
|
||||
void OnTcpReceiveFinish(GuiElement *element, uint32_t ip, int result);
|
||||
|
||||
GuiSound *buttonClickSound;
|
||||
GuiImageData * homebrewButtonImgData;
|
||||
|
||||
@ -69,8 +64,6 @@ private:
|
||||
int listOffset;
|
||||
int currentLeftPosition;
|
||||
int targetLeftPosition;
|
||||
|
||||
TcpReceiver tcpReceiver;
|
||||
};
|
||||
|
||||
#endif //_HOMEBREW_WINDOW_H_
|
||||
|
||||
@ -1,249 +0,0 @@
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
#include <string.h>
|
||||
#include <zlib.h>
|
||||
#include <nsysnet/socket.h>
|
||||
|
||||
#include "TcpReceiver.h"
|
||||
#include "fs/CFile.hpp"
|
||||
#include "fs/FSUtils.h"
|
||||
#include "utils/logger.h"
|
||||
#include "utils/StringTools.h"
|
||||
#include "utils/net.h"
|
||||
#include "common/common.h"
|
||||
|
||||
TcpReceiver::TcpReceiver(int port)
|
||||
: GuiFrame(0, 0)
|
||||
, CThread(CThread::eAttributeAffCore0 | CThread::eAttributePinnedAff)
|
||||
, exitRequested(false)
|
||||
, serverPort(port)
|
||||
, serverSocket(-1)
|
||||
, progressWindow("Receiving file...") {
|
||||
width = progressWindow.getWidth();
|
||||
height = progressWindow.getHeight();
|
||||
append(&progressWindow);
|
||||
resumeThread();
|
||||
}
|
||||
|
||||
TcpReceiver::~TcpReceiver() {
|
||||
exitRequested = true;
|
||||
|
||||
if(serverSocket >= 0) {
|
||||
shutdown(serverSocket, SHUT_RDWR);
|
||||
}
|
||||
}
|
||||
|
||||
void TcpReceiver::executeThread() {
|
||||
serverSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
|
||||
if (serverSocket < 0) {
|
||||
log_printf("Server socket create failed\n");
|
||||
return;
|
||||
}
|
||||
|
||||
uint32_t enable = 1;
|
||||
setsockopt(serverSocket, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
|
||||
|
||||
struct sockaddr_in bindAddress;
|
||||
memset(&bindAddress, 0, sizeof(bindAddress));
|
||||
bindAddress.sin_family = AF_INET;
|
||||
bindAddress.sin_port = serverPort;
|
||||
bindAddress.sin_addr.s_addr = INADDR_ANY;
|
||||
|
||||
int32_t ret;
|
||||
if ((ret = bind(serverSocket, (struct sockaddr *)&bindAddress, sizeof(bindAddress))) < 0) {
|
||||
log_printf("Server socket bind failed\n");
|
||||
socketclose(serverSocket);
|
||||
return;
|
||||
}
|
||||
|
||||
if ((ret = listen(serverSocket, 1)) < 0) {
|
||||
log_printf("Server socket listen failed\n");
|
||||
socketclose(serverSocket);
|
||||
return;
|
||||
}
|
||||
|
||||
struct sockaddr_in clientAddr;
|
||||
memset(&clientAddr, 0, sizeof(clientAddr));
|
||||
socklen_t addrlen = sizeof(clientAddr);
|
||||
|
||||
while(!exitRequested) {
|
||||
int32_t clientSocket = accept(serverSocket, (struct sockaddr*)&clientAddr, &addrlen);
|
||||
if(clientSocket >= 0) {
|
||||
uint32_t ipAddress = clientAddr.sin_addr.s_addr;
|
||||
serverReceiveStart(this, ipAddress);
|
||||
int result = loadToMemory(clientSocket, ipAddress);
|
||||
serverReceiveFinished(this, ipAddress, result);
|
||||
socketclose(clientSocket);
|
||||
|
||||
if(result > 0)
|
||||
break;
|
||||
} else {
|
||||
log_printf("Server socket accept failed %i\n", clientSocket);
|
||||
usleep(100000);
|
||||
}
|
||||
}
|
||||
|
||||
socketclose(serverSocket);
|
||||
}
|
||||
|
||||
int TcpReceiver::loadToMemory(int32_t clientSocket, uint32_t ipAddress) {
|
||||
log_printf("Loading file from ip %08X\n", ipAddress);
|
||||
|
||||
uint32_t fileSize = 0;
|
||||
uint32_t fileSizeUnc = 0;
|
||||
unsigned char haxx[8];
|
||||
memset(haxx, 0, sizeof(haxx));
|
||||
//skip haxx
|
||||
recvwait(clientSocket, haxx, sizeof(haxx));
|
||||
recvwait(clientSocket, (unsigned char*)&fileSize, sizeof(fileSize));
|
||||
|
||||
if (haxx[4] > 0 || haxx[5] > 4) {
|
||||
recvwait(clientSocket, (unsigned char*)&fileSizeUnc, sizeof(fileSizeUnc)); // Compressed protocol, read another 4 bytes
|
||||
}
|
||||
|
||||
uint32_t bytesRead = 0;
|
||||
struct in_addr in;
|
||||
in.s_addr = ipAddress;
|
||||
progressWindow.setTitle(StringTools::strfmt("Loading file from %s", inet_ntoa(in)));
|
||||
|
||||
log_printf("transfer start\n");
|
||||
|
||||
unsigned char* loadAddress = (unsigned char*)memalign(0x40, fileSize);
|
||||
if(!loadAddress) {
|
||||
progressWindow.setTitle("Not enough memory");
|
||||
sleep(1);
|
||||
return NOT_ENOUGH_MEMORY;
|
||||
}
|
||||
|
||||
// Copy rpl in memory
|
||||
while(bytesRead < fileSize) {
|
||||
progressWindow.setProgress(100.0f * (float)bytesRead / (float)fileSize);
|
||||
|
||||
uint32_t blockSize = 0x1000;
|
||||
if(blockSize > (fileSize - bytesRead))
|
||||
blockSize = fileSize - bytesRead;
|
||||
|
||||
int ret = recv(clientSocket, loadAddress + bytesRead, blockSize, 0);
|
||||
if(ret <= 0) {
|
||||
log_printf("Failure on reading file\n");
|
||||
break;
|
||||
}
|
||||
|
||||
bytesRead += ret;
|
||||
}
|
||||
|
||||
progressWindow.setProgress((float)bytesRead / (float)fileSize);
|
||||
|
||||
if(bytesRead != fileSize) {
|
||||
free(loadAddress);
|
||||
log_printf("File loading not finished, %i of %i bytes received\n", bytesRead, fileSize);
|
||||
progressWindow.setTitle("Receive incomplete");
|
||||
sleep(1);
|
||||
return FILE_READ_ERROR;
|
||||
}
|
||||
|
||||
int res = -1;
|
||||
|
||||
// Do we need to unzip this thing?
|
||||
if (haxx[4] > 0 || haxx[5] > 4) {
|
||||
unsigned char* inflatedData = NULL;
|
||||
|
||||
// We need to unzip...
|
||||
if (loadAddress[0] == 'P' && loadAddress[1] == 'K' && loadAddress[2] == 0x03 && loadAddress[3] == 0x04) {
|
||||
//! TODO:
|
||||
//! mhmm this is incorrect, it has to parse the zip
|
||||
|
||||
// Section is compressed, inflate
|
||||
inflatedData = (unsigned char*)malloc(fileSizeUnc);
|
||||
if(!inflatedData) {
|
||||
free(loadAddress);
|
||||
progressWindow.setTitle("Not enough memory");
|
||||
sleep(1);
|
||||
return NOT_ENOUGH_MEMORY;
|
||||
}
|
||||
|
||||
int ret = 0;
|
||||
z_stream s;
|
||||
memset(&s, 0, sizeof(s));
|
||||
|
||||
s.zalloc = Z_NULL;
|
||||
s.zfree = Z_NULL;
|
||||
s.opaque = Z_NULL;
|
||||
|
||||
ret = inflateInit(&s);
|
||||
if (ret != Z_OK) {
|
||||
free(loadAddress);
|
||||
free(inflatedData);
|
||||
progressWindow.setTitle("Uncompress failure");
|
||||
sleep(1);
|
||||
return FILE_READ_ERROR;
|
||||
}
|
||||
|
||||
s.avail_in = fileSize;
|
||||
s.next_in = (Bytef *)(&loadAddress[0]);
|
||||
|
||||
s.avail_out = fileSizeUnc;
|
||||
s.next_out = (Bytef *)&inflatedData[0];
|
||||
|
||||
ret = inflate(&s, Z_FINISH);
|
||||
if (ret != Z_OK && ret != Z_STREAM_END) {
|
||||
free(loadAddress);
|
||||
free(inflatedData);
|
||||
progressWindow.setTitle("Uncompress failure");
|
||||
sleep(1);
|
||||
return FILE_READ_ERROR;
|
||||
}
|
||||
|
||||
inflateEnd(&s);
|
||||
fileSize = fileSizeUnc;
|
||||
} else {
|
||||
// Section is compressed, inflate
|
||||
inflatedData = (unsigned char*)malloc(fileSizeUnc);
|
||||
if(!inflatedData) {
|
||||
free(loadAddress);
|
||||
progressWindow.setTitle("Not enough memory");
|
||||
sleep(1);
|
||||
return NOT_ENOUGH_MEMORY;
|
||||
}
|
||||
|
||||
uLongf f = fileSizeUnc;
|
||||
int result = uncompress((Bytef*)&inflatedData[0], &f, (Bytef*)loadAddress, fileSize);
|
||||
if(result != Z_OK) {
|
||||
log_printf("uncompress failed %i\n", result);
|
||||
progressWindow.setTitle("Uncompress failure");
|
||||
sleep(1);
|
||||
return FILE_READ_ERROR;
|
||||
}
|
||||
|
||||
fileSizeUnc = f;
|
||||
fileSize = fileSizeUnc;
|
||||
}
|
||||
|
||||
free(loadAddress);
|
||||
|
||||
FSUtils::CreateSubfolder(HBL_TEMP_RPX_PATH);
|
||||
if(!FSUtils::saveBufferToFile(HBL_TEMP_RPX_FILE, loadAddress, fileSize)) {
|
||||
res = FILE_SAVE_ERROR;
|
||||
} else {
|
||||
res = 1;
|
||||
}
|
||||
|
||||
free(inflatedData);
|
||||
} else {
|
||||
FSUtils::CreateSubfolder(HBL_TEMP_RPX_PATH);
|
||||
if(!FSUtils::saveBufferToFile(HBL_TEMP_RPX_FILE, loadAddress, fileSize)) {
|
||||
res = FILE_SAVE_ERROR;
|
||||
} else {
|
||||
res = 1;
|
||||
}
|
||||
free(loadAddress);
|
||||
}
|
||||
|
||||
if(res < 0) {
|
||||
progressWindow.setTitle("Failed");
|
||||
sleep(1);
|
||||
return res;
|
||||
}
|
||||
|
||||
return fileSize;
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
#ifndef TCP_RECEIVER_H_
|
||||
#define TCP_RECEIVER_H_
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
#include "ProgressWindow.h"
|
||||
#include "system/CThread.h"
|
||||
#include "gui/sigslot.h"
|
||||
|
||||
class TcpReceiver : public GuiFrame, public CThread {
|
||||
public:
|
||||
enum eLoadResults {
|
||||
SUCCESS = 0,
|
||||
INVALID_INPUT = -1,
|
||||
FILE_OPEN_FAILURE = -2,
|
||||
FILE_READ_ERROR = -3,
|
||||
NOT_ENOUGH_MEMORY = -4,
|
||||
FILE_SAVE_ERROR = -5,
|
||||
};
|
||||
|
||||
TcpReceiver(int port);
|
||||
~TcpReceiver();
|
||||
|
||||
sigslot::signal2<GuiElement *, uint32_t> serverReceiveStart;
|
||||
sigslot::signal3<GuiElement *, uint32_t, int> serverReceiveFinished;
|
||||
|
||||
private:
|
||||
|
||||
void executeThread();
|
||||
int loadToMemory(int32_t clientSocket, uint32_t ipAddress);
|
||||
|
||||
bool exitRequested;
|
||||
int32_t serverPort;
|
||||
int32_t serverSocket;
|
||||
ProgressWindow progressWindow;
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user