diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2014-03-13 19:47:58 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2014-03-13 19:47:58 +0900 |
| commit | 1b1146be79ad58a52ca1ef84c4216039e054a024 (patch) | |
| tree | aa5989bfe2d81abe2f40524b33ab1644af41817c /translate.h | |
| parent | c641fffcd3a69416fa82933ac16d11e9a687dc26 (diff) | |
| parent | e22ed104cc8fee7f1cae33edeafc59758aa7f446 (diff) | |
| download | android_external_android-clat-1b1146be79ad58a52ca1ef84c4216039e054a024.tar.gz android_external_android-clat-1b1146be79ad58a52ca1ef84c4216039e054a024.tar.bz2 android_external_android-clat-1b1146be79ad58a52ca1ef84c4216039e054a024.zip | |
resolved conflicts for merge of e22ed104 to klp-modular-dev-plus-aosp
Change-Id: I6d77583042b4707e4e9dda7c4641019c5c5a7248
Diffstat (limited to 'translate.h')
| -rw-r--r-- | translate.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/translate.h b/translate.h index 421d2a5..6d4f126 100644 --- a/translate.h +++ b/translate.h @@ -72,6 +72,11 @@ size_t maybe_fill_frag_header(struct ip6_frag *frag_hdr, struct ip6_hdr *ip6_tar const struct iphdr *old_header); uint8_t parse_frag_header(const struct ip6_frag *frag_hdr, struct iphdr *ip_targ); +// Deal with fragmented packets. +size_t maybe_fill_frag_header(struct ip6_frag *frag_hdr, struct ip6_hdr *ip6_targ, + const struct iphdr *old_header); +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, clat_packet_index pos, const struct icmphdr *icmp, uint32_t checksum, const uint8_t *payload, size_t payload_size); |