Display and control your Android device
Rename MSG_SERIALIZED_MAX_SIZE to MSG_MAX_SIZE
Romain Vimontd91c5dcfd54f
diff --git a/app/src/control_msg.h b/app/src/control_msg.hindex 1a5449a0..f5d633a8 100644--- a/app/src/control_msg.h+++ b/app/src/control_msg.h@@ -10,12 +10,11 @@#include "android/keycodes.h"#include "common.h"-#define CONTROL_MSG_SERIALIZED_MAX_SIZE 4096+#define CONTROL_MSG_MAX_SIZE 4096#define CONTROL_MSG_INJECT_TEXT_MAX_LENGTH 300// type: 1 byte; paste flag: 1 byte; length: 2 bytes-#define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH \- (CONTROL_MSG_SERIALIZED_MAX_SIZE - 4)+#define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH (CONTROL_MSG_MAX_SIZE - 4)#define POINTER_ID_MOUSE UINT64_C(-1);@@ -72,7 +71,7 @@ struct control_msg {};};-// buf size must be at least CONTROL_MSG_SERIALIZED_MAX_SIZE+// buf size must be at least CONTROL_MSG_MAX_SIZE// return the number of bytes writtensize_tcontrol_msg_serialize(const struct control_msg *msg, unsigned char *buf);diff --git a/app/src/controller.c b/app/src/controller.cindex d59a7411..b68b886b 100644--- a/app/src/controller.c+++ b/app/src/controller.c@@ -60,7 +60,7 @@ controller_push_msg(struct controller *controller,static boolprocess_msg(struct controller *controller,const struct control_msg *msg) {- unsigned char serialized_msg[CONTROL_MSG_SERIALIZED_MAX_SIZE];+ unsigned char serialized_msg[CONTROL_MSG_MAX_SIZE];int length = control_msg_serialize(msg, serialized_msg);if (!length) {return false;diff --git a/app/src/device_msg.h b/app/src/device_msg.hindex f19630bf..60c35817 100644--- a/app/src/device_msg.h+++ b/app/src/device_msg.h@@ -7,9 +7,9 @@#include "config.h"-#define DEVICE_MSG_SERIALIZED_MAX_SIZE 4096+#define DEVICE_MSG_MAX_SIZE 4096// type: 1 byte; length: 2 bytes-#define DEVICE_MSG_TEXT_MAX_LENGTH (DEVICE_MSG_SERIALIZED_MAX_SIZE - 3)+#define DEVICE_MSG_TEXT_MAX_LENGTH (DEVICE_MSG_MAX_SIZE - 3)enum device_msg_type {DEVICE_MSG_TYPE_CLIPBOARD,diff --git a/app/src/receiver.c b/app/src/receiver.cindex 0474ff55..8c8a7e03 100644--- a/app/src/receiver.c+++ b/app/src/receiver.c@@ -60,13 +60,13 @@ static intrun_receiver(void *data) {struct receiver *receiver = data;- unsigned char buf[DEVICE_MSG_SERIALIZED_MAX_SIZE];+ unsigned char buf[DEVICE_MSG_MAX_SIZE];size_t head = 0;for (;;) {- assert(head < DEVICE_MSG_SERIALIZED_MAX_SIZE);+ assert(head < DEVICE_MSG_MAX_SIZE);ssize_t r = net_recv(receiver->control_socket, buf,- DEVICE_MSG_SERIALIZED_MAX_SIZE - head);+ DEVICE_MSG_MAX_SIZE - head);if (r <= 0) {LOGD("Receiver stopped");break;diff --git a/app/tests/test_control_msg_serialize.c b/app/tests/test_control_msg_serialize.cindex c6ff7b2e..a0328060 100644--- a/app/tests/test_control_msg_serialize.c+++ b/app/tests/test_control_msg_serialize.c@@ -13,7 +13,7 @@ static void test_serialize_inject_keycode(void) {},};- unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];+ unsigned char buf[CONTROL_MSG_MAX_SIZE];int size = control_msg_serialize(&msg, buf);assert(size == 10);@@ -34,7 +34,7 @@ static void test_serialize_inject_text(void) {},};- unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];+ unsigned char buf[CONTROL_MSG_MAX_SIZE];int size = control_msg_serialize(&msg, buf);assert(size == 16);@@ -54,7 +54,7 @@ static void test_serialize_inject_text_long(void) {text[CONTROL_MSG_INJECT_TEXT_MAX_LENGTH] = '\0';msg.inject_text.text = text;- unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];+ unsigned char buf[CONTROL_MSG_MAX_SIZE];int size = control_msg_serialize(&msg, buf);assert(size == 3 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);@@ -88,7 +88,7 @@ static void test_serialize_inject_touch_event(void) {},};- unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];+ unsigned char buf[CONTROL_MSG_MAX_SIZE];int size = control_msg_serialize(&msg, buf);assert(size == 28);@@ -123,7 +123,7 @@ static void test_serialize_inject_scroll_event(void) {},};- unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];+ unsigned char buf[CONTROL_MSG_MAX_SIZE];int size = control_msg_serialize(&msg, buf);assert(size == 21);@@ -142,7 +142,7 @@ static void test_serialize_back_or_screen_on(void) {.type = CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON,};- unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];+ unsigned char buf[CONTROL_MSG_MAX_SIZE];int size = control_msg_serialize(&msg, buf);assert(size == 1);@@ -157,7 +157,7 @@ static void test_serialize_expand_notification_panel(void) {.type = CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL,};- unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];+ unsigned char buf[CONTROL_MSG_MAX_SIZE];int size = control_msg_serialize(&msg, buf);assert(size == 1);@@ -172,7 +172,7 @@ static void test_serialize_collapse_notification_panel(void) {.type = CONTROL_MSG_TYPE_COLLAPSE_NOTIFICATION_PANEL,};- unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];+ unsigned char buf[CONTROL_MSG_MAX_SIZE];int size = control_msg_serialize(&msg, buf);assert(size == 1);@@ -187,7 +187,7 @@ static void test_serialize_get_clipboard(void) {.type = CONTROL_MSG_TYPE_GET_CLIPBOARD,};- unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];+ unsigned char buf[CONTROL_MSG_MAX_SIZE];int size = control_msg_serialize(&msg, buf);assert(size == 1);@@ -206,7 +206,7 @@ static void test_serialize_set_clipboard(void) {},};- unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];+ unsigned char buf[CONTROL_MSG_MAX_SIZE];int size = control_msg_serialize(&msg, buf);assert(size == 17);@@ -227,7 +227,7 @@ static void test_serialize_set_screen_power_mode(void) {},};- unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];+ unsigned char buf[CONTROL_MSG_MAX_SIZE];int size = control_msg_serialize(&msg, buf);assert(size == 2);@@ -243,7 +243,7 @@ static void test_serialize_rotate_device(void) {.type = CONTROL_MSG_TYPE_ROTATE_DEVICE,};- unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];+ unsigned char buf[CONTROL_MSG_MAX_SIZE];int size = control_msg_serialize(&msg, buf);assert(size == 1);diff --git a/app/tests/test_device_msg_deserialize.c b/app/tests/test_device_msg_deserialize.cindex 2e29d087..6a38d5e5 100644--- a/app/tests/test_device_msg_deserialize.c+++ b/app/tests/test_device_msg_deserialize.c@@ -24,7 +24,7 @@ static void test_deserialize_clipboard(void) {}static void test_deserialize_clipboard_big(void) {- unsigned char input[DEVICE_MSG_SERIALIZED_MAX_SIZE];+ unsigned char input[DEVICE_MSG_MAX_SIZE];input[0] = DEVICE_MSG_TYPE_CLIPBOARD;input[1] = DEVICE_MSG_TEXT_MAX_LENGTH >> 8; // MSBinput[2] = DEVICE_MSG_TEXT_MAX_LENGTH & 0xff; // LSB@@ -33,7 +33,7 @@ static void test_deserialize_clipboard_big(void) {struct device_msg msg;ssize_t r = device_msg_deserialize(input, sizeof(input), &msg);- assert(r == DEVICE_MSG_SERIALIZED_MAX_SIZE);+ assert(r == DEVICE_MSG_MAX_SIZE);assert(msg.type == DEVICE_MSG_TYPE_CLIPBOARD);assert(msg.clipboard.text);