Fix some build errors when CLAT_DEBUG is set to 1 am: df33869985 am: ad7caf81ea am: af4ed3d356

Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1465871

Change-Id: I38479a640f000cbd73b28eb9dfb1591af29e8a41

2 files changed, 4 insertions, 2 deletions

diff --git a/dump.c b/dump.c
index 28db13f..7332d6c 100644
--- a/dump.c
+++ b/dump.c
@@ -21,6 +21,7 @@
 
 #include <arpa/inet.h>
 #include <linux/icmp.h>
+#include <linux/if_tun.h>
 #include <netinet/icmp6.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
@@ -33,6 +34,7 @@
 
 #include "clatd.h"
 #include "debug.h"
+#include "dump.h"
 #include "logging.h"
 
 #if CLAT_DEBUG
diff --git a/dump.h b/dump.h
index c3f0477..6b96cd2 100644
--- a/dump.h
+++ b/dump.h
@@ -31,14 +31,14 @@ void dump_icmp(struct icmphdr *icmp);
 void dump_udp(const struct udphdr *udp, const struct iphdr *ip, const uint8_t *payload,
               size_t payload_size);
 void dump_tcp(const struct tcphdr *tcp, const struct iphdr *ip, const uint8_t *payload,
-              size_t payload_size, const char *options, size_t options_size);
+              size_t payload_size, const uint8_t *options, size_t options_size);
 
 void dump_ip6(struct ip6_hdr *header);
 void dump_icmp6(struct icmp6_hdr *icmp6);
 void dump_udp6(const struct udphdr *udp, const struct ip6_hdr *ip6, const uint8_t *payload,
                size_t payload_size);
 void dump_tcp6(const struct tcphdr *tcp, const struct ip6_hdr *ip6, const uint8_t *payload,
-               size_t payload_size, const char *options, size_t options_size);
+               size_t payload_size, const uint8_t *options, size_t options_size);
 
 void logcat_hexdump(const char *info, const uint8_t *data, size_t len);
 void dump_iovec(const struct iovec *iov, int iov_len);