summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-dhcpv6.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-12-01 12:15:16 +0000
committerGuy Harris <guy@alum.mit.edu>2004-12-01 12:15:16 +0000
commitea3aa64618496604aa5862149160a9f405d52c93 (patch)
treeb5838fa382aef8aa6d9747aa46c577d57c99b519 /epan/dissectors/packet-dhcpv6.c
parente4ae2aa011a652faabe2bec1ba022a1fc54f05e6 (diff)
downloadwireshark-ea3aa64618496604aa5862149160a9f405d52c93.tar.gz
From Marc Poulhies: fix the handling of the authentication option when
the authentication information is missing (which it can be), and fix a typo. svn path=/trunk/; revision=12637
Diffstat (limited to 'epan/dissectors/packet-dhcpv6.c')
-rw-r--r--epan/dissectors/packet-dhcpv6.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index d4c9db1090..208530ec24 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -423,7 +423,7 @@ dhcpv6_option(tvbuff_t *tvb, proto_tree *bp_tree, int off, int eoff,
}
break;
case OPTION_AUTH:
- if (optlen < 15) {
+ if (optlen < 11) {
proto_tree_add_text(subtree, tvb, off,
optlen, "AUTH: malformed option");
break;
@@ -438,9 +438,10 @@ dhcpv6_option(tvbuff_t *tvb, proto_tree *bp_tree, int off, int eoff,
"RDM: %d",
(guint32)tvb_get_guint8(tvb, off+2));
proto_tree_add_text(subtree, tvb, off+3, 8,
- "Reply Detection");
- proto_tree_add_text(subtree, tvb, off+11, optlen-11,
- "Authentication Information");
+ "Replay Detection");
+ if (optlen != 11)
+ proto_tree_add_text(subtree, tvb, off+11, optlen-11,
+ "Authentication Information");
break;
case OPTION_UNICAST:
if (optlen != 16) {