aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Mathieson <martin.r.mathieson@googlemail.com>2007-06-22 12:42:47 +0000
committerMartin Mathieson <martin.r.mathieson@googlemail.com>2007-06-22 12:42:47 +0000
commit94d90dc979886802301a36123b3a287366aa654a (patch)
tree18e5816cd6a583cd5b6b6ad3fc699649c3f043e7
parentb4fe7f972ac9060754b23d7d172f794b9a73674c (diff)
NASREQ AVP 4 (NAS-IP-Address) is of type OctetString, not IPAddress
(according to RFC 4005). svn path=/trunk/; revision=22162
-rw-r--r--diameter/dictionary.xml2
-rw-r--r--epan/dissectors/packet-diameter-defs.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index af9cb93275..4e6da2cc4e 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -497,7 +497,7 @@
<type type-name="OctetString"/>
</avp>
<avp name="NAS-IP-Address" code="4" mandatory="may">
- <type type-name="IPAddress"/>
+ <type type-name="OctetString"/>
</avp>
<avp name="NAS-Port" code="5" mandatory="may">
<type type-name="Integer32"/>
diff --git a/epan/dissectors/packet-diameter-defs.h b/epan/dissectors/packet-diameter-defs.h
index 7249b1fc8b..d2b443ec6b 100644
--- a/epan/dissectors/packet-diameter-defs.h
+++ b/epan/dissectors/packet-diameter-defs.h
@@ -791,7 +791,7 @@ static struct old_avp_info old_diameter_avps[] = {
{ 1, "User-Name", DIAMETER_UTF8STRING, (value_string *)NULL},
{ 2, "User-Password", DIAMETER_OCTET_STRING, (value_string *)NULL},
{ 3, "CHAP-Password", DIAMETER_OCTET_STRING, (value_string *)NULL},
- { 4, "NAS-IP-Address", DIAMETER_IP_ADDRESS, (value_string *)NULL},
+ { 4, "NAS-IP-Address", DIAMETER_OCTET_STRING, (value_string *)NULL},
{ 5, "NAS-Port", DIAMETER_INTEGER32, (value_string *)NULL},
{ 6, "Service-Type", DIAMETER_ENUMERATED, diameter_service_type_vals},
{ 7, "Framed-Protocol", DIAMETER_ENUMERATED, diameter_framed_protocol_vals},