diff options
| author | Rui Paulo <rpaulo@FreeBSD.org> | 2010-10-28 19:06:17 +0000 |
|---|---|---|
| committer | Rui Paulo <rpaulo@FreeBSD.org> | 2010-10-28 19:06:17 +0000 |
| commit | 27df3f5dddcc52e19be97c5e876161208987d4f1 (patch) | |
| tree | df5e0d876c3ec2ff0e3d9c6795cb5c1e20b7d5c4 /contrib/tcpdump/print-ip.c | |
| parent | ba2a27351bcd9e7c4ba485cf914d9071eebc2c60 (diff) | |
| parent | 6d59e2f382406def185ce5261b8723a174cd28a3 (diff) | |
| download | src-27df3f5dddcc52e19be97c5e876161208987d4f1.tar.gz src-27df3f5dddcc52e19be97c5e876161208987d4f1.zip | |
Merge tcpdump-4.1.1.
Notes
Notes:
svn path=/head/; revision=214478
Diffstat (limited to 'contrib/tcpdump/print-ip.c')
| -rw-r--r-- | contrib/tcpdump/print-ip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-ip.c b/contrib/tcpdump/print-ip.c index 6563d5390ae2..dc9d2665ab19 100644 --- a/contrib/tcpdump/print-ip.c +++ b/contrib/tcpdump/print-ip.c @@ -510,7 +510,8 @@ again: break; case IPPROTO_PIM: - pim_print(ipds->cp, ipds->len); + pim_print(ipds->cp, ipds->len, + in_cksum((const u_short*)ipds->cp, ipds->len, 0)); break; case IPPROTO_VRRP: @@ -659,7 +660,7 @@ ip_print(netdissect_options *ndo, printf(")"); } - if ((u_char *)ipds->ip + hlen <= snapend) { + if (!Kflag && (u_char *)ipds->ip + hlen <= snapend) { sum = in_cksum((const u_short *)ipds->ip, hlen, 0); if (sum != 0) { ip_sum = EXTRACT_16BITS(&ipds->ip->ip_sum); |