commit bf4b136c8a11047389f8aa5a911f68d2da4c59a5
author Xin Li <delphij@google.com> Mon Nov 23 11:29:57 2020 -0800
committer Xin Li <delphij@google.com> Mon Nov 23 11:29:57 2020 -0800
tree 502f105f02f56b2d69eb282a074b6eecdc9f405f
parent ad7caf81eaa0aaa91fc034eaa0785346aa32c293
parent 1dd71f8eea77997e0e90bc20ea8c6c360518a1db

Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I1b6589f81545a17e31181d509ca7b5462a54138a

dump.c

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

dump.h

diff --git a/dump.h b/dump.h
index c3f0477..6b96cd2 100644
--- a/dump.h
+++ b/dump.h
@@ -31,14 +31,14 @@
 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);