The-Homebrew-Cloud/ftpiiu_plugin
2
0
Fork 0
mirror of https://github.com/wiiu-env/ftpiiu_plugin.git synced 2024-12-23 19:31:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous fixes

Browse Source
This commit is contained in:
TuxSH 2018-02-19 19:35:46 +01:00 committed by mtheall
parent 9163d46529
commit d1df76b0ea
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/console.c
View File

@ -279,7 +279,6 @@ console_render(void)
gfxFlushBuffers(); gfxFlushBuffers();
gfxSwapBuffers(); gfxSwapBuffers();
gfxWaitForVsync(); gfxWaitForVsync();
} }
#else #else

49
source/ftp.c
View File

@ -37,12 +37,23 @@
#define POLL_UNKNOWN (~(POLLIN|POLLPRI|POLLOUT)) #define POLL_UNKNOWN (~(POLLIN|POLLPRI|POLLOUT))
#ifndef SWITCH
#define XFER_BUFFERSIZE 32768 #define XFER_BUFFERSIZE 32768
#define SOCK_BUFFERSIZE 32768 #define SOCK_BUFFERSIZE 32768
#define FILE_BUFFERSIZE 65536 #define FILE_BUFFERSIZE 65536
#define CMD_BUFFERSIZE 4096 #define CMD_BUFFERSIZE 4096
#else
/* we have a lot of memory to waste on the Switch */
#define XFER_BUFFERSIZE 65536
#define SOCK_BUFFERSIZE 65536
#define FILE_BUFFERSIZE 1048576
#define CMD_BUFFERSIZE 4096
#endif
#ifdef _3DS
#define SOCU_ALIGN 0x1000 #define SOCU_ALIGN 0x1000
#define SOCU_BUFFERSIZE 0x100000 #define SOCU_BUFFERSIZE 0x100000
#endif
#define LISTEN_PORT 5000 #define LISTEN_PORT 5000
#ifdef _3DS #ifdef _3DS
#define DATA_PORT (LISTEN_PORT+1) #define DATA_PORT (LISTEN_PORT+1)
@ -368,6 +379,8 @@ ftp_closesocket(int fd,
socklen_t addrlen = sizeof(addr); socklen_t addrlen = sizeof(addr);
struct pollfd pollinfo; struct pollfd pollinfo;
// console_print("0x%X\n", socketGetLastBsdResult());
if(connected) if(connected)
{ {
/* get peer address and print */ /* get peer address and print */
@ -1800,6 +1813,24 @@ update_status(void)
inet_ntoa(serv_addr.sin_addr), inet_ntoa(serv_addr.sin_addr),
ntohs(serv_addr.sin_port)); ntohs(serv_addr.sin_port));
update_free_space(); update_free_space();
#elif 0//defined(SWITCH)
char hostname[128];
socklen_t addrlen = sizeof(serv_addr);
int rc;
rc = gethostname(hostname, sizeof(hostname));
if(rc != 0)
{
console_print(RED "gethostname: %d %s\n" RESET, errno, strerror(errno));
return -1;
}
console_set_status("\n" GREEN STATUS_STRING " test "
#ifdef ENABLE_LOGGING
"DEBUG "
#endif
CYAN "%s:%u" RESET,
hostname,
ntohs(serv_addr.sin_port));
update_free_space();
#else #else
char hostname[128]; char hostname[128];
socklen_t addrlen = sizeof(serv_addr); socklen_t addrlen = sizeof(serv_addr);
@ -1812,13 +1843,12 @@ update_status(void)
return -1; return -1;
} }
strcpy(hostname, "banana"); rc = gethostname(hostname, sizeof(hostname));
/*rc = gethostname(hostname, sizeof(hostname));
if(rc != 0) if(rc != 0)
{ {
console_print(RED "gethostname: %d %s\n" RESET, errno, strerror(errno)); console_print(RED "gethostname: %d %s\n" RESET, errno, strerror(errno));
return -1; return -1;
}*/ }
console_set_status(GREEN STATUS_STRING " " console_set_status(GREEN STATUS_STRING " "
#ifdef ENABLE_LOGGING #ifdef ENABLE_LOGGING
@ -1880,6 +1910,8 @@ static void
applet_hook(AppletHookType type, applet_hook(AppletHookType type,
void *closure) void *closure)
{ {
(void)closure;
(void)type;
/* stubbed for now */ /* stubbed for now */
switch(type) switch(type)
{ {
@ -1952,21 +1984,20 @@ ftp_init(void)
goto soc_fail; goto soc_fail;
} }
#elif defined(SWITCH) #elif defined(SWITCH)
/* we have a lot of memory available so let's use c.a. 360MB */
static const SocketInitConfig socketInitConfig = { static const SocketInitConfig socketInitConfig = {
.bsdsockets_version = 1, .bsdsockets_version = 1,
.tcp_tx_buf_size = 20 << 20, .tcp_tx_buf_size = 8 * SOCK_BUFFERSIZE,
.tcp_rx_buf_size = 20 << 20, .tcp_rx_buf_size = 8 * SOCK_BUFFERSIZE,
.tcp_tx_buf_max_size = 20 << 20, .tcp_tx_buf_max_size = 16 * SOCK_BUFFERSIZE,
.tcp_rx_buf_max_size = 20 << 20, .tcp_rx_buf_max_size = 16 * SOCK_BUFFERSIZE,
/* we aren't using UDP at all, let's just use the default sizes */
.udp_tx_buf_size = 0x2400, .udp_tx_buf_size = 0x2400,
.udp_rx_buf_size = 0xA500, .udp_rx_buf_size = 0xA500,
.sb_efficiency = 8, .sb_efficiency = 8,
}; };
Result ret = socketInitialize(&socketInitConfig); Result ret = socketInitialize(&socketInitConfig);
if(ret != 0) if(ret != 0)
{ {