From d44fac888a441cf21111358f43384f3942399d5d Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Tue, 3 Jun 2014 12:56:38 +0900 Subject: Use a packet socket to receive packets. Combined with the previous change to send on a raw socket instead of a tunnel interface, this allows us to get rid of the clat interface and remove all the routing configuration code. Bug: 15340961 Change-Id: I9d9b90f9b4f58dcc3c102abcdc32a2c7ee86b01d --- dump.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dump.c') diff --git a/dump.c b/dump.c index 0fda4e7..27b75d1 100644 --- a/dump.c +++ b/dump.c @@ -162,7 +162,7 @@ void dump_udp6(const struct udphdr *udp, const struct ip6_hdr *ip6, } /* print tcp header */ -void dump_tcp_generic(const struct tcphdr *tcp, const char *options, size_t options_size, uint32_t temp_checksum, const char *payload, size_t payload_size) { +void dump_tcp_generic(const struct tcphdr *tcp, const uint8_t *options, size_t options_size, uint32_t temp_checksum, const uint8_t *payload, size_t payload_size) { uint16_t my_checksum; temp_checksum = ip_checksum_add(temp_checksum, tcp, sizeof(struct tcphdr)); @@ -205,7 +205,7 @@ void dump_tcp_generic(const struct tcphdr *tcp, const char *options, size_t opti /* print ipv4/tcp header */ 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) { + const uint8_t *options, size_t options_size) { uint32_t temp_checksum; temp_checksum = ipv4_pseudo_header_checksum(ip, sizeof(*tcp) + options_size + payload_size); @@ -215,7 +215,7 @@ void dump_tcp(const struct tcphdr *tcp, const struct iphdr *ip, /* print ipv6/tcp header */ 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) { + const uint8_t *options, size_t options_size) { uint32_t temp_checksum; temp_checksum = ipv6_pseudo_header_checksum(ip6, sizeof(*tcp) + options_size + payload_size, IPPROTO_TCP); -- cgit v1.2.3