From d7b00a9babf7cffac2dd415f51cfdfeea09d8b59 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rvimont@genymobile.com>
Date: Tue, 23 Jan 2018 15:46:34 +0100
Subject: [PATCH] Move server-related functions to server.c

In addition to the functions to start/stop the server, move the
functions to push the jar and enable/disable the "adb reverse" tunnel.
---
 app/src/screen.c | 11 +++--------
 app/src/server.c | 18 ++++++++++++++++++
 app/src/server.h |  4 ++++
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/src/screen.c b/app/src/screen.c
index dbf73048..9edfae34 100644
--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -19,7 +19,6 @@
 #include "server.h"
 
 #define DEVICE_NAME_FIELD_LENGTH 64
-#define SOCKET_NAME "scrcpy"
 #define DISPLAY_MARGINS 96
 #define MIN(X,Y) (X) < (Y) ? (X) : (Y)
 #define MAX(X,Y) (X) > (Y) ? (X) : (Y)
@@ -371,16 +370,12 @@ void event_loop(void) {
 SDL_bool show_screen(const char *serial, Uint16 local_port) {
     SDL_bool ret = 0;
 
-    const char *server_jar_path = getenv("SCRCPY_SERVER_JAR");
-    if (!server_jar_path) {
-        server_jar_path = "scrcpy-server.jar";
-    }
-    process_t push_proc = adb_push(serial, server_jar_path, "/data/local/tmp/");
+    process_t push_proc = push_server(serial);
     if (wait_for_success(push_proc, "adb push")) {
         return SDL_FALSE;
     }
 
-    process_t reverse_tunnel_proc = adb_reverse(serial, SOCKET_NAME, local_port);
+    process_t reverse_tunnel_proc = enable_tunnel(serial, local_port);
     if (wait_for_success(reverse_tunnel_proc, "adb reverse")) {
         return SDL_FALSE;
     }
@@ -531,7 +526,7 @@ screen_finally_destroy_frames:
     frames_destroy(&frames);
 screen_finally_adb_reverse_remove:
     {
-        process_t remove = adb_reverse_remove(serial, SOCKET_NAME);
+        process_t remove = disable_tunnel(serial);
         if (remove != PROCESS_NONE) {
             // ignore failure
             cmd_simple_wait(remove, NULL);
diff --git a/app/src/server.c b/app/src/server.c
index 460976ac..92ba1d2d 100644
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -3,6 +3,24 @@
 #include <SDL2/SDL_log.h>
 #include <errno.h>
 
+#define SOCKET_NAME "scrcpy"
+
+process_t push_server(const char *serial) {
+    const char *server_jar_path = getenv("SCRCPY_SERVER_JAR");
+    if (!server_jar_path) {
+        server_jar_path = "scrcpy-server.jar";
+    }
+    return adb_push(serial, server_jar_path, "/data/local/tmp/");
+}
+
+process_t enable_tunnel(const char *serial, Uint16 local_port) {
+    return adb_reverse(serial, SOCKET_NAME, local_port);
+}
+
+process_t disable_tunnel(const char *serial) {
+    return adb_reverse_remove(serial, SOCKET_NAME);
+}
+
 process_t start_server(const char *serial) {
     const char *const cmd[] = {
         "shell",
diff --git a/app/src/server.h b/app/src/server.h
index b89cca48..45279bee 100644
--- a/app/src/server.h
+++ b/app/src/server.h
@@ -1,4 +1,8 @@
 #include "command.h"
 
+process_t push_server(const char *serial);
+process_t enable_tunnel(const char *serial, Uint16 local_port);
+process_t disable_tunnel(const char *serial);
+
 process_t start_server(const char *serial);
 void stop_server(process_t server);