Game-Decompilation/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-11-24 06:39:51 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix Listener Socket Timeout on Windows (#28)

Browse Source 
* try checking for timeouts differently on windows

* hopefully this test fails on windows

* hopefully this test passes on windows

* remove debug prints

* remove commented otu code
This commit is contained in:
water111 2020-09-09 20:14:13 -04:00 committed by GitHub
parent a19755a816
commit 01883da47e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/cross_sockets/xsocket.cpp
View File

@ -86,3 +86,12 @@ int read_from_socket(int socket, char* buf, int len) {
return recv(socket, buf, len, 0);
#endif
}
bool socket_timed_out() {
#ifdef __linux
return errno == EAGAIN;
#elif _WIN32
auto err = WSAGetLastError();
return err == WSAETIMEDOUT;
#endif
}

1
common/cross_sockets/xsocket.h
View File

@ -18,3 +18,4 @@ int set_socket_option(int socket, int level, int optname, const void* optval, in
int set_socket_timeout(int socket, long microSeconds);
int write_to_socket(int socket, const char* buf, int len);
int read_from_socket(int socket, char* buf, int len);
bool socket_timed_out();

13
goalc/listener/Listener.cpp
View File

@ -123,7 +123,7 @@ bool Listener::connect_to_target(int n_tries, const std::string& ip, int port) {
listen_socket = -1;
return false;
} else {
printf("[Listener] Socket connected established! (took %d tries)\n", i);
printf("[Listener] Socket connected established! (took %d tries). Waiting for version...\n", i);
}
// get the GOAL version number, to make sure we connected to the right thing
@ -133,11 +133,8 @@ bool Listener::connect_to_target(int n_tries, const std::string& ip, int port) {
bool ok = true;
while (prog < 8) {
auto r = read_from_socket(listen_socket, (char*)version_buffer + prog, 8 - prog);
if (r < 0) {
ok = false;
break;
}
prog += r;
std::this_thread::sleep_for(std::chrono::microseconds(100000));
prog += r > 0 ? r : 0;
read_tries++;
if (read_tries > 50) {
ok = false;
@ -181,7 +178,7 @@ void Listener::receive_func() {
rcvd += got > 0 ? got : 0;
// kick us out if we got a bogus read result
if (got == 0 || (got == -1 && errno != EAGAIN)) {
if (got == 0 || (got == -1 && !socket_timed_out())) {
m_connected = false;
}
@ -238,7 +235,7 @@ void Listener::receive_func() {
got = got > 0 ? got : 0;
rcvd += got;
msg_prog += got;
if (got == 0 || (got == -1 && errno != EAGAIN)) {
if (got == 0 || (got == -1 && !socket_timed_out())) {
m_connected = false;
}
}

18
test/test_listener_deci2.cpp
View File

@ -45,6 +45,24 @@ TEST(Listener, DeciCheckNoListener) {
EXPECT_FALSE(s.check_for_listener());
}
TEST(Listener, CheckConnectionStaysAlive) {
Deci2Server s(always_false);
EXPECT_TRUE(s.init());
EXPECT_FALSE(s.check_for_listener());
Listener l;
EXPECT_FALSE(s.check_for_listener());
bool connected = l.connect_to_target();
EXPECT_TRUE(connected);
// TODO - some sort of backoff and retry would be better
while (connected && !s.check_for_listener()) {
}
EXPECT_TRUE(s.check_for_listener());
std::this_thread::sleep_for(std::chrono::seconds(2)); // sorry for making tests slow.
EXPECT_TRUE(s.check_for_listener());
EXPECT_TRUE(l.is_connected());
}
TEST(Listener, DeciThenListener) {
for (int i = 0; i < 3; i++) {
Deci2Server s(always_false);