nyyu/Awoo-Installer
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some changes to socket handling

Browse Source
This commit is contained in:
Huntereb 2020-09-25 12:07:45 -04:00
parent 0c929ca357
commit 1446217d1e
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/netInstall.hpp
View File

@ -22,6 +22,8 @@ SOFTWARE.
#include <vector> #include <vector>
namespace netInstStuff { namespace netInstStuff {
void OnUnwound();
void sendExitCommands();
void installTitleNet(std::vector<std::string> ourUrlList, int ourStorage, std::vector<std::string> urlListAltNames, std::string ourSource); void installTitleNet(std::vector<std::string> ourUrlList, int ourStorage, std::vector<std::string> urlListAltNames, std::string ourSource);
std::vector<std::string> OnSelected(); std::vector<std::string> OnSelected();
} }

19
source/netInstall.cpp
View File

@ -108,6 +108,17 @@ namespace netInstStuff{
curl_global_cleanup(); curl_global_cleanup();
} }
void sendExitCommands()
{
LOG_DEBUG("Telling the server we're done installing\n");
// Send 1 byte ack to close the server, OG tinfoil compatibility
u8 ack = 0;
tin::network::WaitSendNetworkData(m_clientSocket, &ack, sizeof(u8));
// Send 'DEAD\r\n' so ns-usbloader knows we're done
//u8 nsUsbAck [6] = {0x44,0x45,0x41,0x44,0x0D,0x0A};
//tin::network::WaitSendNetworkData(m_clientSocket, &nsUsbAck, sizeof(u8) * 6);
}
void installTitleNet(std::vector<std::string> ourUrlList, int ourStorage, std::vector<std::string> urlListAltNames, std::string ourSource) void installTitleNet(std::vector<std::string> ourUrlList, int ourStorage, std::vector<std::string> urlListAltNames, std::string ourSource)
{ {
inst::util::initInstallServices(); inst::util::initInstallServices();
@ -178,10 +189,8 @@ namespace netInstStuff{
inst::util::setClockSpeed(2, previousClockValues[2]); inst::util::setClockSpeed(2, previousClockValues[2]);
} }
LOG_DEBUG("Telling the server we're done installing\n"); sendExitCommands();
// Send 1 byte ack to close the server OnUnwound();
u8 ack = 0;
tin::network::WaitSendNetworkData(m_clientSocket, &ack, sizeof(u8));
if(nspInstalled) { if(nspInstalled) {
inst::ui::instPage::setInstInfoText("inst.info_page.complete"_lang); inst::ui::instPage::setInstInfoText("inst.info_page.complete"_lang);
@ -206,8 +215,6 @@ namespace netInstStuff{
u64 freq = armGetSystemTickFreq(); u64 freq = armGetSystemTickFreq();
u64 startTime = armGetSystemTick(); u64 startTime = armGetSystemTick();
OnUnwound();
try try
{ {
ASSERT_OK(curl_global_init(CURL_GLOBAL_ALL), "Curl failed to initialized"); ASSERT_OK(curl_global_init(CURL_GLOBAL_ALL), "Curl failed to initialized");

3
source/ui/netInstPage.cpp
View File

@ -156,6 +156,9 @@ namespace inst::ui {
void netInstPage::onInput(u64 Down, u64 Up, u64 Held, pu::ui::Touch Pos) { void netInstPage::onInput(u64 Down, u64 Up, u64 Held, pu::ui::Touch Pos) {
if (Down & KEY_B) { if (Down & KEY_B) {
if (this->menu->GetItems().size() > 0) {}
netInstStuff::sendExitCommands();
netInstStuff::OnUnwound();
mainApp->LoadLayout(mainApp->mainPage); mainApp->LoadLayout(mainApp->mainPage);
} }
if ((Down & KEY_A) || (Up & KEY_TOUCH)) { if ((Down & KEY_A) || (Up & KEY_TOUCH)) {

4
source/util/network_util.cpp
View File

@ -235,7 +235,7 @@ namespace tin::network
int ret = 0; int ret = 0;
size_t read = 0; size_t read = 0;
while ((((ret = recv(sockfd, (u8*)buf + read, len - read, 0)) > 0 && (read += ret) < len) || errno == EAGAIN) && !(hidKeysDown(CONTROLLER_P1_AUTO) & KEY_B)) while ((((ret = recv(sockfd, (u8*)buf + read, len - read, 0)) > 0 && (read += ret) < len) || errno == EAGAIN))
{ {
errno = 0; errno = 0;
} }
@ -249,7 +249,7 @@ namespace tin::network
int ret = 0; int ret = 0;
size_t written = 0; size_t written = 0;
while ((((ret = send(sockfd, (u8*)buf + written, len - written, 0)) > 0 && (written += ret) < len) || errno == EAGAIN) && !(hidKeysDown(CONTROLLER_P1_AUTO) & KEY_B)) while ((((ret = send(sockfd, (u8*)buf + written, len - written, 0)) > 0 && (written += ret) < len) || errno == EAGAIN))
{ {
errno = 0; errno = 0;
} }