mirrors/scrcpy
0
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-08-03 06:39:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

serial in server_params

Browse source
This commit is contained in:
Romain Vimont 2021-05-02 17:21:57 +02:00
commit 6e8df74c41
3 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/scrcpy.c
View file

@ -259,6 +259,7 @@ scrcpy(const struct scrcpy_options *options) {
bool record = !!options->record_filename; bool record = !!options->record_filename;
struct server_params params = { struct server_params params = {
.serial = options->serial,
.log_level = options->log_level, .log_level = options->log_level,
.crop = options->crop, .crop = options->crop,
.port_range = options->port_range, .port_range = options->port_range,
@ -280,7 +281,7 @@ scrcpy(const struct scrcpy_options *options) {
return false; return false;
} }
if (!server_start(&server, options->serial)) { if (!server_start(&server)) {
goto end; goto end;
} }
@ -312,7 +313,7 @@ scrcpy(const struct scrcpy_options *options) {
fps_counter_initialized = true; fps_counter_initialized = true;
if (options->control) { if (options->control) {
if (!file_handler_init(&file_handler, server.serial, if (!file_handler_init(&file_handler, options->serial,
options->push_target)) { options->push_target)) {
goto end; goto end;
} }

38
app/src/server.c
View file

@ -128,9 +128,10 @@ disable_tunnel_forward(const char *serial, uint16_t local_port) {
static bool static bool
disable_tunnel(struct server *server) { disable_tunnel(struct server *server) {
if (server->tunnel_forward) { if (server->tunnel_forward) {
return disable_tunnel_forward(server->serial, server->local_port); return disable_tunnel_forward(server->params.serial,
server->local_port);
} }
return disable_tunnel_reverse(server->serial); return disable_tunnel_reverse(server->params.serial);
} }
static socket_t static socket_t
@ -144,7 +145,7 @@ enable_tunnel_reverse_any_port(struct server *server,
struct sc_port_range port_range) { struct sc_port_range port_range) {
uint16_t port = port_range.first; uint16_t port = port_range.first;
for (;;) { for (;;) {
if (!enable_tunnel_reverse(server->serial, port)) { if (!enable_tunnel_reverse(server->params.serial, port)) {
// the command itself failed, it will fail on any port // the command itself failed, it will fail on any port
return false; return false;
} }
@ -163,7 +164,7 @@ enable_tunnel_reverse_any_port(struct server *server,
} }
// failure, disable tunnel and try another port // failure, disable tunnel and try another port
if (!disable_tunnel_reverse(server->serial)) { if (!disable_tunnel_reverse(server->params.serial)) {
LOGW("Could not remove reverse tunnel on port %" PRIu16, port); LOGW("Could not remove reverse tunnel on port %" PRIu16, port);
} }
@ -191,7 +192,7 @@ enable_tunnel_forward_any_port(struct server *server,
server->tunnel_forward = true; server->tunnel_forward = true;
uint16_t port = port_range.first; uint16_t port = port_range.first;
for (;;) { for (;;) {
if (enable_tunnel_forward(server->serial, port)) { if (enable_tunnel_forward(server->params.serial, port)) {
// success // success
server->local_port = port; server->local_port = port;
return true; return true;
@ -306,7 +307,7 @@ execute_server(struct server *server, const struct server_params *params) {
// Port: 5005 // Port: 5005
// Then click on "Debug" // Then click on "Debug"
#endif #endif
return adb_execute(server->serial, cmd, ARRAY_LEN(cmd)); return adb_execute(server->params.serial, cmd, ARRAY_LEN(cmd));
} }
static socket_t static socket_t
@ -407,7 +408,6 @@ server_init(struct server *server, const struct server_params *params) {
return false; return false;
} }
server->serial = NULL;
server->process = PROCESS_NONE; server->process = PROCESS_NONE;
atomic_flag_clear_explicit(&server->server_socket_closed, atomic_flag_clear_explicit(&server->server_socket_closed,
memory_order_relaxed); memory_order_relaxed);
@ -462,29 +462,22 @@ run_wait_server(void *data) {
} }
bool bool
server_start(struct server *server, const char *serial) { server_start(struct server *server) {
const struct server_params *params = &server->params; const struct server_params *params = &server->params;
if (serial) { if (!push_server(params->serial)) {
server->serial = strdup(serial); return false;
if (!server->serial) {
return false;
}
}
if (!push_server(serial)) {
goto error1;
} }
if (!enable_tunnel_any_port(server, params->port_range, if (!enable_tunnel_any_port(server, params->port_range,
params->force_adb_forward)) { params->force_adb_forward)) {
goto error1; return false;
} }
// server will connect to our server socket // server will connect to our server socket
server->process = execute_server(server, params); server->process = execute_server(server, params);
if (server->process == PROCESS_NONE) { if (server->process == PROCESS_NONE) {
goto error2; goto error;
} }
// If the server process dies before connecting to the server socket, then // If the server process dies before connecting to the server socket, then
@ -498,14 +491,14 @@ server_start(struct server *server, const char *serial) {
if (!ok) { if (!ok) {
process_terminate(server->process); process_terminate(server->process);
process_wait(server->process, true); // ignore exit code process_wait(server->process, true); // ignore exit code
goto error2; goto error;
} }
server->tunnel_enabled = true; server->tunnel_enabled = true;
return true; return true;
error2: error:
if (!server->tunnel_forward) { if (!server->tunnel_forward) {
bool was_closed = bool was_closed =
atomic_flag_test_and_set(&server->server_socket_closed); atomic_flag_test_and_set(&server->server_socket_closed);
@ -515,8 +508,7 @@ error2:
close_socket(server->server_socket); close_socket(server->server_socket);
} }
disable_tunnel(server); disable_tunnel(server);
error1:
free(server->serial);
return false; return false;
} }

3
app/src/server.h
View file

@ -15,6 +15,7 @@
struct server_params { struct server_params {
enum sc_log_level log_level; enum sc_log_level log_level;
const char *serial;
const char *crop; const char *crop;
const char *codec_options; const char *codec_options;
const char *encoder_name; const char *encoder_name;
@ -58,7 +59,7 @@ server_init(struct server *server, const struct server_params *params);
// push, enable tunnel et start the server // push, enable tunnel et start the server
bool bool
server_start(struct server *server, const char *serial); server_start(struct server *server);
// block until the communication with the server is established // block until the communication with the server is established
bool bool