aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorYasuyuki Tanaka <yatch@isl.rdc.toshiba.co.jp>2014-02-12 17:46:55 +0900
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2014-02-12 09:18:14 +0000
commit337b2f7e782d13e3aed8c846c30fa8afde69184c (patch)
tree583cc27aa82a39ca692d90055ea2f27c434920fb /epan
parent6ebd55211b3097e05683dc65f6220cfc7285cdc4 (diff)
Add support for two AVPs newly defined in RFC 6786
- Encryption-Encap AVP (AVP code 12) - Encryption-Algorithm AVP (AVP code 13) Change-Id: I9a4245b526bc59c2ffa228ce46c80ce3250ef0b6 Reviewed-on: https://code.wireshark.org/review/189 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-pana.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c
index fa85537358..26dc17f8b6 100644
--- a/epan/dissectors/packet-pana.c
+++ b/epan/dissectors/packet-pana.c
@@ -136,7 +136,7 @@ static const value_string msg_subtype_names[] = {
{ 0, NULL }
};
-#define AVP_CODE_MAX 11
+#define AVP_CODE_MAX 13
static const value_string avp_code_names[] = {
{ 1, "AUTH AVP" },
{ 2, "EAP-Payload AVP" },
@@ -149,6 +149,8 @@ static const value_string avp_code_names[] = {
{ 9, "Termination-Cause" },
{ 10, "PaC-Information" },
{ 11, "Relayed-Message" },
+ { 12, "Encryption-Encap" },
+ { 13, "Encryption-Algorithm" },
{ 0, NULL }
};
@@ -304,6 +306,8 @@ pana_avp_get_type(guint16 avp_code, guint32 vendor_id)
case 9: return PANA_ENUMERATED; /* Termination-Cause AVP */
case 10: return PANA_OCTET_STRING; /* PaC-Information AVP */
case 11: return PANA_ENCAPSULATED; /* Relayed-Message AVP */
+ case 12: return PANA_OCTET_STRING; /* Encryption-Encap AVP */
+ case 13: return PANA_UNSIGNED32; /* Encryption-Algorithm AVP */
default: return PANA_OCTET_STRING;
}
} else {