diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-06-03 01:25:00 +0100 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-06-03 01:25:00 +0100 |
commit | 5a3678586c4c0d88da6cea9262af0a4f46744d23 (patch) | |
tree | ef8678294829041cf1ed9c0ac3c52c36e2fa31d7 /dump.c | |
parent | 856da217c532b9df1246586151ad8c4a56fc66f6 (diff) | |
parent | 2b4cc7393268622ac3de071435a6e4ab857342df (diff) | |
download | android_external_android-clat-5a3678586c4c0d88da6cea9262af0a4f46744d23.tar.gz android_external_android-clat-5a3678586c4c0d88da6cea9262af0a4f46744d23.tar.bz2 android_external_android-clat-5a3678586c4c0d88da6cea9262af0a4f46744d23.zip |
Merge tag 'android-4.4.3_r1' into HEADcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0
Android 4.4.3 release 1
Diffstat (limited to 'dump.c')
-rw-r--r-- | dump.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -147,14 +147,14 @@ 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) { uint32_t temp_checksum; - temp_checksum = ipv4_pseudo_header_checksum(0, ip, sizeof(*udp) + payload_size); + 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) { uint32_t temp_checksum; - temp_checksum = ipv6_pseudo_header_checksum(0, ip6, sizeof(*udp) + payload_size); + temp_checksum = ipv6_pseudo_header_checksum(ip6, sizeof(*udp) + payload_size, IPPROTO_UDP); dump_udp_generic(udp, temp_checksum, payload, payload_size); } @@ -203,7 +203,7 @@ void dump_tcp_generic(const struct tcphdr *tcp, const char *options, size_t opti 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) { uint32_t temp_checksum; - temp_checksum = ipv4_pseudo_header_checksum(0, ip, sizeof(*tcp) + options_size + payload_size); + temp_checksum = ipv4_pseudo_header_checksum(ip, sizeof(*tcp) + options_size + payload_size); dump_tcp_generic(tcp, options, options_size, temp_checksum, payload, payload_size); } @@ -211,7 +211,7 @@ void dump_tcp(const struct tcphdr *tcp, const struct iphdr *ip, const char *payl 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) { uint32_t temp_checksum; - temp_checksum = ipv6_pseudo_header_checksum(0, ip6, sizeof(*tcp) + options_size + payload_size); + temp_checksum = ipv6_pseudo_header_checksum(ip6, sizeof(*tcp) + options_size + payload_size, IPPROTO_TCP); dump_tcp_generic(tcp, options, options_size, temp_checksum, payload, payload_size); } @@ -220,6 +220,7 @@ void logcat_hexdump(const char *info, const char *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]); } |