Changeset 1484:3bf80555f00a in freeDiameter for extensions/dict_dcca_3gpp/dict_dcca_3gpp.c

Timestamp:

Mar 27, 2020, 7:55:33 AM (4 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

Message:

dict_dcca_3gpp: change External-Identifier code

3GPP TS 29.061 table 9a does not define
External-Identifier (28) for Diameter.
3GPP TS 29.061 table 9b refers to 3GPP TS 29.336
for External-Identifier (3111).

External-Identifier (28) OctetString? replaced by
External-Identifier (3111) UTF8String,
from 3GPP TS 29.336 Table 6.4.1/1 and clause 6.4.11.

File:

• extensions/dict_dcca_3gpp/dict_dcca_3gpp.c (modified) (3 diffs)

extensions/dict_dcca_3gpp/dict_dcca_3gpp.c

@@ -73 +73 @@
  * it is Mandatory or not. The data currently in the document does not
  * match what was in the previous version of the freeDiameter
- * extension (the one that existedbefore I rewrote it) or what I saw
+ * extension (the one that existed before I rewrote it) or what I saw
  * so far. IIRC, even the table and the document contradict each
- * other. The AVP table is also missing an entry for
- * "External-Identifier", 28.
+ * other.
  *
  * 2. 29.140 has conflicting AVP names with other documents:
@@ -738 +737 @@
         };
 
-        /* added manually, missing in AVP table                             */
-        /* External-Identifier, OctetString, code 28, section 16.4.7        */
-        {
-                struct dict_avp_data data = {
-                        28,     /* Code */
-                        10415,  /* Vendor */
-                        "External-Identifier",  /* Name */
-                        AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,    /* Fixed flags */
-                        AVP_FLAG_VENDOR,        /* Fixed flag values */
-                        AVP_TYPE_OCTETSTRING    /* base type of data */
-                };
-                CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
-        };
+        /* Note: 3GPP TS 29.061 table 9a does not define                    */
+        /* External-Identifier (28) for Diameter.                           */
+        /* 3GPP TS 29.061 table 9b refers to 3GPP TS 29.336                 */
+        /* for External-Identifier (3111).                                  */
+        /*                                                                  */
+        /* External-Identifier (28) OctetString replaced by                 */
+        /* External-Identifier (3111) UTF8String.                           */
 
         /* TMGI, OctetString, code 900, section 17.07.02                    */
@@ -8769 +8762 @@
                 };
                 CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
+        };
+
+        /*==================================================================*/
+        /* 3GPP TS 29.336 V15.7.0 (2019-09)                                 */
+        /* From 3GPP 29336-f70.docx                                         */
+        /*==================================================================*/
+
+        /*==================================================================*/
+        /* 3GPP TS 29.336 Table 6.4.1/1: S6m/S6n specific Diameter AVPs     */
+        /*                                                                  */
+        /* Note: This is incomplete.                                        */
+        /*==================================================================*/
+
+        /* External-Identifier, UTF8String, code 3111, section 6.4.11       */
+        {
+                struct dict_avp_data data = {
+                        3111,   /* Code */
+                        10415,  /* Vendor */
+                        "External-Identifier",  /* Name */
+                        AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,    /* Fixed flags */
+                        AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,    /* Fixed flag values */
+                        AVP_TYPE_OCTETSTRING    /* base type of data */
+                };
+                CHECK_dict_new(DICT_AVP, &data, UTF8String_type, NULL);
         };