From 4078f7b9e6bb2e8ba4b91d27d171c3af8302e310 Mon Sep 17 00:00:00 2001
From: Killian Richard <krichard@cesi.fr>
Date: Fri, 22 May 2020 15:22:51 +0200
Subject: [PATCH] Fix missing char and error

---
 app/meson.build  |  1 +
 app/src/cli.c    | 14 +++++++-------
 app/src/serve.c  |  8 +++++---
 app/src/serve.h  |  2 +-
 app/src/stream.c |  2 +-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/meson.build b/app/meson.build
index 5d2b4caa..0e6ef15e 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -17,6 +17,7 @@ src = [
     'src/scrcpy.c',
     'src/screen.c',
     'src/server.c',
+    'src/serve.c',
     'src/stream.c',
     'src/tiny_xpm.c',
     'src/video_buffer.c',
diff --git a/app/src/cli.c b/app/src/cli.c
index 69b89899..a405f093 100644
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -461,7 +461,7 @@ str_split(const char *a_str, const char a_delim) {
     char** result = 0;
     size_t count = 0;
     char* tmp = (char*)a_str;
-    char str[100];
+    char str[50];
     strncpy(str, a_str, sizeof(str));
     char* last_comma = 0;
     char delim[2];
@@ -517,7 +517,7 @@ check_if_ip_valid(char *ip) {
         return false;
 
     while (ptr) {
-        long value:
+        long value;
         if (!parse_integer(ptr, &value)) //Check whether the substring is holding only number or not
             return false;
         num = atoi(ptr); //Convert substring to number
@@ -537,7 +537,7 @@ check_if_ip_valid(char *ip) {
 }
 
 static bool
-parse_serve_args(const char *optarg, char **s_protocol, uint32_t *s_ip, uint16_t *s_port) {
+parse_serve_args(const char *optarg, const char **s_protocol, uint32_t *s_ip, uint16_t *s_port) {
     bool protocol_valid = false;
     bool ip_valid = false;
     bool port_valid = false;
@@ -562,7 +562,7 @@ parse_serve_args(const char *optarg, char **s_protocol, uint32_t *s_ip, uint16_t
     if (!strcmp(protocol, "tcp")) {
         protocol_valid = true;
     } else {
-        LOGE("Unexpected protocol: $s (expected tcp)", protocol);
+        LOGE("Unexpected protocol (expected tcp)");
         return false;
     }
     
@@ -579,11 +579,11 @@ parse_serve_args(const char *optarg, char **s_protocol, uint32_t *s_ip, uint16_t
 
     //Check if the choosen port is valid
     long port_value = 0;
-    port_valid = parse_interger_arg(port, &port_value, false, 0, 0xFFFF, "port");
+    port_valid = parse_integer_arg(port, &port_value, false, 0, 0xFFFF, "port");
 
     //Check if everything is valid
     if (!protocol_valid || !ip_valid || !port_valid) {
-        LOGE("Unexpected argument format: $s (expected [tcp]:[ip or \"localhost\"]:[port])", optarg);
+        LOGE("Unexpected argument format (expected [tcp]:[ip or \"localhost\"]:[port])");
         return false;
     }
 
@@ -639,7 +639,7 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
                                                   OPT_RENDER_EXPIRED_FRAMES},
         {"rotation",               required_argument, NULL, OPT_ROTATION},
         {"serial",                 required_argument, NULL, 's'},
-        {"serve",                  required_argument, NULL, OPT_SERVE}
+        {"serve",                  required_argument, NULL, OPT_SERVE},
         {"show-touches",           no_argument,       NULL, 't'},
         {"turn-screen-off",        no_argument,       NULL, 'S'},
         {"prefer-text",            no_argument,       NULL, OPT_PREFER_TEXT},
diff --git a/app/src/serve.c b/app/src/serve.c
index 5de0c40f..b969dc8d 100644
--- a/app/src/serve.c
+++ b/app/src/serve.c
@@ -9,7 +9,7 @@
 #include "util/log.h"
 #include "util/net.h"
 
-# define SOCKET_ERROR -1
+# define SOCKET_ERROR (-1)
 
 void
 serve_init(struct serve* serve, char *protocol, uint32_t ip, uint16_t port) {
@@ -32,6 +32,8 @@ serve_start(struct serve* serve) {
         return 0;
     }
 
+    LOGI("Waiting for a client to connect");
+
     ClientSocket = net_accept(Listensocket);
     if (ClientSocket == INVALID_SOCKET) {
         LOGI("Client error");
@@ -49,8 +51,8 @@ serve_start(struct serve* serve) {
 }
 
 bool
-serve_push(struct serve* serve, const AVPacket packet) {
-    if (net_send(serve->socket, packet.data, packet.size) == SOCKET_ERROR) {
+serve_push(struct serve* serve, const AVPacket *packet) {
+    if (net_send(serve->socket, packet->data, packet->size) == SOCKET_ERROR) {
         LOGI("Client lost");
         net_close(serve->socket);
         return false;
diff --git a/app/src/serve.h b/app/src/serve.h
index 44ee7583..885fcef3 100644
--- a/app/src/serve.h
+++ b/app/src/serve.h
@@ -24,5 +24,5 @@ bool
 serve_start(struct serve* serve);
 
 bool
-serve_push(struct serve* serve, const AVPacket packet);
+serve_push(struct serve* serve, const AVPacket *packet);
 #endif
\ No newline at end of file
diff --git a/app/src/stream.c b/app/src/stream.c
index a7cee436..557cff06 100644
--- a/app/src/stream.c
+++ b/app/src/stream.c
@@ -97,7 +97,7 @@ process_frame(struct stream *stream, AVPacket *packet) {
     if (stream->serve) {
         packet->dts = packet->pts;
 
-        if (!serve_push(stream->serve, packet) {
+        if (!serve_push(stream->serve, packet)) {
             LOGE("Could not serve packet");
             return false;
         }