Mercurial > hg > freeDiameter

changeset 1319:69f89db51c72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged
author Sebastien Decugis <sdecugis@nict.go.jp>
date Mon, 23 Jan 2017 23:36:40 +0900
parents 2e868f71832f (current diff) 2a5620128a9a (diff)
children 949973661b25
files
diffstat 5 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/extensions/dict_dcca/dict_dcca.c	Sat Dec 10 22:12:02 2016 +0800
+++ b/extensions/dict_dcca/dict_dcca.c	Mon Jan 23 23:36:40 2017 +0900
@@ -79,7 +79,7 @@
     /* Result codes */
     {
         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);
 
         {
             struct dict_enumval_data error_code = {"END_USER_SERVICE_DENIED",
--- a/extensions/dict_legacy_xml/dict_lxml_xml.c	Sat Dec 10 22:12:02 2016 +0800
+++ b/extensions/dict_legacy_xml/dict_lxml_xml.c	Mon Jan 23 23:36:40 2017 +0900
@@ -1313,7 +1313,7 @@
 	PREDEF_TYPES( "Integer32",   AVP_TYPE_INTEGER32   );
 	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     );
 	PREDEF_TYPES( "Float64",     AVP_TYPE_FLOAT64     );
@@ -1453,8 +1453,8 @@
 		/* special exception: we use per-AVP enumerated types in fD */
 		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;
 		
 		/* The type was explicitly specified, resolve it */
@@ -1479,15 +1479,15 @@
 				struct dict_type_data 	tdata;
 				
 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 ) );
 				if (nb_added)
 					*nb_added += 1;
 				
-				ad.avp_basetype = AVP_TYPE_UNSIGNED32;
+				ad.avp_basetype = AVP_TYPE_INTEGER32;
 			}
 		}
 	}
--- a/extensions/dict_nasreq/dict_nasreq.c	Sat Dec 10 22:12:02 2016 +0800
+++ b/extensions/dict_nasreq/dict_nasreq.c	Mon Jan 23 23:36:40 2017 +0900
@@ -467,7 +467,7 @@
 
 			*/
 			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)"),
 				enumval_def_os( 2, "01", "Multiparty Line (more than 2)"),
--- a/extensions/dict_sip/dict_sip.c	Sat Dec 10 22:12:02 2016 +0800
+++ b/extensions/dict_sip/dict_sip.c	Mon Jan 23 23:36:40 2017 +0900
@@ -1438,7 +1438,7 @@
 		/* Complement of Result-Code AVP values */
 		{
 			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);
 		
 
 			{
--- a/libfdcore/dict_base_proto.c	Sat Dec 10 22:12:02 2016 +0800
+++ b/libfdcore/dict_base_proto.c	Mon Jan 23 23:36:40 2017 +0900
@@ -809,7 +809,7 @@
 			 */
 			
 			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 }};
 			struct dict_avp_data 		data = { 
@@ -1104,7 +1104,7 @@
 			 * This is the reason for the "*" in the type name
 			 */
 			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 */
 					#if AC_RESULT_CODE != 268
@@ -1630,7 +1630,7 @@
 			 * This is the reason for the "*" in the type name. Vendors will have to define their values.
 			 */
 			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 */
 					0, 					/* Vendor */
@@ -2101,7 +2101,7 @@
 			 */
 			
 			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 }};
 			struct dict_enumval_data 	t_4 = { "ACCOUNTING", 		{ .u32 = 4 }};
"Welcome to our mercurial repository"