diff options
author | Brian Carlstrom <bdc@google.com> | 2014-02-24 20:03:01 -0800 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2014-02-24 21:14:51 -0800 |
commit | fcac410fa15613873a07143ccd46470b869346a3 (patch) | |
tree | a76ca896fc7cb5801acf16edfcfd7f3bb6962014 /dump.c | |
parent | f3beefc96a5a4f295562f60d648bd6e795980a10 (diff) | |
download | android_external_android-clat-fcac410fa15613873a07143ccd46470b869346a3.tar.gz android_external_android-clat-fcac410fa15613873a07143ccd46470b869346a3.tar.bz2 android_external_android-clat-fcac410fa15613873a07143ccd46470b869346a3.zip |
Use uint8_t not char for binary data to avoid -Wall -Werror issues on x86 builds
Change-Id: Ib61e67f15360c27c3ebf61f870a9482217c52357
Diffstat (limited to 'dump.c')
-rw-r--r-- | dump.c | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -130,7 +130,8 @@ void dump_icmp6(struct icmp6_hdr *icmp6) { } /* print udp header */ -void dump_udp_generic(const struct udphdr *udp, uint32_t temp_checksum, const char *payload, size_t payload_size) { +void dump_udp_generic(const struct udphdr *udp, uint32_t temp_checksum, + const uint8_t *payload, size_t payload_size) { uint16_t my_checksum; temp_checksum = ip_checksum_add(temp_checksum, udp, sizeof(struct udphdr)); @@ -145,14 +146,16 @@ void dump_udp_generic(const struct udphdr *udp, uint32_t temp_checksum, const ch } /* print ipv4/udp header */ -void dump_udp(const struct udphdr *udp, const struct iphdr *ip, const char *payload, size_t payload_size) { +void dump_udp(const struct udphdr *udp, const struct iphdr *ip, + const uint8_t *payload, size_t payload_size) { uint32_t temp_checksum; temp_checksum = ipv4_pseudo_header_checksum(ip, sizeof(*udp) + payload_size); dump_udp_generic(udp, temp_checksum, payload, payload_size); } /* print ipv6/udp header */ -void dump_udp6(const struct udphdr *udp, const struct ip6_hdr *ip6, const char *payload, size_t payload_size) { +void dump_udp6(const struct udphdr *udp, const struct ip6_hdr *ip6, + const uint8_t *payload, size_t payload_size) { uint32_t temp_checksum; temp_checksum = ipv6_pseudo_header_checksum(ip6, sizeof(*udp) + payload_size, IPPROTO_UDP); dump_udp_generic(udp, temp_checksum, payload, payload_size); @@ -200,7 +203,9 @@ 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 char *payload, size_t payload_size, const char *options, size_t options_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) { uint32_t temp_checksum; temp_checksum = ipv4_pseudo_header_checksum(ip, sizeof(*tcp) + options_size + payload_size); @@ -208,7 +213,9 @@ void dump_tcp(const struct tcphdr *tcp, const struct iphdr *ip, const char *payl } /* print ipv6/tcp header */ -void dump_tcp6(const struct tcphdr *tcp, const struct ip6_hdr *ip6, const char *payload, size_t payload_size, const char *options, size_t options_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) { uint32_t temp_checksum; temp_checksum = ipv6_pseudo_header_checksum(ip6, sizeof(*tcp) + options_size + payload_size, IPPROTO_TCP); @@ -216,13 +223,13 @@ void dump_tcp6(const struct tcphdr *tcp, const struct ip6_hdr *ip6, const char * } /* generic hex dump */ -void logcat_hexdump(const char *info, const char *data, size_t len) { +void logcat_hexdump(const char *info, const uint8_t *data, size_t len) { char output[PACKETLEN*3+2]; size_t i; output[0] = '\0'; for(i = 0; i < len && i < PACKETLEN; i++) { - snprintf(output + i*3, 4, " %02x", (uint8_t)data[i]); + snprintf(output + i*3, 4, " %02x", data[i]); } output[len*3+3] = '\0'; |