diff options
| -rw-r--r-- | diameter/NokiaSolutionsAndNetworks.xml | 2 | ||||
| -rw-r--r-- | diameter/dictionary.xml | 2 | ||||
| -rw-r--r-- | epan/diam_dict.l | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-diameter.c | 7 |
4 files changed, 10 insertions, 5 deletions
diff --git a/diameter/NokiaSolutionsAndNetworks.xml b/diameter/NokiaSolutionsAndNetworks.xml index eecd06fe83..ee11095ab0 100644 --- a/diameter/NokiaSolutionsAndNetworks.xml +++ b/diameter/NokiaSolutionsAndNetworks.xml @@ -13,7 +13,7 @@ </application> -<application> +<application id="16777302" name="3GPP Sy" uri="http://www.3gpp.org/ftp/Specs/html-info/29219.htm"> <avp name="Account-State" code="60528" mandatory-flag="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="NokiaSolutionsAndNetworks"> <type type-name="UTF8String" /> diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml index 7e1878a199..29eeda5b21 100644 --- a/diameter/dictionary.xml +++ b/diameter/dictionary.xml @@ -6616,6 +6616,7 @@ 16777238 is defined in Cisco.xml 16777267 is defined in TGPP.xml 16777292 is defined in TGPP.xml + 16777302 is defined in NokiaSolutionsAndNetworks.xml 16777304 is defined in SKT.xml 16777317 is defined in NokiaSolutionsAndNetworks.xml --> @@ -6634,7 +6635,6 @@ <application id="16777269" name="Ericsson HSI" uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application> <application id="16777272" name="3GPP S6b" uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm"></application> <application id="16777291" name="3GPP SLh" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588"></application> - <application id="16777302" name="3GPP Sy" uri="http://www.3gpp.org/ftp/Specs/html-info/29219.htm"></application> <application id="16777315" name="Ericsson Diameter Signalling Controller Application (DSC)" uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application> <application id="16777327" name="Ericsson Sx" uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application> <application id="4294967295" name="Relay" uri="http://www.ietf.org/rfc/rfc6733.txt?number=6733"></application> diff --git a/epan/diam_dict.l b/epan/diam_dict.l index 730c02652c..43fbcd9c26 100644 --- a/epan/diam_dict.l +++ b/epan/diam_dict.l @@ -512,11 +512,11 @@ description_attr description=\042 <TYPE_ATTRS,GAVP_ATTRS,ENUM_ATTRS>{stop} { BEGIN IN_AVP; } <TYPE_ATTRS,GAVP_ATTRS,ENUM_ATTRS>{stop_end} { BEGIN IN_AVP; } -<IN_AVP>{avp_end} { D(("avp_end")); BEGIN IN_APPL; } +<IN_AVP>{avp_end} { D(("avp_end\n")); BEGIN IN_APPL; } <IN_APPL>{application_end} | <IN_APPL>{base_end} { - BEGIN IN_DICT; + D(("application_end\n")); BEGIN IN_DICT; } <IN_DICT>{dictionary_end} { diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 34c9d90c0d..d43f4829f6 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -1774,6 +1774,11 @@ dictionary_load(void) item[0].value = p->code; item[0].strptr = p->name; + if (!p->name) { + report_failure("Diameter Dictionary: Invalid Application (empty name): id=%d\n", p->code); + continue; + } + wmem_array_append_one(arr,item); } @@ -1793,7 +1798,7 @@ dictionary_load(void) item[0].strptr = v->name; if (v->name == NULL) { - report_failure("Diameter Dictionary: Invalid Vendor (empty name): code==%d\n",v->code); + report_failure("Diameter Dictionary: Invalid Vendor (empty name): code==%d\n", v->code); continue; } |