Changes in / [1316:2e868f71832f:1319:69f89db51c72] in freeDiameter

Files:

• extensions/dict_dcca/dict_dcca.c (modified) (1 diff)
• extensions/dict_legacy_xml/dict_lxml_xml.c (modified) (4 diffs)
• extensions/dict_nasreq/dict_nasreq.c (modified) (1 diff)
• extensions/dict_sip/dict_sip.c (modified) (1 diff)
• libfdcore/dict_base_proto.c (modified) (4 diffs)

extensions/dict_dcca/dict_dcca.c

@@ -80 +80 @@
     {
         struct dict_object *ResultCodeType;
-        CHECK_dict_search(DICT_TYPE, TYPE_BY_NAME, "Enumerated*(Result-Code)", &ResultCodeType);
+        CHECK_dict_search(DICT_TYPE, TYPE_BY_NAME, "Enumerated(Result-Code)", &ResultCodeType);
 
         {

extensions/dict_legacy_xml/dict_lxml_xml.c

@@ -1314 +1314 @@
         PREDEF_TYPES( "Integer64",   AVP_TYPE_INTEGER64   );
         PREDEF_TYPES( "Unsigned32",  AVP_TYPE_UNSIGNED32  );
-        PREDEF_TYPES( "Enumerated",  AVP_TYPE_UNSIGNED32  );
+        PREDEF_TYPES( "Enumerated",  AVP_TYPE_INTEGER32  );
         PREDEF_TYPES( "Unsigned64",  AVP_TYPE_UNSIGNED64  );
         PREDEF_TYPES( "Float32",     AVP_TYPE_FLOAT32     );
@@ -1454 +1454 @@
                 if (!strcasecmp("Enumerated", (char *)((struct t_avptype *)a->type.next)->type_name))
                         goto enumerated;
-                /* Let's allow "Unsigned32" instead of "Enumerated" also... */
-                if ((!FD_IS_LIST_EMPTY(&a->enums)) && (!strcasecmp("Unsigned32", (char *)((struct t_avptype *)a->type.next)->type_name)))
+                /* Let's allow "Integer32" instead of "Enumerated" also... */
+                if ((!FD_IS_LIST_EMPTY(&a->enums)) && (!strcasecmp("Integer32", (char *)((struct t_avptype *)a->type.next)->type_name)))
                         goto enumerated;
                 
@@ -1480 +1480 @@
                                 
 enumerated:
-                                snprintf(typename, sizeof(typename), "Enumerated*(%s)", ad.avp_name);
+                                snprintf(typename, sizeof(typename), "Enumerated(%s)", ad.avp_name);
                                 memset(&tdata, 0, sizeof(tdata));
-                                tdata.type_base = AVP_TYPE_UNSIGNED32;
+                                tdata.type_base = AVP_TYPE_INTEGER32;
                                 tdata.type_name = &typename[0];
                                 CHECK_FCT( fd_dict_new ( fD_dict, DICT_TYPE, &tdata, fd_appl, &type ) );
@@ -1488 +1488 @@
                                         *nb_added += 1;
                                 
-                                ad.avp_basetype = AVP_TYPE_UNSIGNED32;
+                                ad.avp_basetype = AVP_TYPE_INTEGER32;
                         }
                 }

extensions/dict_nasreq/dict_nasreq.c

@@ -468 +468 @@
                         */
                         struct dict_object      *type;
-                        struct dict_type_data    tdata = { AVP_TYPE_OCTETSTRING,        "Enumerated*(Originating-Line-Info)"    , NULL, NULL};
+                        struct dict_type_data    tdata = { AVP_TYPE_OCTETSTRING,        "Enumerated(Originating-Line-Info)"     , NULL, NULL};
                         struct dict_enumval_data tvals[] = {
                                 enumval_def_os( 2, "00", "Plain Old Telephone Service (POTS)"),

extensions/dict_sip/dict_sip.c

@@ -1439 +1439 @@
                 {
                         struct dict_object * resultcode_data_type;
-                        CHECK_dict_search(DICT_TYPE,TYPE_BY_NAME,"Enumerated*(Result-Code)",&resultcode_data_type);
+                        CHECK_dict_search(DICT_TYPE,TYPE_BY_NAME,"Enumerated(Result-Code)",&resultcode_data_type);
                 
 

libfdcore/dict_base_proto.c

@@ -810 +810 @@
                         
                         struct dict_object      *       type;
-                        struct dict_type_data           tdata = { AVP_TYPE_UNSIGNED32,  "Enumerated*(Inband-Security-Id)"       , NULL, NULL, NULL };
+                        struct dict_type_data           tdata = { AVP_TYPE_UNSIGNED32,  "Enumerated(Inband-Security-Id)"        , NULL, NULL, NULL };
                         struct dict_enumval_data        t_0 = { "NO_INBAND_SECURITY",           { .u32 = ACV_ISI_NO_INBAND_SECURITY }};
                         struct dict_enumval_data        t_1 = { "TLS",                  { .u32 = ACV_ISI_TLS }};
@@ -1105 +1105 @@
                          */
                         struct dict_object *    type;
-                        struct dict_type_data   tdata = { AVP_TYPE_UNSIGNED32,  "Enumerated*(Result-Code)"      , NULL, NULL, NULL };
+                        struct dict_type_data   tdata = { AVP_TYPE_UNSIGNED32,  "Enumerated(Result-Code)"       , NULL, NULL, NULL };
                         struct dict_avp_data    data = { 
                                         268,                                    /* Code */
@@ -1631 +1631 @@
                          */
                         struct dict_object *    type;
-                        struct dict_type_data   tdata = { AVP_TYPE_UNSIGNED32,  "Enumerated*(Experimental-Result-Code)" , NULL, NULL, NULL };
+                        struct dict_type_data   tdata = { AVP_TYPE_UNSIGNED32,  "Enumerated(Experimental-Result-Code)"  , NULL, NULL, NULL };
                         struct dict_avp_data    data = { 
                                         298,                                    /* Code */
@@ -2102 +2102 @@
                         
                         struct dict_object      *       type;
-                        struct dict_type_data           tdata = { AVP_TYPE_UNSIGNED32,  "Enumerated*(Session-Binding)"  , NULL, NULL, NULL };
+                        struct dict_type_data           tdata = { AVP_TYPE_UNSIGNED32,  "Enumerated(Session-Binding)"   , NULL, NULL, NULL };
                         struct dict_enumval_data        t_1 = { "RE_AUTH",              { .u32 = 1 }};
                         struct dict_enumval_data        t_2 = { "STR",                  { .u32 = 2 }};