mirror of
https://github.com/Genymobile/scrcpy
synced 2024-12-26 00:52:20 +00:00
Simplify server_connect_to()
Only use 2 branches, using either forward or remote tunnel.
This commit is contained in:
parent
5a431cdf9b
commit
8fc58bde75
@ -223,20 +223,20 @@ bool
|
||||
server_connect_to(struct server *server) {
|
||||
if (!server->tunnel_forward) {
|
||||
server->device_socket = net_accept(server->server_socket);
|
||||
if (server->device_socket == INVALID_SOCKET) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// we don't need the server socket anymore
|
||||
close_socket(&server->server_socket);
|
||||
} else {
|
||||
uint32_t attempts = 100;
|
||||
uint32_t delay = 100; // ms
|
||||
server->device_socket = connect_to_server(server->local_port, attempts,
|
||||
delay);
|
||||
}
|
||||
|
||||
if (server->device_socket == INVALID_SOCKET) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!server->tunnel_forward) {
|
||||
// we don't need the server socket anymore
|
||||
close_socket(&server->server_socket);
|
||||
}
|
||||
|
||||
// we don't need the adb tunnel anymore
|
||||
|
Loading…
Reference in New Issue
Block a user