diff options
| author | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2020-05-22 00:50:18 +0200 |
|---|---|---|
| committer | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2020-05-22 00:52:52 +0200 |
| commit | 004a30545873496d279b4975ba74f3d334291dfe (patch) | |
| tree | 13b560397d541bef4e61af84e49edb8be66c0e7d | |
| parent | da7b01b26d58d3a4757ba19bf986e2307d139162 (diff) | |
client_socket was being accidentally reset to -1
That was making the telnet debug server to crash, so fortunately that
solved it while also having the neat features from dynstr.
| -rw-r--r-- | libpcsxcore/debug.c | 24 | ||||
| -rw-r--r-- | libpcsxcore/socket.c | 3 |
2 files changed, 21 insertions, 6 deletions
diff --git a/libpcsxcore/debug.c b/libpcsxcore/debug.c index e2e2992f..463df73b 100644 --- a/libpcsxcore/debug.c +++ b/libpcsxcore/debug.c @@ -395,7 +395,16 @@ void DebugVSync() { return; } - client_socket = GetClient(server_socket); + if (client_socket < 1) + { + client_socket = GetClient(server_socket); + + if (client_socket > 0) + { + DebugHello(); + } + } + ProcessCommands(); } @@ -466,7 +475,17 @@ void ProcessDebug() { } } while (paused) { - client_socket = GetClient(server_socket); + + if (client_socket < 1) + { + client_socket = GetClient(server_socket); + + if (client_socket > 0) + { + DebugHello(); + } + } + ProcessCommands(); GPU_updateLace(); SysUpdate(); @@ -497,7 +516,6 @@ static void ProcessCommands() { case READ_SOCKET_SHUTDOWN: /* Fall through. */ default: - perror("recv() error"); return; } diff --git a/libpcsxcore/socket.c b/libpcsxcore/socket.c index d50bd22d..2755aaa1 100644 --- a/libpcsxcore/socket.c +++ b/libpcsxcore/socket.c @@ -157,15 +157,12 @@ static enum read_socket_err ReadSocketOS(int client_socket, char *buf, size_t *c switch (res) { case -1: - fprintf(stderr, "READ_SOCKET_ERR_RECV, recv(%d, %p, %zu, %d)\n", client_socket, buf, *len, 0); return READ_SOCKET_ERR_RECV; case 0: - fprintf(stderr, "READ_SOCKET_SHUTDOWN\n"); return READ_SOCKET_SHUTDOWN; default: - printf("received %zu/%zu bytes\n", res, *len); *len = res; break; } |
