mirrors/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-04-20 19:45:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable ADB tunnel in SSH mode.

Browse source
This commit is contained in:
Vladimir Chebotarev 2020-09-06 16:23:47 +03:00
parent b93dce952b
commit 3bdd6acb53
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/src/server.c
View file

@ -394,7 +394,7 @@ server_start(struct server *server, const char *serial,
goto error1;
}
if (!enable_tunnel_any_port(server, params->port_range,
if (!params->use_ssh && !enable_tunnel_any_port(server, params->port_range,
params->force_adb_forward)) {
goto error1;
}
@ -419,20 +419,23 @@ server_start(struct server *server, const char *serial,
goto error2;
}
server->tunnel_enabled = true;
if (!params->use_ssh)
server->tunnel_enabled = true;
return true;
error2:
if (!server->tunnel_forward) {
bool was_closed =
atomic_flag_test_and_set(&server->server_socket_closed);
// the thread is not started, the flag could not be already set
assert(!was_closed);
(void) was_closed;
close_socket(server->server_socket);
if (!params->use_ssh) {
if (!server->tunnel_forward) {
bool was_closed =
atomic_flag_test_and_set(&server->server_socket_closed);
// the thread is not started, the flag could not be already set
assert(!was_closed);
(void) was_closed;
close_socket(server->server_socket);
}
disable_tunnel(server);
}
disable_tunnel(server);
error1:
SDL_free(server->serial);
return false;
@ -475,9 +478,11 @@ server_connect_to(struct server *server) {
}
}
// we don't need the adb tunnel anymore
disable_tunnel(server); // ignore failure
server->tunnel_enabled = false;
if (server->tunnel_enabled) {
// we don't need the adb tunnel anymore
disable_tunnel(server); // ignore failure
server->tunnel_enabled = false;
}
return true;
}