mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-03 02:14:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove the problematic Multiple Deci tests

Browse Source
This commit is contained in:
Tyler Wilding
2020-09-08 14:12:04 -04:00
parent f8fccbf7a6
commit 871f1b43b0
7 changed files with 24 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/system/Deci2Server.cpp
+6 -6
View File
@@ -63,21 +63,20 @@ bool Deci2Server::init() {
#endif
char opt = 1;
if (set_socket_option(server_socket, SOL_SOCKET, server_socket_opt, &opt, sizeof(opt)) <
0) {
if (set_socket_option(server_socket, SOL_SOCKET, server_socket_opt, &opt, sizeof(opt)) < 0) {
close_server_socket();
return false;
}
if (set_socket_option(server_socket, server_socket_tcp_level, TCP_NODELAY, &opt,
sizeof(opt)) < 0) {
if (set_socket_option(server_socket, server_socket_tcp_level, TCP_NODELAY, &opt, sizeof(opt)) <
0) {
close_server_socket();
return false;
}
// TODO - put in library
#ifdef __linux
timeval timeout = {};
timeval timeout = {};
timeout.tv_sec = 0;
timeout.tv_usec = 100000;
if (set_socket_option(server_socket, SOL_SOCKET, SO_RCVTIMEO, (char*)&timeout, sizeof(timeout)) <
@@ -274,7 +273,8 @@ void Deci2Server::run() {
void Deci2Server::accept_thread_func() {
socklen_t l = sizeof(addr);
while (!kill_accept_thread) {
// TODO - might want to do a WSAStartUp call here as well, else it won't be balanced on the close
// TODO - might want to do a WSAStartUp call here as well, else it won't be balanced on the
// close
new_sock = accept(server_socket, (sockaddr*)&addr, &l);
if (new_sock >= 0) {
u32 versions[2] = {versions::GOAL_VERSION_MAJOR, versions::GOAL_VERSION_MINOR};