From bea3f7f9819bfc2007dbc2e60e5d2588b333d615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Mon, 30 Jan 2023 22:29:59 +0000
Subject: [PATCH] clatd: introduce MAXDUMPLEN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PACKETLEN is a bad name, let's try to move away from it

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I56e890d479bc64ed6c31a29772a370f0e83a2ff9
---
 clatd.h | 4 ++++
 dump.c  | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/clatd.h b/clatd.h
index e810a3b254..4be071cbcb 100644
--- a/clatd.h
+++ b/clatd.h
@@ -43,6 +43,10 @@ struct tun_data;
 // ie. if we ever read >= MAXMTU bytes we should discard.
 #define MAXMTU (0xFFFF + 28 + 1)
 #define PACKETLEN (sizeof(struct tun_pi) + MAXMTU)
+
+// logcat_hexdump() maximum binary data length
+#define MAXDUMPLEN PACKETLEN
+
 #define CLATD_VERSION "1.5"
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
diff --git a/dump.c b/dump.c
index 289f161742..dff3d5ec8d 100644
--- a/dump.c
+++ b/dump.c
@@ -226,11 +226,11 @@ void dump_tcp6(const struct tcphdr *tcp, const struct ip6_hdr *ip6, const uint8_
 
 /* generic hex dump */
 void logcat_hexdump(const char *info, const uint8_t *data, size_t len) {
-  char output[PACKETLEN * 3 + 2];
+  char output[MAXDUMPLEN * 3 + 2];
   size_t i;
 
   output[0] = '\0';
-  for (i = 0; i < len && i < PACKETLEN; i++) {
+  for (i = 0; i < len && i < MAXDUMPLEN; i++) {
     snprintf(output + i * 3, 4, " %02x", data[i]);
   }
   output[len * 3 + 3] = '\0';