aboutsummaryrefslogtreecommitdiffstats
path: root/diameter
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2020-09-16 12:44:06 +0200
committerAndersBroman <a.broman58@gmail.com>2020-09-16 13:25:38 +0000
commit0d179f114ce6625d7b2eadd02d206d2d62d4d3e6 (patch)
tree74ba40118acd8b4e73c07931c14253a76f9ca46a /diameter
parent11adf2d019b05474ba32de5595d5eda1bf54b36a (diff)
Diameter:Define a new type-name type-name="OctetStringOrUTF8"
Define a bew type name type-name="OctetStringOrUTF8" type-parent="OctetString" to be used with OctetStrings that CAN be strings. This is a Wireshark unique addition to the xml dixtionarys and makes use of BASE_SHOW_ASCII_PRINTABLE.
Diffstat (limited to 'diameter')
-rw-r--r--diameter/TGPP.xml2
-rw-r--r--diameter/dictionary.xml5
2 files changed, 5 insertions, 2 deletions
diff --git a/diameter/TGPP.xml b/diameter/TGPP.xml
index 709fdb4b16..cc530ecb80 100644
--- a/diameter/TGPP.xml
+++ b/diameter/TGPP.xml
@@ -13,7 +13,7 @@
<type type-name="UTF8String"/>
</avp>
<avp name="3GPP-Charging-Id" code="2" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
- <type type-name="OctetString"/>
+ <type type-name="OctetStringOrUTF8"/>
</avp>
<avp name="3GPP-PDP-Type" code="3" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
<type type-name="Enumerated"/>
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index ec029543cd..c090494d76 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -687,7 +687,10 @@
network byte order. The AVP Length field MUST be set to 16 (20 if
the 'V' bit is enabled).
-->
-
+ <typedefn type-name="OctetStringOrUTF8" type-parent="OctetString"/>
+ <!-- A Wireshark extension to be able to use
+ BASE_SHOW_ASCII_PRINTABLE 0x00010000 show byte array as ASCII if it's all printable characters
+ -->
<!-- ************************************************************** -->
<!-- ************************* End Typedefns ************************ -->
<!-- ************************************************************** -->