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 /translate.h | |
| 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 'translate.h')
| -rw-r--r-- | translate.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/translate.h b/translate.h index 5efa817..ab20a55 100644 --- a/translate.h +++ b/translate.h @@ -60,12 +60,12 @@ void fill_ip6_header(struct ip6_hdr *ip6, uint16_t payload_len, uint8_t protocol const struct iphdr *old_header); // Translate and send packets. -void translate_packet(const struct tun_data *tunnel, struct tun_pi *tun_header, const char *packet, - size_t packetsize); +void translate_packet(const struct tun_data *tunnel, struct tun_pi *tun_header, + const uint8_t *packet, size_t packetsize); // Translate IPv4 and IPv6 packets. -int ipv4_packet(clat_packet out, int pos, const char *packet, size_t len); -int ipv6_packet(clat_packet out, int pos, const char *packet, size_t len); +int ipv4_packet(clat_packet out, int pos, const uint8_t *packet, size_t len); +int ipv6_packet(clat_packet out, int pos, const uint8_t *packet, size_t len); // Deal with fragmented packets. size_t maybe_fill_frag_header(struct ip6_frag *frag_hdr, struct ip6_hdr *ip6_targ, @@ -74,12 +74,13 @@ uint8_t parse_frag_header(const struct ip6_frag *frag_hdr, struct iphdr *ip_targ // Translate ICMP packets. int icmp_to_icmp6(clat_packet out, int pos, const struct icmphdr *icmp, uint32_t checksum, - const char *payload, size_t payload_size); + const uint8_t *payload, size_t payload_size); int icmp6_to_icmp(clat_packet out, int pos, const struct icmp6_hdr *icmp6, - const char *payload, size_t payload_size); + const uint8_t *payload, size_t payload_size); // Translate generic IP packets. -int generic_packet(clat_packet out, int pos, const char *payload, size_t len); +int generic_packet(clat_packet out, int pos, + const uint8_t *payload, size_t len); // Translate TCP and UDP packets. int tcp_packet(clat_packet out, int pos, const struct tcphdr *tcp, @@ -88,8 +89,10 @@ int udp_packet(clat_packet out, int pos, const struct udphdr *udp, uint32_t old_sum, uint32_t new_sum, size_t len); int tcp_translate(clat_packet out, int pos, const struct tcphdr *tcp, size_t header_size, - uint32_t old_sum, uint32_t new_sum, const char *payload, size_t payload_size); + uint32_t old_sum, uint32_t new_sum, + const uint8_t *payload, size_t payload_size); int udp_translate(clat_packet out, int pos, const struct udphdr *udp, - uint32_t old_sum, uint32_t new_sum, const char *payload, size_t payload_size); + uint32_t old_sum, uint32_t new_sum, + const uint8_t *payload, size_t payload_size); #endif /* __TRANSLATE_H__ */ |