mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid long connection hang in nxlink

Browse Source
This commit is contained in:
Michael Theall 2023-03-03 01:16:06 -06:00
parent ada230a882
commit 7fc278c597
1 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
nx/source/runtime/nxlink_stdio.c
View File

@ -1,22 +1,41 @@
#include "runtime/nxlink.h" #include "runtime/nxlink.h"
#include <string.h>
#include <stdio.h>
#include <sys/socket.h>
#include <sys/errno.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
#include <poll.h>
#include <stdio.h>
#include <string.h>
#include <sys/errno.h>
#include <sys/socket.h>
#include <unistd.h> #include <unistd.h>
static int sock = -1; static int sock = -1;
int nxlinkConnectToHost(bool redirStdout, bool redirStderr) int nxlinkConnectToHost(bool redirStdout, bool redirStderr)
{ {
int ret = -1; if (!__nxlink_host.s_addr) {
errno = ENETUNREACH;
return -1;
}
struct sockaddr_in srv_addr; struct sockaddr_in srv_addr;
sock = socket(AF_INET, SOCK_STREAM, 0); sock = socket(AF_INET, SOCK_STREAM, 0);
if (!sock) { if (sock < 0) {
return ret; return -1;
}
// set to non-blocking
int flags = fcntl(sock, F_GETFL, 0);
if (flags == -1) {
close(sock);
return -1;
}
if (fcntl(sock, F_SETFL, flags | O_NONBLOCK) != 0) {
close(sock);
return -1;
} }
bzero(&srv_addr, sizeof srv_addr); bzero(&srv_addr, sizeof srv_addr);
@ -24,8 +43,36 @@ int nxlinkConnectToHost(bool redirStdout, bool redirStderr)
srv_addr.sin_addr = __nxlink_host; srv_addr.sin_addr = __nxlink_host;
srv_addr.sin_port = htons(NXLINK_CLIENT_PORT); srv_addr.sin_port = htons(NXLINK_CLIENT_PORT);
ret = connect(sock, (struct sockaddr *) &srv_addr, sizeof(srv_addr)); int ret = connect(sock, (struct sockaddr *) &srv_addr, sizeof(srv_addr));
if (ret != 0) { if (ret != 0 && errno != EINPROGRESS) {
int err = errno;
close(sock);
close(err);
return -1;
}
if (ret != 0) { // EINPROGRESS
struct pollfd pfd;
pfd.fd = sock;
pfd.events = POLLOUT;
pfd.revents = 0;
int n = poll(&pfd, 1, 1000); // only wait up to 1s to connect
if (n < 0) {
close(sock);
return -1;
}
if (n == 0 || !(pfd.revents & POLLOUT)) {
close(sock);
errno = ETIMEDOUT;
return -1;
}
}
// reset back to blocking
if (fcntl(sock, F_SETFL, flags & ~O_NONBLOCK) != 0) {
close(sock); close(sock);
return -1; return -1;
} }