diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2014-02-13 12:53:35 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2014-03-10 17:44:17 +0900 |
| commit | f0029d7d06cc8401686ddf379a609b29f511f1a5 (patch) | |
| tree | 64907757210bf03d5509e1b246ad638d75317c68 /translate.h | |
| parent | c1be4799c39775fecb004d92687fe95298cac380 (diff) | |
| download | android_external_android-clat-f0029d7d06cc8401686ddf379a609b29f511f1a5.tar.gz android_external_android-clat-f0029d7d06cc8401686ddf379a609b29f511f1a5.tar.bz2 android_external_android-clat-f0029d7d06cc8401686ddf379a609b29f511f1a5.zip | |
DO NOT MERGE: Move translation entry point into translate.c.
The entry point to the translation code is currently called
packet_handler and lives in clatd.c. Move it into translate.c
and rename it to translate_packet, since that's what it does.
Also get rid of some redundant includes.
Bug: 11542311
Change-Id: I821bb9590b9105ea1d425c3bbe0e634c4ce667b5
Diffstat (limited to 'translate.h')
| -rw-r--r-- | translate.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/translate.h b/translate.h index cfb7bbb..3378254 100644 --- a/translate.h +++ b/translate.h @@ -18,8 +18,18 @@ #ifndef __TRANSLATE_H__ #define __TRANSLATE_H__ +#include <netinet/in.h> +#include <netinet/ip.h> +#include <netinet/ip_icmp.h> +#include <netinet/udp.h> +#include <netinet/tcp.h> +#include <netinet/ip6.h> +#include <netinet/icmp6.h> +#include <linux/icmp.h> #include <linux/if_tun.h> +#include "clatd.h" + #define MAX_TCP_HDR (15 * 4) // Data offset field is 4 bits and counts in 32-bit words. // A clat_packet is an array of iovec structures representing a packet that we are translating. @@ -47,6 +57,10 @@ void fill_ip_header(struct iphdr *ip_targ, uint16_t payload_len, uint8_t protoco 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); + // 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); |