aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-isakmp.c
diff options
context:
space:
mode:
authorMartin Mathieson <martin.r.mathieson@googlemail.com>2015-05-22 15:33:12 +0100
committerMartin Mathieson <martin.r.mathieson@googlemail.com>2015-05-22 14:34:41 +0000
commit1f994e89c251080e5be9589a9d5f769777e9a653 (patch)
tree5ff3d5727e773e42d48702d9862032add90f7b8c /epan/dissectors/packet-isakmp.c
parent8d36cda3ea2cea96bbb34fa9d757c1fecb8122a7 (diff)
ISAKMP: Add recent notify message types to range_string, and show names in notification root node
Change-Id: I3849868f6fbc8c5243757f6a39806365ca7a3609 Reviewed-on: https://code.wireshark.org/review/8587 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Diffstat (limited to 'epan/dissectors/packet-isakmp.c')
-rw-r--r--epan/dissectors/packet-isakmp.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index cd67090c1b..a818ab71b4 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -1267,7 +1267,14 @@ static const range_string notifmsg_v2_type[] = {
{ 16422,16422, "IKEV2_MESSAGE_ID_SYNC" }, /* RFC6311 */
{ 16423,16423, "IPSEC_REPLAY_COUNTER_SYNC" }, /* RFC6311 */
{ 16424,16424, "SECURE_PASSWORD_METHODS" }, /* RFC6467 */
- { 16425,40959, "RESERVED TO IANA - STATUS TYPES" },
+ { 16425,16425, "PSK_PERSIST" }, /* RFC6631 */
+ { 16426,16426, "PSK_CONFIRM" }, /* RFC6631 */
+ { 16427,16427, "ERX_SUPPORTED" }, /* RFC6867 */
+ { 16428,16428, "IFOM_CAPABILITY" }, /* [Frederic_Firmin][3GPP TS 24.303 v10.6.0 annex B.2] */
+ { 16429,16429, "SENDER_REQUEST_ID" }, /* [draft-yeung-g-ikev2] */
+ { 16430,16430, "IKEV2_FRAGMENTATION_SUPPORTED" }, /* RFC7383 */
+ { 16431,16431, "SIGNATURE_HASH_ALGORITHMS" }, /* RFC7427 */
+ { 16432,40959, "RESERVED TO IANA - STATUS TYPES" },
{ 40960,65535, "Private Use - STATUS TYPES" },
{ 0,0, NULL },
};
@@ -3949,6 +3956,10 @@ dissect_notif(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto_t
}else if (isakmp_version == 2)
{
proto_tree_add_item(tree, hf_isakmp_notify_msgtype_v2, tvb, offset, 2, ENC_BIG_ENDIAN);
+ proto_item_append_text(tree, " - %s",
+ rval_to_str_const(tvb_get_ntohs(tvb, offset),
+ notifmsg_v2_type,
+ "Unknown"));
}
offset += 2;
length -= 2;