diff options
| author | roy <roy> | 2011-12-10 18:55:37 +0000 |
|---|---|---|
| committer | roy <roy> | 2011-12-10 18:55:37 +0000 |
| commit | eb808b2b2edc43f849205eac3b0774392abe06dc (patch) | |
| tree | 0df2e4aaf3f85f73165494bf59634d72daef21b3 /net/wireshark | |
| parent | 1e1118c890ee18dc7d2cf70547ead16bb042ef8c (diff) | |
| download | pkgsrc-eb808b2b2edc43f849205eac3b0774392abe06dc.tar.gz | |
Fix ICMPv6 DNSSL padding
Diffstat (limited to 'net/wireshark')
| -rw-r--r-- | net/wireshark/Makefile | 3 | ||||
| -rw-r--r-- | net/wireshark/distinfo | 3 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-bd | 19 |
3 files changed, 23 insertions, 2 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 5a350197d3b..4dac4dd788e 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.71 2011/11/19 12:01:27 tron Exp $ +# $NetBSD: Makefile,v 1.72 2011/12/10 18:55:37 roy Exp $ DISTNAME= wireshark-1.6.4 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.wireshark.org/download/src/ \ ${MASTER_SITE_SOURCEFORGE:=wireshark/} diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index f35737c432e..7a7ba3e11b2 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.50 2011/11/19 12:01:27 tron Exp $ +$NetBSD: distinfo,v 1.51 2011/12/10 18:55:38 roy Exp $ SHA1 (wireshark-1.6.4.tar.bz2) = 8abd7681e8c05841b7cf31d5dc83c1092c54e79f RMD160 (wireshark-1.6.4.tar.bz2) = 9437c416a5963aee1c049c0275bdfd3edd7488e8 @@ -10,3 +10,4 @@ SHA1 (patch-ae) = 7af195e797f8636a9636d30cdea4ee464fd853df SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9 SHA1 (patch-bb) = 0758ca0be8054b8b95bb56a304605e6fea0a8f72 SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e +SHA1 (patch-bd) = ebfa36d84a9fd3125932b2f40e02684c6e4d003b diff --git a/net/wireshark/patches/patch-bd b/net/wireshark/patches/patch-bd new file mode 100644 index 00000000000..5bf1c320274 --- /dev/null +++ b/net/wireshark/patches/patch-bd @@ -0,0 +1,19 @@ +$NetBSD: patch-bd,v 1.1 2011/12/10 18:55:38 roy Exp $ + +Fix ICMPv6 DNSSL padding + +--- epan/dissectors/packet-icmpv6.c.orig 2011-12-10 13:44:00.000000000 +0000 ++++ epan/dissectors/packet-icmpv6.c 2011-12-10 17:03:28.000000000 +0000 +@@ -1940,7 +1940,11 @@ + opt_offset += 4; + while(opt_offset < (offset + opt_len) ) { + +- if(tvb_get_guint8(tvb, opt_offset) == 0){ /* if Zero there is padding, skip the loop */ ++ if(tvb_get_guint8(tvb, opt_offset) == 0){ ++ /* Padding... */ ++ int padd_length = (offset + opt_len) - opt_offset; ++ proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset, padd_length, FALSE); ++ opt_offset += padd_length; + break; + } + dnssl_len = get_dns_name(tvb, opt_offset, 0, opt_offset, &dnssl_name); |