--- a/CMakeLists.txt	Tue Jan 11 15:48:58 2011 +0900
+++ b/CMakeLists.txt	Fri Jan 14 15:15:23 2011 +0900
@@ -10,11 +10,11 @@
 
 # Version of the source code
 SET(FD_PROJECT_VERSION_MAJOR 1)
-SET(FD_PROJECT_VERSION_MINOR 0)
-SET(FD_PROJECT_VERSION_REV 4)
+SET(FD_PROJECT_VERSION_MINOR 1)
+SET(FD_PROJECT_VERSION_REV 0)
 
 # Version of the API with the library
-SET(FD_PROJECT_VERSION_API 3)
+SET(FD_PROJECT_VERSION_API 4)
 
 # The test framework, using CTest and CDash.
 INCLUDE(CTest)
@@ -30,7 +30,7 @@
 
 SET(INSTALL_HEADERS_SUFFIX 		include/freeDiameter 	CACHE PATH "Directory where the headers are installed (relative to CMAKE_INSTALL_PREFIX).")
 SET(INSTALL_DAEMON_SUFFIX 		bin 			CACHE PATH "Directory where the daemon binary is installed (relative to CMAKE_INSTALL_PREFIX).")
-SET(INSTALL_LIBRARY_SUFFIX 		lib 			CACHE PATH "Directory where the libfreeDiameter library is installed (relative to CMAKE_INSTALL_PREFIX).")
+SET(INSTALL_LIBRARY_SUFFIX 		lib 			CACHE PATH "Directory where the freeDiameter libraries are installed (relative to CMAKE_INSTALL_PREFIX).")
 SET(INSTALL_EXTENSIONS_SUFFIX 	${INSTALL_LIBRARY_SUFFIX}/freeDiameter	CACHE PATH "Directory where the extensions are installed / searched (relative to CMAKE_INSTALL_PREFIX).")
 
 # All source code should be POSIX 200112L compatible, but some other extensions might be used, so:
@@ -76,8 +76,15 @@
 SUBDIRS(include/freeDiameter)
 
 # Location for the source code
-SUBDIRS(libfreeDiameter)
-SUBDIRS(freeDiameter)
+SUBDIRS(libfdproto)
+SUBDIRS(libfdcore)
+SUBDIRS(freeDiameterd)
 
 # Extensions (there is no use of freeDiameter without any extension)
 SUBDIRS(extensions)
+
+# The unary tests directory
+IF ( BUILD_TESTING )
+	SUBDIRS(tests)
+ENDIF ( BUILD_TESTING )
+

--- a/contrib/debian/control	Tue Jan 11 15:48:58 2011 +0900
+++ b/contrib/debian/control	Fri Jan 14 15:15:23 2011 +0900
@@ -12,8 +12,8 @@
 Package: freediameter-common
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: The libfreeDiameter library.
- This library is required by all freeDiameter components.
+Description: The freeDiameter libraries.
+ This package contains the libraries required by all freeDiameter components.
  It may also be useful for other projects which need to 
  perform operations on Diameter messages. 
  .

--- a/contrib/debian/freediameter-common.install	Tue Jan 11 15:48:58 2011 +0900
+++ b/contrib/debian/freediameter-common.install	Fri Jan 14 15:15:23 2011 +0900
@@ -1,1 +1,2 @@
-usr/lib/libfreeDiameter.so*
+usr/lib/libfdproto.so*
+usr/lib/libfdcore.so*

--- a/extensions/dbg_interactive/CMakeLists.txt	Tue Jan 11 15:48:58 2011 +0900
+++ b/extensions/dbg_interactive/CMakeLists.txt	Fri Jan 14 15:15:23 2011 +0900
@@ -15,8 +15,8 @@
 # Add the dependencies for re-swig-ing the file
 SET(SWIG_MODULE_fDpy_EXTRA_DEPS 
 	${CMAKE_BINARY_DIR}/include/freeDiameter/freeDiameter-host.h 
-	${CMAKE_SOURCE_DIR}/include/freeDiameter/libfreeDiameter.h 
-	${CMAKE_SOURCE_DIR}/include/freeDiameter/freeDiameter.h
+	${CMAKE_SOURCE_DIR}/include/freeDiameter/libfdcore.h 
+	${CMAKE_SOURCE_DIR}/include/freeDiameter/libfdproto.h 
 	lists.i
 	dictionary.i
 	sessions.i

--- a/extensions/dbg_interactive/dbg_interactive.c	Tue Jan 11 15:48:58 2011 +0900
+++ b/extensions/dbg_interactive/dbg_interactive.c	Fri Jan 14 15:15:23 2011 +0900
@@ -58,7 +58,7 @@
 	
 	fd_log_threadname ( "fDpy" );
 	
-	CHECK_FCT_DO(fd_wait_initialization_complete(), goto end);
+	CHECK_FCT_DO(fd_core_waitstartcomplete(), goto end);
 	
 	fd_log_debug("\nStarting interactive python interpreter [experimental].\n");
 	if (!arg) 

--- a/extensions/dbg_interactive/dbg_interactive.i	Tue Jan 11 15:48:58 2011 +0900
+++ b/extensions/dbg_interactive/dbg_interactive.i	Fri Jan 14 15:15:23 2011 +0900
@@ -158,8 +158,8 @@
  Now, create wrappers for (almost) all objects from fD API 
  *********************************************************/
 %include "freeDiameter/freeDiameter-host.h"
-%include "freeDiameter/libfreeDiameter.h"
-%include "freeDiameter/freeDiameter.h"
+%include "freeDiameter/libfdproto.h"
+%include "freeDiameter/libfdcore.h"
 
 /* Most of the functions from the API are not directly usable "as is".
 See the specific following files and the dbg_interactive.py.sample file

--- a/extensions/dbg_monitor/dbg_monitor.c	Tue Jan 11 15:48:58 2011 +0900
+++ b/extensions/dbg_monitor/dbg_monitor.c	Fri Jan 14 15:15:23 2011 +0900
@@ -77,7 +77,7 @@
 }
 
 /* Function called on receipt of MONITOR_SIGNAL */
-static void got_sig(int signal)
+static void got_sig()
 {
 	fd_log_debug("[dbg_monitor] Dumping extra information\n");
 	CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_DUMP_DICT, 0, NULL), /* continue */);
@@ -91,7 +91,7 @@
 	TRACE_ENTRY("%p", conffile);
 	
 	/* Catch signal SIGUSR1 */
-	CHECK_FCT( fd_sig_register(MONITOR_SIGNAL, "dbg_monitor", got_sig));
+	CHECK_FCT( fd_event_trig_regcb(MONITOR_SIGNAL, "dbg_monitor", got_sig));
 	
 	CHECK_POSIX( pthread_create( &thr, NULL, mn_thr, NULL ) );
 	return 0;

--- a/extensions/dict_eap/dict_eap.c	Tue Jan 11 15:48:58 2011 +0900
+++ b/extensions/dict_eap/dict_eap.c	Fri Jan 14 15:15:23 2011 +0900
@@ -295,7 +295,7 @@
 			struct dict_cmd_data data = { 
 					268, 					/* Code */
 					"Diameter-EAP-Request", 		/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_RETRANSMIT | CMD_FLAG_ERROR, 	/* Fixed flags */
+					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_ERROR, /* Fixed flags */
 					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE 			/* Fixed flag values */
 					};
 			struct local_rules_definition rules[] = 

--- a/extensions/dict_legacy_xml/dict_lxml_xml.c	Tue Jan 11 15:48:58 2011 +0900
+++ b/extensions/dict_legacy_xml/dict_lxml_xml.c	Fri Jan 14 15:15:23 2011 +0900
@@ -932,6 +932,13 @@
 				CHECK_PARAMS_DO(xname, 
 					{ TRACE_DEBUG(INFO, "Invalid 'type' tag found without 'name' attribute."); goto xml_tree_error; } );
 				
+				/* Check there is only 1 type */
+				if (!FD_IS_LIST_EMPTY(&data->cur_avp->type)) {
+					TRACE_DEBUG(INFO, "Multiple 'type' tags found for AVP.");
+					goto xml_tree_error;
+				}
+				
+				/* Add the new type */
 				CHECK_FCT_DO( new_avptype(&data->cur_avp->type, xname),
 					{ TRACE_DEBUG(INFO, "An error occurred while parsing a type tag. Entry ignored."); goto xml_tree_error; } )
 				
@@ -1010,6 +1017,15 @@
 		TRACE_DEBUG(INFO, "Unexpected XML element found: '%s'. Ignoring...", name);
 	}
 	data->error_depth += 1;
+	if (data->cur_app || data->cur_cmd || data->cur_avp) {
+		TRACE_DEBUG(INFO, "Error encountered while parsing tag of:");
+		if (data->cur_app)
+			fd_log_debug("  Application: '%s'\n", data->cur_app->name);
+		if (data->cur_cmd)
+			fd_log_debug("  Command    : '%s'\n", data->cur_cmd->name);
+		if (data->cur_avp)
+			fd_log_debug("  AVP        : '%s'\n", data->cur_avp->name);
+	}
 	return;
 }
 
@@ -1386,7 +1402,8 @@
 		CHECK_FCT(ret);
 		
 		/* Now create the new rule */
-		CHECK_FCT( fd_dict_new ( fD_dict, DICT_RULE, &rd, parent, NULL ) );
+		CHECK_FCT_DO( ret = fd_dict_new ( fD_dict, DICT_RULE, &rd, parent, NULL ),
+			{ TRACE_DEBUG(INFO, "Error creating rule for sub-AVP '%s'", r->avpname); return ret; } );
 		if (nb_added)
 			*nb_added += 1;
 	}
@@ -1397,12 +1414,17 @@
 /* Process lists of rules */
 static int rules_to_fD(struct dictionary * fD_dict, struct dict_object * parent, struct fd_list * fixed, struct fd_list * required, struct fd_list * optional, int * nb_added)
 {
+	int ret;
+	
 	TRACE_ENTRY("%p %p %p %p %p %p", fD_dict, parent, fixed, required, optional, nb_added);
 	
 	/* Process the rules */
-	CHECK_FCT( rules_to_fD_onelist(fD_dict, parent, RULE_FIXED_HEAD, fixed, nb_added) );
-	CHECK_FCT( rules_to_fD_onelist(fD_dict, parent, RULE_REQUIRED, required, nb_added) );
-	CHECK_FCT( rules_to_fD_onelist(fD_dict, parent, RULE_OPTIONAL, optional, nb_added) );
+	CHECK_FCT_DO( ret = rules_to_fD_onelist(fD_dict, parent, RULE_FIXED_HEAD, fixed, nb_added),
+		{ TRACE_DEBUG(INFO, "Error processing FIXED rules"); return ret; } );
+	CHECK_FCT_DO( ret = rules_to_fD_onelist(fD_dict, parent, RULE_REQUIRED, required, nb_added),
+		{ TRACE_DEBUG(INFO, "Error processing REQUIRED rules"); return ret; } );
+	CHECK_FCT_DO( ret = rules_to_fD_onelist(fD_dict, parent, RULE_OPTIONAL, optional, nb_added),
+		{ TRACE_DEBUG(INFO, "Error processing OPTIONAL rules"); return ret; } );
 	
 	return 0;
 }
@@ -1424,12 +1446,15 @@
 	ad.avp_code   = a->code;
 	ad.avp_vendor = a->vendor;
 	ad.avp_name   = (char *)a->name;
-	ad.avp_flag_mask = a->fmask;
+	ad.avp_flag_mask = a->fmask | AVP_FLAG_VENDOR;
 	ad.avp_flag_val  = a->flags;
 	
 	if (!FD_IS_LIST_EMPTY(&a->type)) {
 		/* special exception: we use per-AVP enumerated types in fD */
-		if (strcasecmp("Enumerated", (char *)((struct t_avptype *)a->type.next)->type_name))
+		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)))
 			goto enumerated;
 		
 		/* The type was explicitly specified, resolve it */
@@ -1440,12 +1465,13 @@
 			|| !FD_IS_LIST_EMPTY(&a->grouped_required)
 			|| !FD_IS_LIST_EMPTY(&a->grouped_fixed) ) {
 			/* The AVP has rules, it is a grouped AVP */
-			CHECK_PARAMS( FD_IS_LIST_EMPTY(&a->enums) );
+			CHECK_PARAMS_DO( FD_IS_LIST_EMPTY(&a->enums), 
+				{ TRACE_DEBUG(INFO, "Conflict: The AVP '%s' has both enum values and rules.", ad.avp_name); return EINVAL; } );
 			ad.avp_basetype = AVP_TYPE_GROUPED;
 		} else {
 			/* It should be an enumerated AVP... */
 			if (FD_IS_LIST_EMPTY(&a->enums)) {
-				TRACE_DEBUG(INFO, "[dict_legacy_xml] Error: Missing type information for AVP '%s'", ad.avp_name);
+				TRACE_DEBUG(INFO, "Error: Missing type information for AVP '%s'", ad.avp_name);
 				return EINVAL;
 			} else {
 				/* We create a new type to hold the enumerated values -- fD specifics */
@@ -1491,8 +1517,12 @@
 inside:
 	/* Now, the inner elements, if any */
 	
+	if ( (!FD_IS_LIST_EMPTY(&a->enums)) && (ad.avp_basetype != AVP_TYPE_UNSIGNED32)) {
+		TRACE_DEBUG(INFO, "AVP '%s' type is not an Unsigned32 but it has enum values (invalid in this extension).", ad.avp_name);
+		return EINVAL;
+	}
+
 	/* In case of enumeration, define the enum values */
-	ASSERT( FD_IS_LIST_EMPTY(&a->enums) || (type && (ad.avp_basetype == AVP_TYPE_UNSIGNED32)) ); /* u32 type must be defined for enumerators */
 	for (li = a->enums.next; li != &a->enums; li = li->next) {
 		struct t_enum * e = (struct t_enum *)li;
 		struct dict_enumval_data ed;
@@ -1501,7 +1531,11 @@
 		ed.enum_name = (char *)e->name;
 		ed.enum_value.u32 = e->code;
 		
-		CHECK_FCT( fd_dict_new ( fD_dict, DICT_ENUMVAL, &ed, type, NULL ) );
+		CHECK_FCT_DO( ret = fd_dict_new ( fD_dict, DICT_ENUMVAL, &ed, type, NULL ),
+			{
+				TRACE_DEBUG(INFO, "Error defining constant value '%s' for AVP '%s': %s", ed.enum_name, ad.avp_name, strerror(ret));
+				return ret;
+			} );
 		if (nb_added)
 			*nb_added += 1;
 	}
@@ -1510,8 +1544,10 @@
 	if ( !FD_IS_LIST_EMPTY(&a->grouped_optional)
 	  || !FD_IS_LIST_EMPTY(&a->grouped_required)
 	  || !FD_IS_LIST_EMPTY(&a->grouped_fixed) ) {
-		CHECK_PARAMS( ad.avp_basetype == AVP_TYPE_GROUPED );
-		CHECK_FCT( rules_to_fD(fD_dict, prev, &a->grouped_fixed, &a->grouped_required, &a->grouped_optional, nb_added) );
+		CHECK_PARAMS_DO( ad.avp_basetype == AVP_TYPE_GROUPED, 
+			{ TRACE_DEBUG(INFO, "Got rules for non-grouped AVP '%s'", ad.avp_name); return EINVAL;} );
+		CHECK_FCT_DO( ret = rules_to_fD(fD_dict, prev, &a->grouped_fixed, &a->grouped_required, &a->grouped_optional, nb_added),
+			{ TRACE_DEBUG(INFO, "Error processing rules for AVP '%s': %s", ad.avp_name, strerror(ret)); return ret; } );
 	}
 	
 	/* done! */
@@ -1535,7 +1571,7 @@
 	cd.cmd_code = c->code;
 	snprintf(cmdname, sizeof(cmdname), "%s-Request", (char *)c->name);
 	cd.cmd_name = &cmdname[0];
-	cd.cmd_flag_mask = c->fmask | CMD_FLAG_REQUEST;
+	cd.cmd_flag_mask = c->fmask | CMD_FLAG_REQUEST | CMD_FLAG_ERROR;
 	cd.cmd_flag_val  = c->flags | CMD_FLAG_REQUEST;
 	
 	/* Create or search in the dictionary */
@@ -1563,6 +1599,7 @@
 	/* update data for the answer */
 	snprintf(cmdname, sizeof(cmdname), "%s-Answer", (char *)c->name);
 	cd.cmd_flag_val &= ~CMD_FLAG_REQUEST;
+	cd.cmd_flag_mask &= ~CMD_FLAG_ERROR;
 	
 	ret = fd_dict_new ( fD_dict, DICT_COMMAND, &cd, fd_appl, &ans );
 	if (ret == EEXIST) {
@@ -1584,8 +1621,16 @@
 	
 rules:
 	/* Now process the rules inside the command */
-	CHECK_FCT( rules_to_fD(fD_dict, req, &c->reqrules_fixed, &c->reqrules_required, &c->reqrules_optional, nb_added) );
-	CHECK_FCT( rules_to_fD(fD_dict, ans, &c->ansrules_fixed, &c->ansrules_required, &c->ansrules_optional, nb_added) );
+	CHECK_FCT_DO( ret = rules_to_fD(fD_dict, req, &c->reqrules_fixed, &c->reqrules_required, &c->reqrules_optional, nb_added),
+			{
+				TRACE_DEBUG(INFO, "Error converting data from request rules: %s", strerror(ret));
+				return ret;
+			}   );
+	CHECK_FCT_DO( ret = rules_to_fD(fD_dict, ans, &c->ansrules_fixed, &c->ansrules_required, &c->ansrules_optional, nb_added),
+			{
+				TRACE_DEBUG(INFO, "Error converting data from answer rules: %s", strerror(ret));
+				return ret;
+			}   );
 	
 	/* Done */
 	return 0;
@@ -1640,17 +1685,29 @@
 	
 	/* First, define all the types */
 	for (li = a->types.next; li != &a->types; li = li->next) {
-		CHECK_FCT( typdefn_to_fD((struct t_typedefn *)li, fD_dict, prev, NULL, nb_added) );
+		CHECK_FCT_DO( ret = typdefn_to_fD((struct t_typedefn *)li, fD_dict, prev, NULL, nb_added),
+			{
+				TRACE_DEBUG(INFO, "Error converting data from typedefn '%s': %s", ((struct t_typedefn *)li)->name, strerror(ret));
+				return ret;
+			}  );
 	}
 	
 	/* Then, AVPs, enums, and grouped AVP rules */
 	for (li = a->avps.next; li != &a->avps; li = li->next) {
-		CHECK_FCT( avp_to_fD((struct t_avp *)li, fD_dict, prev, NULL, nb_added) );
+		CHECK_FCT_DO( ret = avp_to_fD((struct t_avp *)li, fD_dict, prev, NULL, nb_added),
+			{
+				TRACE_DEBUG(INFO, "Error converting data from AVP '%s': %s", ((struct t_avp *)li)->name, strerror(ret));
+				return ret;
+			}  );
 	}
 	
 	/* Finally, the commands and rules */
 	for (li = a->commands.next; li != &a->commands; li = li->next) {
-		CHECK_FCT( cmd_to_fD((struct t_cmd *)li, fD_dict, prev, NULL, nb_added) );
+		CHECK_FCT_DO( ret = cmd_to_fD((struct t_cmd *)li, fD_dict, prev, NULL, nb_added),
+			{
+				TRACE_DEBUG(INFO, "Error converting data from command '%s': %s", ((struct t_cmd *)li)->name, strerror(ret));
+				return ret;
+			}  );
 	}
 	
 	/* done! */
@@ -1661,6 +1718,7 @@
 static int dict_to_fD(struct dictionary * fD_dict, struct t_dictionary * xmldict, int * nb_added)
 {
 	struct fd_list * li;
+	int ret;
 	
 	TRACE_ENTRY("%p %p %p", fD_dict, xmldict, nb_added);
 	
@@ -1670,13 +1728,25 @@
 	
 	/* Create all the vendors */
 	for (li = xmldict->vendors.next; li != &xmldict->vendors; li = li->next) {
-		CHECK_FCT( vend_to_fD((struct t_vend *)li, fD_dict, NULL, nb_added) );
+		CHECK_FCT_DO( ret = vend_to_fD((struct t_vend *)li, fD_dict, NULL, nb_added),
+			{
+				TRACE_DEBUG(INFO, "Error converting data from vendor '%s': %s", ((struct t_vend *)li)->name, strerror(ret));
+				return ret;
+			} );
 	}
 	
 	/* Now, process each application */
-	CHECK_FCT( appl_to_fD(&xmldict->base_and_applications, fD_dict, NULL, nb_added) );
+	CHECK_FCT_DO( ret = appl_to_fD(&xmldict->base_and_applications, fD_dict, NULL, nb_added),
+			{
+				TRACE_DEBUG(INFO, "Error converting data from Base application: %s", strerror(ret));
+				return ret;
+			} );
 	for (li = xmldict->base_and_applications.chain.next; li != &xmldict->base_and_applications.chain; li = li->next) {
-		CHECK_FCT( appl_to_fD((struct t_appl *) li, fD_dict, NULL, nb_added) );
+		CHECK_FCT_DO( ret = appl_to_fD((struct t_appl *) li, fD_dict, NULL, nb_added),
+			{
+				TRACE_DEBUG(INFO, "Error converting data from application '%s': %s", ((struct t_appl *)li)->name, strerror(ret));
+				return ret;
+			}  );
 	}
 	
 	/* Complete! */
@@ -1724,15 +1794,20 @@
 		return -1;
 	}
 	
-	TRACE_DEBUG(FULL, "XML file parsing complete.");
+	TRACE_DEBUG(FULL, "XML file parsing, 1st pass completed.");
 	if (TRACE_BOOL(ANNOYING)) {
 		dump_dict(&data.dict);
 	}
 	
 	/* Now, convert all the objects from the temporary tree into the freeDiameter dictionary */
-	CHECK_FCT_DO( dict_to_fD(fd_g_config->cnf_dict, &data.dict, &ret), { del_dict_contents(&data.dict); return -1; } );
+	CHECK_FCT_DO( dict_to_fD(fd_g_config->cnf_dict, &data.dict, &ret), 
+		{ 
+			TRACE_DEBUG(INFO, "Error while converting data read from file '%s'", xmlfilename);
+			del_dict_contents(&data.dict); 
+			return -1; 
+		} );
 	
-	TRACE_DEBUG(FULL, "Conversion to freeDiameter internal format complete.");
+	TRACE_DEBUG(FULL, "Conversion from '%s' to freeDiameter internal format complete.", xmlfilename);
 	if (TRACE_BOOL(ANNOYING)) {
 		fd_dict_dump(fd_g_config->cnf_dict);
 	}

--- a/extensions/dict_nasreq/dict_nasreq.c	Tue Jan 11 15:48:58 2011 +0900
+++ b/extensions/dict_nasreq/dict_nasreq.c	Fri Jan 14 15:15:23 2011 +0900
@@ -3004,7 +3004,7 @@
 			struct dict_cmd_data data = { 
 					265, 					/* Code */
 					"AA-Request", 				/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_RETRANSMIT | CMD_FLAG_ERROR, 	/* Fixed flags */
+					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_ERROR, /* Fixed flags */
 					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE 			/* Fixed flag values */
 					};
 			struct local_rules_definition rules[] = 

--- a/extensions/test_app/ta_bench.c	Tue Jan 11 15:48:58 2011 +0900
+++ b/extensions/test_app/ta_bench.c	Fri Jan 14 15:15:23 2011 +0900
@@ -207,7 +207,7 @@
 }
 
 /* The function called when the signal is received */
-static void ta_bench_start(int sig) {
+static void ta_bench_start() {
 	struct timespec end_time, now;
 	struct ta_stats start, end;
 	
@@ -273,14 +273,14 @@
 {
 	CHECK_SYS( sem_init( &ta_sem, 0, ta_conf->bench_concur) );
 
-	CHECK_FCT( fd_sig_register(ta_conf->signal, "test_app.bench", ta_bench_start ) );
+	CHECK_FCT( fd_event_trig_regcb(ta_conf->signal, "test_app.bench", ta_bench_start ) );
 	
 	return 0;
 }
 
 void ta_bench_fini(void)
 {
-	CHECK_FCT_DO( fd_sig_unregister(ta_conf->signal), /* continue */ );
+	// CHECK_FCT_DO( fd_sig_unregister(ta_conf->signal), /* continue */ );
 	
 	CHECK_SYS_DO( sem_destroy(&ta_sem), );
 	

--- a/extensions/test_app/ta_cli.c	Tue Jan 11 15:48:58 2011 +0900
+++ b/extensions/test_app/ta_cli.c	Fri Jan 14 15:15:23 2011 +0900
@@ -135,7 +135,7 @@
 }
 
 /* Create a test message */
-static void ta_cli_test_message(int sig)
+static void ta_cli_test_message()
 {
 	struct msg * req = NULL;
 	struct avp * avp;
@@ -235,14 +235,14 @@
 {
 	CHECK_FCT( fd_sess_handler_create(&ta_cli_reg, free, NULL) );
 	
-	CHECK_FCT( fd_sig_register(ta_conf->signal, "test_app.cli", ta_cli_test_message ) );
+	CHECK_FCT( fd_event_trig_regcb(ta_conf->signal, "test_app.cli", ta_cli_test_message ) );
 	
 	return 0;
 }
 
 void ta_cli_fini(void)
 {
-	CHECK_FCT_DO( fd_sig_unregister(ta_conf->signal), /* continue */ );
+	// CHECK_FCT_DO( fd_sig_unregister(ta_conf->signal), /* continue */ );
 	
 	CHECK_FCT_DO( fd_sess_handler_destroy(&ta_cli_reg, NULL), /* continue */ );
 	

--- a/extensions/test_sip/test_sip.c	Tue Jan 11 15:48:58 2011 +0900
+++ b/extensions/test_sip/test_sip.c	Fri Jan 14 15:15:23 2011 +0900
@@ -214,9 +214,9 @@
 	*/
 	
 	CHECK_FCT(fd_sess_handler_create(&ts_sess_hdl, free, NULL));
-	//CHECK_FCT( fd_sig_register(30, "test_sip", (void *)test_sipSL_LIR_cb ) );
-	CHECK_FCT( fd_sig_register(30, "test_sip", (void *)test_sip_SAR_cb ) );
-	CHECK_FCT( fd_sig_register(31, "test_sip", (void *)test_sip_LIR_cb ) );
+	//CHECK_FCT( fd_event_trig_regcb(30, "test_sip", (void *)test_sipSL_LIR_cb ) );
+	CHECK_FCT( fd_event_trig_regcb(30, "test_sip", (void *)test_sip_SAR_cb ) );
+	CHECK_FCT( fd_event_trig_regcb(31, "test_sip", (void *)test_sip_LIR_cb ) );
 	
 	return 0;
 }

--- a/freeDiameter/CMakeLists.txt	Tue Jan 11 15:48:58 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-# The subproject name
-Project("freeDiameterd" C)
-
-# Configuration parser
-BISON_FILE(fdd.y)
-FLEX_FILE(fdd.l)
-SET_SOURCE_FILES_PROPERTIES(lex.fdd.c fdd.tab.c PROPERTIES COMPILE_FLAGS "-I ${CMAKE_CURRENT_SOURCE_DIR}")
-
-# List of source files
-SET(FD_COMMON_SRC
-	fD.h
-	apps.c
-	cnxctx.h
-	config.c
-	cnxctx.c
-	endpoints.c
-	events.c
-	extensions.c
-	dict_base_proto.c
-	messages.c
-	queues.c
-	peers.c
-	p_ce.c
-	p_cnx.c
-	p_dw.c
-	p_dp.c
-	p_expiry.c
-	p_out.c
-	p_psm.c
-	p_sr.c
-	routing_dispatch.c
-	server.c
-	tcp.c
-	)
-
-IF(NOT DISABLE_SCTP)
-	SET(FD_COMMON_SRC ${FD_COMMON_SRC} sctp.c sctps.c)
-ENDIF(NOT DISABLE_SCTP)
-
-SET(FD_COMMON_GEN_SRC
-		lex.fdd.c
-		fdd.tab.c
-		fdd.tab.h
-	)
-	
-# Save the list of files for the tests 
-SET(FD_COMMON_SRC ${FD_COMMON_SRC} PARENT_SCOPE)
-SET(FD_COMMON_GEN_SRC ${FD_COMMON_GEN_SRC} PARENT_SCOPE)
-
-
-# Require GNU TLS for building the daemon
-FIND_PACKAGE(GnuTLS REQUIRED)
-INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIR})
-SET(FD_LIBS ${FD_LIBS} ${GNUTLS_LIBRARIES})
-find_path(GCRYPT_INCLUDE_DIR NAMES gcrypt.h)
-If ( NOT GCRYPT_INCLUDE_DIR )
-	MESSAGE(SEND_ERROR "Unable to find gcrypt.h, please install libgcrypt-dev or equivalent")
-Endif ( NOT GCRYPT_INCLUDE_DIR )
-MARK_AS_ADVANCED(GCRYPT_INCLUDE_DIR)
-INCLUDE_DIRECTORIES(${GCRYPT_INCLUDE_DIR})
-
-# Also we need libgcrypt to... display its version :(
-find_library(GCRYPT_LIBRARY 
-  NAMES gcrypt
-)
-If ( NOT GCRYPT_LIBRARY )
-	MESSAGE(SEND_ERROR "Unable to find libgcrypt, please install libgcrypt or equivalent")
-Endif ( NOT GCRYPT_LIBRARY )
-SET(FD_LIBS ${FD_LIBS} ${GCRYPT_LIBRARY})
-
-
-
-# Build the executable
-ADD_EXECUTABLE(freeDiameterd ${FD_COMMON_SRC} ${FD_COMMON_GEN_SRC} main.c)
-
-# The version
-SET_TARGET_PROPERTIES(freeDiameterd PROPERTIES 
-	VERSION ${FD_PROJECT_VERSION_MAJOR}.${FD_PROJECT_VERSION_MINOR}.${FD_PROJECT_VERSION_REV})
-
-# The link command
-LINK_DIRECTORIES(${CURRENT_BINARY_DIR}/../libfreeDiameter)
-TARGET_LINK_LIBRARIES(freeDiameterd libfreeDiameter ${FD_LIBS})
-
-# The unary tests directory
-IF ( BUILD_TESTING )
-	SUBDIRS(tests)
-ENDIF ( BUILD_TESTING )
-
-####
-## INSTALL section ##
-
-INSTALL(TARGETS freeDiameterd
-	RUNTIME DESTINATION ${INSTALL_DAEMON_SUFFIX}
-	COMPONENT freeDiameter-daemon)

--- a/freeDiameter/apps.c	Tue Jan 11 15:48:58 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-/*********************************************************************************************************
-* Software License Agreement (BSD License)                                                               *
-* Author: Sebastien Decugis <sdecugis@nict.go.jp>							 *
-*													 *
-* Copyright (c) 2010, WIDE Project and NICT								 *
-* All rights reserved.											 *
-* 													 *
-* Redistribution and use of this software in source and binary forms, with or without modification, are  *
-* permitted provided that the following conditions are met:						 *
-* 													 *
-* * Redistributions of source code must retain the above 						 *
-*   copyright notice, this list of conditions and the 							 *
-*   following disclaimer.										 *
-*    													 *
-* * Redistributions in binary form must reproduce the above 						 *
-*   copyright notice, this list of conditions and the 							 *
-*   following disclaimer in the documentation and/or other						 *
-*   materials provided with the distribution.								 *
-* 													 *
-* * Neither the name of the WIDE Project or NICT nor the 						 *
-*   names of its contributors may be used to endorse or 						 *
-*   promote products derived from this software without 						 *
-*   specific prior written permission of WIDE Project and 						 *
-*   NICT.												 *
-* 													 *
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED *
-* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
-* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR *
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 	 *
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 	 *
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR *
-* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF   *
-* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.								 *
-*********************************************************************************************************/
-
-#include "fD.h"
-
-/* Merge information into a list of apps */
-int fd_app_merge(struct fd_list * list, application_id_t aid, vendor_id_t vid, int auth, int acct)
-{
-	struct fd_list * li;
-	int skip = 0;
-	
-	/* List is ordered by appid. Avoid duplicates */
-	for (li = list; li->next != list; li = li->next) {
-		struct fd_app * na = (struct fd_app *)(li->next);
-		if (na->appid < aid)
-			continue;
-		
-		if (na->appid > aid)
-			break;
-		
-		/* Otherwise, we merge with existing entry -- ignore vendor id in this case */
-		skip = 1;
-		
-		if (auth)
-			na->flags.auth = 1;
-		if (acct)
-			na->flags.acct = 1;
-		break;
-	}
-	
-	if (!skip) {			
-		struct fd_app  * new = NULL;
-
-		CHECK_MALLOC( new = malloc(sizeof(struct fd_app)) );
-		memset(new, 0, sizeof(struct fd_app));
-		fd_list_init(&new->chain, NULL);
-		new->flags.auth = (auth ? 1 : 0);
-		new->flags.acct = (acct ? 1 : 0);
-		new->vndid = vid;
-		new->appid = aid;
-		fd_list_insert_after(li, &new->chain);
-	}
-	
-	return 0;
-}
-
-/* Check if a given application id is in a list */
-int fd_app_check(struct fd_list * list, application_id_t aid, struct fd_app **detail)
-{
-	struct fd_list * li;
-	
-	TRACE_ENTRY("%p %d %p", list, aid, detail);
-	CHECK_PARAMS(list && detail);
-	
-	*detail = NULL;
-	
-	/* Search in the list */
-	for (li = list->next; li != list; li = li->next) {
-		struct fd_app * a = (struct fd_app *)li;
-		if (a->appid < aid)
-			continue;
-		
-		if (a->appid == aid)
-			*detail = a;
-		break;
-	}
-	
-	return 0;
-}
-
-/* Check if two lists have at least one common application */
-int fd_app_check_common(struct fd_list * list1, struct fd_list * list2, int * common_found)
-{
-	struct fd_list * li1, *li2;
-	
-	TRACE_ENTRY("%p %p %p", list1, list2, common_found);
-	CHECK_PARAMS( list1 && list2 && common_found );
-	
-	/* Both lists are ordered, so advance both pointers at the same time */
-	for (li1 = list1->next, li2 = list2->next;  (li1 != list1) && (li2 != list2); ) {
-		struct fd_app * a1 = (struct fd_app *)li1, *a2 = (struct fd_app *)li2;
-		if (a1->appid < a2->appid) {
-			li1 = li1->next;
-			continue;
-		}
-		if (a1->appid > a2->appid) {
-			li2 = li2->next;
-			continue;
-		}
-		/* They are equal, compare the applications */
-		if ((a1->flags.auth && a2->flags.auth) || (a1->flags.acct && a2->flags.acct)) {
-			/* found! */
-			*common_found = 1;
-			return 0;
-		}
-		
-		/* This application is not common, advance both lists */
-		li1 = li1->next;
-		li2 = li2->next;
-	}
-	
-	/* We did not find a common app */
-	*common_found = 0;
-	return 0;
-}
-
-/* Remove the apps from a list */
-int fd_app_empty(struct fd_list * list)
-{
-	TRACE_ENTRY("%p", list);
-	CHECK_PARAMS( list );
-	
-	while (!FD_IS_LIST_EMPTY(list)) {
-		struct fd_list * li = list->next;
-		fd_list_unlink(li);
-		free(li);
-	}
-	
-	return 0;
-}

--- a/freeDiameter/cnxctx.c	Tue Jan 11 15:48:58 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1583 +0,0 @@
-/*********************************************************************************************************
-* Software License Agreement (BSD License)                                                               *
-* Author: Sebastien Decugis <sdecugis@nict.go.jp>							 *
-*													 *
-* Copyright (c) 2010, WIDE Project and NICT								 *
-* All rights reserved.											 *
-* 													 *
-* Redistribution and use of this software in source and binary forms, with or without modification, are  *
-* permitted provided that the following conditions are met:						 *
-* 													 *
-* * Redistributions of source code must retain the above 						 *
-*   copyright notice, this list of conditions and the 							 *
-*   following disclaimer.										 *
-*    													 *
-* * Redistributions in binary form must reproduce the above 						 *
-*   copyright notice, this list of conditions and the 							 *
-*   following disclaimer in the documentation and/or other						 *
-*   materials provided with the distribution.								 *
-* 													 *
-* * Neither the name of the WIDE Project or NICT nor the 						 *
-*   names of its contributors may be used to endorse or 						 *
-*   promote products derived from this software without 						 *
-*   specific prior written permission of WIDE Project and 						 *
-*   NICT.												 *
-* 													 *
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED *
-* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
-* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR *
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 	 *
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 	 *
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR *
-* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF   *
-* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.								 *
-*********************************************************************************************************/
-
-#include "fD.h"
-#include "cnxctx.h"
-
-#include <net/if.h>
-#include <ifaddrs.h> /* for getifaddrs */
-
-/* The maximum size of Diameter message we accept to receive (<= 2^24) to avoid too big mallocs in case of trashed headers */
-#ifndef DIAMETER_MSG_SIZE_MAX
-#define DIAMETER_MSG_SIZE_MAX	65535	/* in bytes */
-#endif /* DIAMETER_MSG_SIZE_MAX */
-
-
-/* Connections contexts (cnxctx) in freeDiameter are wrappers around the sockets and TLS operations .
- * They are used to hide the details of the processing to the higher layers of the daemon.
- * They are always oriented on connections (TCP or SCTP), connectionless modes (UDP or SCTP) are not supported.
- */
-
-/* Note: this file could be moved to libfreeDiameter instead, but since it uses gnuTLS we prefer to keep it in the daemon */
-
-/* Lifetime of a cnxctx object:
- * 1) Creation
- *    a) a server socket:
- *       - create the object with fd_cnx_serv_tcp or fd_cnx_serv_sctp
- *       - start listening incoming connections: fd_cnx_serv_listen
- *       - accept new clients with fd_cnx_serv_accept.
- *    b) a client socket:
- *       - connect to a remote server with fd_cnx_cli_connect
- *
- * 2) Initialization
- *    - if TLS is started first, call fd_cnx_handshake
- *    - otherwise to receive clear messages, call fd_cnx_start_clear. fd_cnx_handshake can be called later.
- *
- * 3) Usage
- *    - fd_cnx_receive, fd_cnx_send : exchange messages on this connection (send is synchronous, receive is not, but blocking).
- *    - fd_cnx_recv_setaltfifo : when a message is received, the event is sent to an external fifo list. fd_cnx_receive does not work when the alt_fifo is set.
- *    - fd_cnx_getid : retrieve a descriptive string for the connection (for debug)
- *    - fd_cnx_getremoteid : identification of the remote peer (IP address or fqdn)
- *    - fd_cnx_getcred : get the remote peer TLS credentials, after handshake
- *
- * 4) End
- *    - fd_cnx_destroy
- */
-
-/*******************************************/
-/*     Creation of a connection object     */
-/*******************************************/
-
-/* Initialize a context structure */
-static struct cnxctx * fd_cnx_init(int full)
-{
-	struct cnxctx * conn = NULL;
-
-	TRACE_ENTRY("%d", full);
-
-	CHECK_MALLOC_DO( conn = malloc(sizeof(struct cnxctx)), return NULL );
-	memset(conn, 0, sizeof(struct cnxctx));
-
-	if (full) {
-		CHECK_FCT_DO( fd_fifo_new ( &conn->cc_incoming ), return NULL );
-	}
-
-	return conn;
-}
-
-/* Create and bind a server socket to the given endpoint and port */
-struct cnxctx * fd_cnx_serv_tcp(uint16_t port, int family, struct fd_endpoint * ep)
-{
-	struct cnxctx * cnx = NULL;
-	sSS dummy;
-	sSA * sa = (sSA *) &dummy;
-
-	TRACE_ENTRY("%hu %d %p", port, family, ep);
-
-	CHECK_PARAMS_DO( port, return NULL );
-	CHECK_PARAMS_DO( ep || family, return NULL );
-	CHECK_PARAMS_DO( (! family) || (family == AF_INET) || (family == AF_INET6), return NULL );
-	CHECK_PARAMS_DO( (! ep) || (!family) || (ep->ss.ss_family == family), return NULL );
-
-	/* The connection object */
-	CHECK_MALLOC_DO( cnx = fd_cnx_init(0), return NULL );
-
-	/* Prepare the socket address information */
-	if (ep) {
-		memcpy(sa, &ep->ss, sizeof(sSS));
-	} else {
-		memset(&dummy, 0, sizeof(dummy));
-		sa->sa_family = family;
-	}
-	if (sa->sa_family == AF_INET) {
-		((sSA4 *)sa)->sin_port = htons(port);
-		cnx->cc_family = AF_INET;
-	} else {
-		((sSA6 *)sa)->sin6_port = htons(port);
-		cnx->cc_family = AF_INET6;
-	}
-
-	/* Create the socket */
-	CHECK_FCT_DO( fd_tcp_create_bind_server( &cnx->cc_socket, sa, sSAlen(sa) ), goto error );
-
-	/* Generate the name for the connection object */
-	{
-		char addrbuf[INET6_ADDRSTRLEN];
-		int  rc;
-		rc = getnameinfo(sa, sSAlen(sa), addrbuf, sizeof(addrbuf), NULL, 0, NI_NUMERICHOST);
-		if (rc)
-			snprintf(addrbuf, sizeof(addrbuf), "[err:%s]", gai_strerror(rc));
-		snprintf(cnx->cc_id, sizeof(cnx->cc_id), "TCP srv [%s]:%hu (%d)", addrbuf, port, cnx->cc_socket);
-	}
-
-	cnx->cc_proto = IPPROTO_TCP;
-
-	return cnx;
-
-error:
-	fd_cnx_destroy(cnx);
-	return NULL;
-}
-
-/* Same function for SCTP, with a list of local endpoints to bind to */
-struct cnxctx * fd_cnx_serv_sctp(uint16_t port, struct fd_list * ep_list)
-{
-#ifdef DISABLE_SCTP
-	TRACE_DEBUG(INFO, "This function should never been called when SCTP is disabled...");
-	ASSERT(0);
-	CHECK_FCT_DO( ENOTSUP, );
-	return NULL;
-#else /* DISABLE_SCTP */
-	struct cnxctx * cnx = NULL;
-
-	TRACE_ENTRY("%hu %p", port, ep_list);
-
-	CHECK_PARAMS_DO( port, return NULL );
-
-	/* The connection object */
-	CHECK_MALLOC_DO( cnx = fd_cnx_init(0), return NULL );
-
-	if (fd_g_config->cnf_flags.no_ip6) {
-		cnx->cc_family = AF_INET;
-	} else {
-		cnx->cc_family = AF_INET6; /* can create socket for both IP and IPv6 */
-	}
-	
-	/* Create the socket */
-	CHECK_FCT_DO( fd_sctp_create_bind_server( &cnx->cc_socket, cnx->cc_family, ep_list, port ), goto error );
-
-	/* Generate the name for the connection object */
-	snprintf(cnx->cc_id, sizeof(cnx->cc_id), "SCTP srv :%hu (%d)", port, cnx->cc_socket);
-
-	cnx->cc_proto = IPPROTO_SCTP;
-
-	return cnx;
-
-error:
-	fd_cnx_destroy(cnx);
-	return NULL;
-#endif /* DISABLE_SCTP */
-}
-
-/* Allow clients to connect on the server socket */
-int fd_cnx_serv_listen(struct cnxctx * conn)
-{
-	CHECK_PARAMS( conn );
-
-	switch (conn->cc_proto) {
-		case IPPROTO_TCP:
-			CHECK_FCT(fd_tcp_listen(conn->cc_socket));
-			break;
-
-#ifndef DISABLE_SCTP
-		case IPPROTO_SCTP:
-			CHECK_FCT(fd_sctp_listen(conn->cc_socket));
-			break;
-#endif /* DISABLE_SCTP */
-
-		default:
-			CHECK_PARAMS(0);
-	}
-
-	return 0;
-}
-
-/* Accept a client (blocking until a new client connects) -- cancelable */
-struct cnxctx * fd_cnx_serv_accept(struct cnxctx * serv)
-{
-	struct cnxctx * cli = NULL;
-	sSS ss;
-	socklen_t ss_len = sizeof(ss);
-	int cli_sock = 0;
-
-	TRACE_ENTRY("%p", serv);
-	CHECK_PARAMS_DO(serv, return NULL);
-	
-	/* Accept the new connection -- this is blocking until new client enters or until cancellation */
-	CHECK_SYS_DO( cli_sock = accept(serv->cc_socket, (sSA *)&ss, &ss_len), return NULL );
-	
-	if (TRACE_BOOL(INFO)) {
-		fd_log_debug("%s : accepted new client [", fd_cnx_getid(serv));
-		sSA_DUMP_NODE( &ss, NI_NUMERICHOST );
-		fd_log_debug("].\n");
-	}
-	
-	CHECK_MALLOC_DO( cli = fd_cnx_init(1), { shutdown(cli_sock, SHUT_RDWR); close(cli_sock); return NULL; } );
-	cli->cc_socket = cli_sock;
-	cli->cc_family = serv->cc_family;
-	cli->cc_proto = serv->cc_proto;
-	
-	/* Set the timeout */
-	fd_cnx_s_setto(cli->cc_socket);
-	
-	/* Generate the name for the connection object */
-	{
-		char addrbuf[INET6_ADDRSTRLEN];
-		char portbuf[10];
-		int  rc;
-		
-		/* Numeric values for debug */
-		rc = getnameinfo((sSA *)&ss, sSAlen(&ss), addrbuf, sizeof(addrbuf), portbuf, sizeof(portbuf), NI_NUMERICHOST | NI_NUMERICSERV);
-		if (rc) {
-			snprintf(addrbuf, sizeof(addrbuf), "[err:%s]", gai_strerror(rc));
-			portbuf[0] = '\0';
-		}
-		
-		snprintf(cli->cc_id, sizeof(cli->cc_id), "{%s} (%d) <- [%s]:%s (%d)", 
-				IPPROTO_NAME(cli->cc_proto), serv->cc_socket, 
-				addrbuf, portbuf, cli->cc_socket);
-		
-		/* Name for log messages */
-		rc = getnameinfo((sSA *)&ss, sSAlen(&ss), cli->cc_remid, sizeof(cli->cc_remid), NULL, 0, 0);
-		if (rc)
-			snprintf(cli->cc_remid, sizeof(cli->cc_remid), "[err:%s]", gai_strerror(rc));
-	}
-
-#ifndef DISABLE_SCTP
-	/* SCTP-specific handlings */
-	if (cli->cc_proto == IPPROTO_SCTP) {
-		/* Retrieve the number of streams */
-		CHECK_FCT_DO( fd_sctp_get_str_info( cli->cc_socket, &cli->cc_sctp_para.str_in, &cli->cc_sctp_para.str_out, NULL ), {fd_cnx_destroy(cli); return NULL;} );
-		if (cli->cc_sctp_para.str_out < cli->cc_sctp_para.str_in)
-			cli->cc_sctp_para.pairs = cli->cc_sctp_para.str_out;
-		else
-			cli->cc_sctp_para.pairs = cli->cc_sctp_para.str_in;
-		
-		TRACE_DEBUG(FULL,"%s : client '%s' (SCTP:%d, %d/%d streams)", fd_cnx_getid(serv), fd_cnx_getid(cli), cli->cc_socket, cli->cc_sctp_para.str_in, cli->cc_sctp_para.str_out);
-	}
-#endif /* DISABLE_SCTP */
-
-	return cli;
-}
-
-/* Client side: connect to a remote server -- cancelable */
-struct cnxctx * fd_cnx_cli_connect_tcp(sSA * sa /* contains the port already */, socklen_t addrlen)
-{
-	int sock = 0;
-	struct cnxctx * cnx = NULL;
-	
-	TRACE_ENTRY("%p %d", sa, addrlen);
-	CHECK_PARAMS_DO( sa && addrlen, return NULL );
-	
-	/* Create the socket and connect, which can take some time and/or fail */
-	{
-		int ret = fd_tcp_client( &sock, sa, addrlen );
-		if (ret != 0) {
-			int lvl;
-			switch (ret) {
-				case ECONNREFUSED:
-
-					/* "Normal" errors */
-					lvl = FULL;
-					break;
-				default:
-					lvl = INFO;
-			}
-			/* Some errors are expected, we log at different level */
-			TRACE_DEBUG( lvl, "fd_tcp_client returned an error: %s", strerror(ret));
-			return NULL;
-		}
-	}
-	
-	if (TRACE_BOOL(INFO)) {
-		fd_log_debug("Connection established to server '");
-		sSA_DUMP_NODE_SERV( sa, NI_NUMERICSERV);
-		fd_log_debug("' (TCP:%d).\n", sock);
-	}
-	
-	/* Once the socket is created successfuly, prepare the remaining of the cnx */
-	CHECK_MALLOC_DO( cnx = fd_cnx_init(1), { shutdown(sock, SHUT_RDWR); close(sock); return NULL; } );
-	
-	cnx->cc_socket = sock;
-	cnx->cc_family = sa->sa_family;
-	cnx->cc_proto  = IPPROTO_TCP;
-	
-	/* Set the timeout */
-	fd_cnx_s_setto(cnx->cc_socket);
-	
-	/* Generate the names for the object */
-	{
-		char addrbuf[INET6_ADDRSTRLEN];
-		char portbuf[10];
-		int  rc;
-		
-		/* Numeric values for debug */
-		rc = getnameinfo(sa, addrlen, addrbuf, sizeof(addrbuf), portbuf, sizeof(portbuf), NI_NUMERICHOST | NI_NUMERICSERV);
-		if (rc) {
-			snprintf(addrbuf, sizeof(addrbuf), "[err:%s]", gai_strerror(rc));
-			portbuf[0] = '\0';
-		}
-		
-		snprintf(cnx->cc_id, sizeof(cnx->cc_id), "{TCP} -> [%s]:%s (%d)", addrbuf, portbuf, cnx->cc_socket);
-		
-		/* Name for log messages */
-		rc = getnameinfo(sa, addrlen, cnx->cc_remid, sizeof(cnx->cc_remid), NULL, 0, 0);
-		if (rc)
-			snprintf(cnx->cc_remid, sizeof(cnx->cc_remid), "[err:%s]", gai_strerror(rc));
-	}
-	
-	return cnx;
-}
-
-/* Same for SCTP, accepts a list of remote addresses to connect to (see sctp_connectx for how they are used) */
-struct cnxctx * fd_cnx_cli_connect_sctp(int no_ip6, uint16_t port, struct fd_list * list)
-{
-#ifdef DISABLE_SCTP
-	TRACE_DEBUG(INFO, "This function should never been called when SCTP is disabled...");
-	ASSERT(0);
-	CHECK_FCT_DO( ENOTSUP, );
-	return NULL;
-#else /* DISABLE_SCTP */
-	int sock = 0;
-	struct cnxctx * cnx = NULL;
-	sSS primary;
-	
-	TRACE_ENTRY("%p", list);
-	CHECK_PARAMS_DO( list && !FD_IS_LIST_EMPTY(list), return NULL );
-	
-	{
-		int ret = fd_sctp_client( &sock, no_ip6, port, list );
-		if (ret != 0) {
-			int lvl;
-			switch (ret) {
-				case ECONNREFUSED:
-
-					/* "Normal" errors */
-					lvl = FULL;
-					break;
-				default:
-					lvl = INFO;
-			}
-			/* Some errors are expected, we log at different level */
-			TRACE_DEBUG( lvl, "fd_sctp_client returned an error: %s", strerror(ret));
-			return NULL;
-		}
-	}
-	
-	/* Once the socket is created successfuly, prepare the remaining of the cnx */
-	CHECK_MALLOC_DO( cnx = fd_cnx_init(1), { shutdown(sock, SHUT_RDWR); close(sock); return NULL; } );
-	
-	cnx->cc_socket = sock;
-	cnx->cc_family = no_ip6 ? AF_INET : AF_INET6;
-	cnx->cc_proto  = IPPROTO_SCTP;
-	
-	/* Set the timeout */
-	fd_cnx_s_setto(cnx->cc_socket);
-	
-	/* Retrieve the number of streams and primary address */
-	CHECK_FCT_DO( fd_sctp_get_str_info( sock, &cnx->cc_sctp_para.str_in, &cnx->cc_sctp_para.str_out, &primary ), goto error );
-	if (cnx->cc_sctp_para.str_out < cnx->cc_sctp_para.str_in)
-		cnx->cc_sctp_para.pairs = cnx->cc_sctp_para.str_out;
-	else
-		cnx->cc_sctp_para.pairs = cnx->cc_sctp_para.str_in;
-	
-	if (TRACE_BOOL(INFO)) {
-		fd_log_debug("Connection established to server '");
-		sSA_DUMP_NODE_SERV( &primary, NI_NUMERICSERV);
-		fd_log_debug("' (SCTP:%d, %d/%d streams).\n", sock, cnx->cc_sctp_para.str_in, cnx->cc_sctp_para.str_out);
-	}
-	
-	/* Generate the names for the object */
-	{
-		char addrbuf[INET6_ADDRSTRLEN];
-		char portbuf[10];
-		int  rc;
-		
-		/* Numeric values for debug */
-		rc = getnameinfo((sSA *)&primary, sSAlen(&primary), addrbuf, sizeof(addrbuf), portbuf, sizeof(portbuf), NI_NUMERICHOST | NI_NUMERICSERV);
-		if (rc) {
-			snprintf(addrbuf, sizeof(addrbuf), "[err:%s]", gai_strerror(rc));
-			portbuf[0] = '\0';
-		}
-		
-		snprintf(cnx->cc_id, sizeof(cnx->cc_id), "{SCTP} -> [%s]:%s (%d)", addrbuf, portbuf, cnx->cc_socket);
-		
-		/* Name for log messages */
-		rc = getnameinfo((sSA *)&primary, sSAlen(&primary), cnx->cc_remid, sizeof(cnx->cc_remid), NULL, 0, 0);
-		if (rc)
-			snprintf(cnx->cc_remid, sizeof(cnx->cc_remid), "[err:%s]", gai_strerror(rc));
-	}
-	
-	return cnx;
-
-error:
-	fd_cnx_destroy(cnx);
-	return NULL;
-#endif /* DISABLE_SCTP */
-}
-
-/* Return a string describing the connection, for debug */
-char * fd_cnx_getid(struct cnxctx * conn)
-{
-	CHECK_PARAMS_DO( conn, return "" );
-	return conn->cc_id;
-}
-
-/* Return the protocol of a connection */
-int fd_cnx_getproto(struct cnxctx * conn)
-{
-	CHECK_PARAMS_DO( conn, return 0 );
-	return conn->cc_proto;
-}
-
-/* Set the hostname to check during handshake */
-void fd_cnx_sethostname(struct cnxctx * conn, char * hn)
-{
-	CHECK_PARAMS_DO( conn, return );
-	conn->cc_tls_para.cn = hn;
-}
-
-/* Return the TLS state of a connection */
-int fd_cnx_getTLS(struct cnxctx * conn)
-{
-	CHECK_PARAMS_DO( conn, return 0 );
-	fd_cpu_flush_cache();
-	return conn->cc_status & CC_STATUS_TLS;
-}
-
-/* Get the list of endpoints (IP addresses) of the local and remote peers on this connection */
-int fd_cnx_getremoteeps(struct cnxctx * conn, struct fd_list * eps)
-{
-	TRACE_ENTRY("%p %p %p", conn, eps);
-	CHECK_PARAMS(conn && eps);
-	
-	/* Check we have a full connection object, not a listening socket (with no remote) */
-	CHECK_PARAMS( conn->cc_incoming );
-
-	/* Retrieve the peer endpoint(s) of the connection */
-	switch (conn->cc_proto) {
-		case IPPROTO_TCP: {
-			sSS ss;
-			socklen_t sl;
-			CHECK_FCT(fd_tcp_get_remote_ep(conn->cc_socket, &ss, &sl));
-			CHECK_FCT(fd_ep_add_merge( eps, (sSA *)&ss, sl, EP_FL_LL | EP_FL_PRIMARY ));
-		}
-		break;
-
-		#ifndef DISABLE_SCTP
-		case IPPROTO_SCTP: {
-			CHECK_FCT(fd_sctp_get_remote_ep(conn->cc_socket, eps));
-		}
-		break;
-		#endif /* DISABLE_SCTP */
-
-		default:
-			CHECK_PARAMS(0);
-	}
-
-	return 0;
-}
-
-/* Get a string describing the remote peer address (ip address or fqdn) */
-char * fd_cnx_getremoteid(struct cnxctx * conn)
-{
-	CHECK_PARAMS_DO( conn, return "" );
-	return conn->cc_remid;
-}
-
-/* Retrieve a list of all IP addresses of the local system from the kernel, using  */
-int fd_cnx_get_local_eps(struct fd_list * list)
-{
-	struct ifaddrs *iflist, *cur;
-	CHECK_SYS(getifaddrs(&iflist));
-	
-	for (cur = iflist; cur != NULL; cur = cur->ifa_next) {
-		if (cur->ifa_flags & IFF_LOOPBACK)
-			continue;
-		
-		if (fd_g_config->cnf_flags.no_ip4 && (cur->ifa_addr->sa_family == AF_INET))
-			continue;
-		
-		if (fd_g_config->cnf_flags.no_ip6 && (cur->ifa_addr->sa_family == AF_INET6))
-			continue;
-		
-		CHECK_FCT(fd_ep_add_merge( list, cur->ifa_addr, sSAlen(cur->ifa_addr), EP_FL_LL ));
-	}
-	
-	freeifaddrs(iflist);
-	
-	return 0;
-}
-
-
-/**************************************/
-/*     Use of a connection object     */
-/**************************************/
-
-/* An error occurred on the socket */
-void fd_cnx_markerror(struct cnxctx * conn)
-{
-	TRACE_ENTRY("%p", conn);
-	CHECK_PARAMS_DO( conn, goto fatal );
-	
-	TRACE_DEBUG(FULL, "Error flag set for socket %d (%s / %s)", conn->cc_socket, conn->cc_remid, conn->cc_id);
-	
-	/* Mark the error */
-	fd_cpu_flush_cache();
-	conn->cc_status |= CC_STATUS_ERROR;
-	
-	/* Report the error if not reported yet, and not closing */
-	if ((!(conn->cc_status & CC_STATUS_CLOSING )) && (!(conn->cc_status & CC_STATUS_SIGNALED )))  {
-		TRACE_DEBUG(FULL, "Sending FDEVP_CNX_ERROR event");
-		CHECK_FCT_DO( fd_event_send( Target_Queue(conn), FDEVP_CNX_ERROR, 0, NULL), goto fatal);
-		conn->cc_status |= CC_STATUS_SIGNALED;
-	}
-	fd_cpu_flush_cache();
-	return;
-fatal:
-	/* An unrecoverable error occurred, stop the daemon */
-	CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );	
-}
-
-/* Set the timeout option on the socket */
-void fd_cnx_s_setto(int sock) 
-{
-	struct timeval tv;
-	
-	/* Set a timeout on the socket so that in any case we are not stuck waiting for something */
-	memset(&tv, 0, sizeof(tv));
-	tv.tv_sec = 3;	/* allow 3 seconds timeout for TLS session cleanup */
-	CHECK_SYS_DO( setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)), /* best effort only */ );
-	CHECK_SYS_DO( setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)), /* Also timeout for sending, to avoid waiting forever */ );
-}
-
-/* A recv-like function, taking a cnxctx object instead of socket as entry. We use it to quickly react to timeouts without traversing GNUTLS wrapper each time */
-ssize_t fd_cnx_s_recv(struct cnxctx * conn, void *buffer, size_t length)
-{
-	ssize_t ret = 0;
-	int timedout = 0;
-again:
-	ret = recv(conn->cc_socket, buffer, length, 0);
-	/* Handle special case of timeout */
-	if ((ret < 0) && (errno == EAGAIN)) {
-		fd_cpu_flush_cache();
-		if (! (conn->cc_status & CC_STATUS_CLOSING))
-			goto again; /* don't care, just ignore */
-		if (!timedout) {
-			timedout ++; /* allow for one timeout while closing */
-			goto again;
-		}
-	}
-	
-	CHECK_SYS_DO(ret, /* continue */);
-	
-	/* Mark the error */
-	if (ret <= 0)
-		fd_cnx_markerror(conn);
-	
-	return ret;
-}
-
-/* Send */
-static ssize_t fd_cnx_s_send(struct cnxctx * conn, void *buffer, size_t length)
-{
-	ssize_t ret = 0;
-	int timedout = 0;
-again:
-	ret = send(conn->cc_socket, buffer, length, 0);
-	/* Handle special case of timeout */
-	if ((ret < 0) && (errno == EAGAIN)) {
-		fd_cpu_flush_cache();
-		if (! (conn->cc_status & CC_STATUS_CLOSING))
-			goto again; /* don't care, just ignore */
-		if (!timedout) {
-			timedout ++; /* allow for one timeout while closing */
-			goto again;
-		}
-		CHECK_SYS_DO(ret, /* continue */);
-	}
-	
-	/* Mark the error */
-	if (ret <= 0)
-		fd_cnx_markerror(conn);
-	
-	return ret;
-}
-
-/* Receiver thread (TCP & noTLS) : incoming message is directly saved into the target queue */
-static void * rcvthr_notls_tcp(void * arg)
-{
-	struct cnxctx * conn = arg;
-	
-	TRACE_ENTRY("%p", arg);
-	CHECK_PARAMS_DO(conn && (conn->cc_socket > 0), goto out);
-	
-	/* Set the thread name */
-	{
-		char buf[48];
-		snprintf(buf, sizeof(buf), "Receiver (%d) TCP/noTLS)", conn->cc_socket);
-		fd_log_threadname ( buf );
-	}
-	
-	ASSERT( conn->cc_proto == IPPROTO_TCP );
-	ASSERT( ! (conn->cc_status & CC_STATUS_TLS) );
-	ASSERT( Target_Queue(conn) );
-	
-	/* Receive from a TCP connection: we have to rebuild the message boundaries */
-	do {
-		uint8_t header[4];
-		uint8_t * newmsg;
-		size_t  length;
-		ssize_t ret = 0;
-		size_t	received = 0;
-
-		do {
-			ret = fd_cnx_s_recv(conn, &header[received], sizeof(header) - received);
-			if (ret <= 0) {
-				goto out; /* Stop the thread, the event was already sent */
-			}
-
-			received += ret;
-		} while (received < sizeof(header));
-
-		length = ((size_t)header[1] << 16) + ((size_t)header[2] << 8) + (size_t)header[3];
-
-		/* Check the received word is a valid begining of a Diameter message */
-		if ((header[0] != DIAMETER_VERSION)	/* defined in <libfreeDiameter.h> */
-		   || (length > DIAMETER_MSG_SIZE_MAX)) { /* to avoid too big mallocs */
-			/* The message is suspect */
-			TRACE_DEBUG(INFO, "Received suspect header [ver: %d, size: %zd], assume disconnection", (int)header[0], length);
-			fd_cnx_markerror(conn);
-			goto out; /* Stop the thread, the recipient of the event will cleanup */
-		}
-
-		/* Ok, now we can really receive the data */
-		CHECK_MALLOC_DO(  newmsg = malloc( length ), goto fatal );
-		memcpy(newmsg, header, sizeof(header));
-
-		while (received < length) {
-			pthread_cleanup_push(free, newmsg); /* In case we are canceled, clean the partialy built buffer */
-			ret = fd_cnx_s_recv(conn, newmsg + received, length - received);
-			pthread_cleanup_pop(0);
-
-			if (ret <= 0) {
-				free(newmsg);
-				goto out;
-			}
-			received += ret;
-		}
-		
-		/* We have received a complete message, pass it to the daemon */
-		fd_cpu_flush_cache();
-		CHECK_FCT_DO( fd_event_send( Target_Queue(conn), FDEVP_CNX_MSG_RECV, length, newmsg), /* continue or destroy everything? */);
-		
-	} while (conn->cc_loop);
-	
-out:
-	TRACE_DEBUG(FULL, "Thread terminated");	
-	return NULL;
-	
-fatal:
-	/* An unrecoverable error occurred, stop the daemon */
-	CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
-	goto out;
-}
-
-#ifndef DISABLE_SCTP
-/* Receiver thread (SCTP & noTLS) : incoming message is directly saved into cc_incoming, no need to care for the stream ID */
-static void * rcvthr_notls_sctp(void * arg)
-{
-	struct cnxctx * conn = arg;
-	uint8_t * buf;
-	size_t    bufsz;
-	int	  event;
-	
-	TRACE_ENTRY("%p", arg);
-	CHECK_PARAMS_DO(conn && (conn->cc_socket > 0), goto fatal);
-	
-	/* Set the thread name */
-	{
-		char buf[48];
-		snprintf(buf, sizeof(buf), "Receiver (%d) SCTP/noTLS)", conn->cc_socket);
-		fd_log_threadname ( buf );
-	}
-	
-	ASSERT( conn->cc_proto == IPPROTO_SCTP );
-	ASSERT( ! (conn->cc_status & CC_STATUS_TLS) );
-	ASSERT( Target_Queue(conn) );
-	
-	do {
-		fd_cpu_flush_cache();
-		CHECK_FCT_DO( fd_sctp_recvmeta(conn->cc_socket, NULL, &buf, &bufsz, &event, &conn->cc_status), goto fatal );
-		if (event == FDEVP_CNX_ERROR) {
-			fd_cnx_markerror(conn);
-			goto out;
-		}
-		
-		if (event == FDEVP_CNX_SHUTDOWN) {
-			/* Just ignore the notification for now, we will get another error later anyway */
-			continue;
-		}
-		
-		fd_cpu_flush_cache();
-		CHECK_FCT_DO( fd_event_send( Target_Queue(conn), event, bufsz, buf), goto fatal );
-		
-	} while (conn->cc_loop || (event != FDEVP_CNX_MSG_RECV));
-	
-out:
-	TRACE_DEBUG(FULL, "Thread terminated");	
-	return NULL;
-
-fatal:
-	/* An unrecoverable error occurred, stop the daemon */
-	CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
-	goto out;
-}
-#endif /* DISABLE_SCTP */
-
-/* Start receving messages in clear (no TLS) on the connection */
-int fd_cnx_start_clear(struct cnxctx * conn, int loop)
-{
-	TRACE_ENTRY("%p %i", conn, loop);
-	
-	CHECK_PARAMS( conn && Target_Queue(conn) && (!(conn->cc_status & CC_STATUS_TLS)) && (!conn->cc_loop));
-	
-	/* Release resources in case of a previous call was already made */
-	CHECK_FCT_DO( fd_thr_term(&conn->cc_rcvthr), /* continue */);
-	
-	/* Save the loop request */
-	conn->cc_loop = loop;
-	
-	switch (conn->cc_proto) {
-		case IPPROTO_TCP:
-			/* Start the tcp_notls thread */
-			CHECK_POSIX( pthread_create( &conn->cc_rcvthr, NULL, rcvthr_notls_tcp, conn ) );
-			break;
-#ifndef DISABLE_SCTP
-		case IPPROTO_SCTP:
-			/* Start the tcp_notls thread */
-			CHECK_POSIX( pthread_create( &conn->cc_rcvthr, NULL, rcvthr_notls_sctp, conn ) );
-			break;
-#endif /* DISABLE_SCTP */
-		default:
-			TRACE_DEBUG(INFO, "Unknown protocol: %d", conn->cc_proto);
-			ASSERT(0);
-			return ENOTSUP;
-	}
-			
-	return 0;
-}
-
-
-
-
-/* Returns 0 on error, received data size otherwise (always >= 0) */
-static ssize_t fd_tls_recv_handle_error(struct cnxctx * conn, gnutls_session_t session, void * data, size_t sz)
-{
-	ssize_t ret;
-again:	
-	CHECK_GNUTLS_DO( ret = gnutls_record_recv(session, data, sz),
-		{
-			switch (ret) {
-				case GNUTLS_E_REHANDSHAKE: 
-					fd_cpu_flush_cache();
-					if (!(conn->cc_status & CC_STATUS_CLOSING))
-						CHECK_GNUTLS_DO( ret = gnutls_handshake(session),
-							{
-								if (TRACE_BOOL(INFO)) {
-									fd_log_debug("TLS re-handshake failed on socket %d (%s) : %s\n", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
-								}
-								goto end;
-							} );
-
-				case GNUTLS_E_AGAIN:
-				case GNUTLS_E_INTERRUPTED:
-					fd_cpu_flush_cache();
-					if (!(conn->cc_status & CC_STATUS_CLOSING))
-						goto again;
-					TRACE_DEBUG(FULL, "Connection is closing, so abord gnutls_record_recv now.");
-					break;
-
-				case GNUTLS_E_UNEXPECTED_PACKET_LENGTH:
-					/* The connection is closed */
-					TRACE_DEBUG(FULL, "Got 0 size while reading the socket, probably connection closed...");
-					break;
-				
-				default:
-					TRACE_DEBUG(INFO, "This GNU TLS error is not handled, assume unrecoverable error");
-			}
-		} );
-		
-	if (ret == 0)
-		CHECK_GNUTLS_DO( gnutls_bye(session, GNUTLS_SHUT_RDWR),  );
-	
-end:	
-	if (ret <= 0)
-		fd_cnx_markerror(conn);
-	return ret;
-}
-
-/* Wrapper around gnutls_record_send to handle some error codes */
-static ssize_t fd_tls_send_handle_error(struct cnxctx * conn, gnutls_session_t session, void * data, size_t sz)
-{
-	ssize_t ret;
-again:	
-	CHECK_GNUTLS_DO( ret = gnutls_record_send(session, data, sz),
-		{
-			switch (ret) {
-				case GNUTLS_E_REHANDSHAKE: 
-					fd_cpu_flush_cache();
-					if (!(conn->cc_status & CC_STATUS_CLOSING))
-						CHECK_GNUTLS_DO( ret = gnutls_handshake(session),
-							{
-								if (TRACE_BOOL(INFO)) {
-									fd_log_debug("TLS re-handshake failed on socket %d (%s) : %s\n", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
-								}
-								goto end;
-							} );
-
-				case GNUTLS_E_AGAIN:
-				case GNUTLS_E_INTERRUPTED:
-					fd_cpu_flush_cache();
-					if (!(conn->cc_status & CC_STATUS_CLOSING))
-						goto again;
-					TRACE_DEBUG(INFO, "Connection is closing, so abord gnutls_record_send now.");
-					break;
-
-				default:
-					TRACE_DEBUG(INFO, "This TLS error is not handled, assume unrecoverable error");
-			}
-		} );
-end:	
-	if (ret <= 0)
-		fd_cnx_markerror(conn);
-		
-	return ret;
-}
-
-
-/* The function that receives TLS data and re-builds a Diameter message -- it exits only on error or cancelation */
-int fd_tls_rcvthr_core(struct cnxctx * conn, gnutls_session_t session)
-{
-	/* No guarantee that GnuTLS preserves the message boundaries, so we re-build it as in TCP */
-	do {
-		uint8_t header[4];
-		uint8_t * newmsg;
-		size_t  length;
-		ssize_t ret = 0;
-		size_t	received = 0;
-
-		do {
-			ret = fd_tls_recv_handle_error(conn, session, &header[received], sizeof(header) - received);
-			if (ret <= 0) {
-				/* The connection is closed */
-				goto out;
-			}
-			received += ret;
-		} while (received < sizeof(header));
-
-		length = ((size_t)header[1] << 16) + ((size_t)header[2] << 8) + (size_t)header[3];
-
-		/* Check the received word is a valid beginning of a Diameter message */
-		if ((header[0] != DIAMETER_VERSION)	/* defined in <libfreeDiameter.h> */
-		   || (length > DIAMETER_MSG_SIZE_MAX)) { /* to avoid too big mallocs */
-			/* The message is suspect */
-			TRACE_DEBUG(INFO, "Received suspect header [ver: %d, size: %zd], assume disconnection", (int)header[0], length);
-			fd_cnx_markerror(conn);
-			goto out;
-		}
-
-		/* Ok, now we can really receive the data */
-		CHECK_MALLOC(  newmsg = malloc( length ) );
-		memcpy(newmsg, header, sizeof(header));
-
-		while (received < length) {
-			pthread_cleanup_push(free, newmsg); /* In case we are canceled, clean the partialy built buffer */
-			ret = fd_tls_recv_handle_error(conn, session, newmsg + received, length - received);
-			pthread_cleanup_pop(0);
-
-			if (ret <= 0) {
-				free(newmsg);
-				goto out;
-			}
-			received += ret;
-		}
-		
-		/* We have received a complete message, pass it to the daemon */
-		fd_cpu_flush_cache();
-		CHECK_FCT_DO( ret = fd_event_send( Target_Queue(conn), FDEVP_CNX_MSG_RECV, length, newmsg), 
-			{ 
-				free(newmsg); 
-				CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
-				return ret; 
-			} );
-		
-	} while (1);
-	
-out:
-	return ENOTCONN;
-}
-
-/* Receiver thread (TLS & 1 stream SCTP or TCP)  */
-static void * rcvthr_tls_single(void * arg)
-{
-	struct cnxctx * conn = arg;
-	
-	TRACE_ENTRY("%p", arg);
-	CHECK_PARAMS_DO(conn && (conn->cc_socket > 0), return NULL );
-	
-	/* Set the thread name */
-	{
-		char buf[48];
-		snprintf(buf, sizeof(buf), "Receiver (%d) TLS/single stream", conn->cc_socket);
-		fd_log_threadname ( buf );
-	}
-	
-	ASSERT( conn->cc_status & CC_STATUS_TLS );
-	ASSERT( Target_Queue(conn) );
-
-	/* The next function only returns when there is an error on the socket */	
-	CHECK_FCT_DO(fd_tls_rcvthr_core(conn, conn->cc_tls_para.session), /* continue */);
-
-	TRACE_DEBUG(FULL, "Thread terminated");	
-	return NULL;
-}
-
-/* Prepare a gnutls session object for handshake */
-int fd_tls_prepare(gnutls_session_t * session, int mode, char * priority, void * alt_creds)
-{
-	/* Create the session context */
-	CHECK_GNUTLS_DO( gnutls_init (session, mode), return ENOMEM );
-
-	/* Set the algorithm suite */
-	if (priority) {
-		const char * errorpos;
-		CHECK_GNUTLS_DO( gnutls_priority_set_direct( *session, priority, &errorpos ), 
-			{ TRACE_DEBUG(INFO, "Error in priority string '%s' at position: '%s'\n", priority, errorpos); return EINVAL; } );
-	} else {
-		CHECK_GNUTLS_DO( gnutls_priority_set( *session, fd_g_config->cnf_sec_data.prio_cache ), return EINVAL );
-	}
-
-	/* Set the credentials of this side of the connection */
-	CHECK_GNUTLS_DO( gnutls_credentials_set (*session, GNUTLS_CRD_CERTIFICATE, alt_creds ?: fd_g_config->cnf_sec_data.credentials), return EINVAL );
-
-	/* Request the remote credentials as well */
-	if (mode == GNUTLS_SERVER) {
-		gnutls_certificate_server_set_request (*session, GNUTLS_CERT_REQUIRE);
-	}
-	
-	return 0;
-}
-
-/* Verify remote credentials after successful handshake (return 0 if OK, EINVAL otherwise) */
-int fd_tls_verify_credentials(gnutls_session_t session, struct cnxctx * conn, int verbose)
-{
-	int i, ret = 0;
-	unsigned int gtret;
-	const gnutls_datum_t *cert_list;
-	unsigned int cert_list_size;
-	gnutls_x509_crt_t cert;
-	time_t now;
-	
-	TRACE_ENTRY("%p %d", conn, verbose);
-	CHECK_PARAMS(conn);
-	
-	/* Trace the session information -- http://www.gnu.org/software/gnutls/manual/gnutls.html#Obtaining-session-information */
-	if (verbose && TRACE_BOOL(FULL)) {
-		const char *tmp;
-		gnutls_kx_algorithm_t kx;
-  		gnutls_credentials_type_t cred;
-		
-		fd_log_debug("TLS Session information for connection '%s':\n", conn->cc_id);
-
-		/* print the key exchange's algorithm name */
-		GNUTLS_TRACE( kx = gnutls_kx_get (session) );
-		GNUTLS_TRACE( tmp = gnutls_kx_get_name (kx) );
-		fd_log_debug("\t - Key Exchange: %s\n", tmp);
-
-		/* Check the authentication type used and switch
-		* to the appropriate. */
-		GNUTLS_TRACE( cred = gnutls_auth_get_type (session) );
-		switch (cred)
-		{
-			case GNUTLS_CRD_IA:
-				fd_log_debug("\t - TLS/IA session\n");
-				break;
-
-			case GNUTLS_CRD_PSK:
-				/* This returns NULL in server side. */
-				if (gnutls_psk_client_get_hint (session) != NULL)
-					fd_log_debug("\t - PSK authentication. PSK hint '%s'\n",
-						gnutls_psk_client_get_hint (session));
-				/* This returns NULL in client side. */
-				if (gnutls_psk_server_get_username (session) != NULL)
-					fd_log_debug("\t - PSK authentication. Connected as '%s'\n",
-						gnutls_psk_server_get_username (session));
-				break;
-
-			case GNUTLS_CRD_ANON:	/* anonymous authentication */
-				fd_log_debug("\t - Anonymous DH using prime of %d bits\n",
-					gnutls_dh_get_prime_bits (session));
-				break;
-
-			case GNUTLS_CRD_CERTIFICATE:	/* certificate authentication */
-				/* Check if we have been using ephemeral Diffie-Hellman. */
-				if (kx == GNUTLS_KX_DHE_RSA || kx == GNUTLS_KX_DHE_DSS) {
-					fd_log_debug("\t - Ephemeral DH using prime of %d bits\n",
-						gnutls_dh_get_prime_bits (session));
-				}
-				break;
-#ifdef ENABLE_SRP				
-			case GNUTLS_CRD_SRP:
-				fd_log_debug("\t - SRP session with username %s\n",
-					gnutls_srp_server_get_username (session));
-				break;
-#endif /* ENABLE_SRP */
-
-			default:
-				fd_log_debug("\t - Different type of credentials for the session (%d).\n", cred);
-				break;
-
-		}
-
-		/* print the protocol's name (ie TLS 1.0) */
-		tmp = gnutls_protocol_get_name (gnutls_protocol_get_version (session));
-		fd_log_debug("\t - Protocol: %s\n", tmp);
-
-		/* print the certificate type of the peer. ie X.509 */
-		tmp = gnutls_certificate_type_get_name (gnutls_certificate_type_get (session));
-		fd_log_debug("\t - Certificate Type: %s\n", tmp);
-
-		/* print the compression algorithm (if any) */
-		tmp = gnutls_compression_get_name (gnutls_compression_get (session));
-		fd_log_debug("\t - Compression: %s\n", tmp);
-
-		/* print the name of the cipher used. ie 3DES. */
-		tmp = gnutls_cipher_get_name (gnutls_cipher_get (session));
-		fd_log_debug("\t - Cipher: %s\n", tmp);
-
-		/* Print the MAC algorithms name. ie SHA1 */
-		tmp = gnutls_mac_get_name (gnutls_mac_get (session));
-		fd_log_debug("\t - MAC: %s\n", tmp);
-	}
-	
-	/* First, use built-in verification */
-	CHECK_GNUTLS_DO( gnutls_certificate_verify_peers2 (session, &gtret), return EINVAL );
-	if (gtret) {
-		if (TRACE_BOOL(INFO)) {
-			fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
-			if (gtret & GNUTLS_CERT_INVALID)
-				fd_log_debug(" - The certificate is not trusted (unknown CA? expired?)\n");
-			if (gtret & GNUTLS_CERT_REVOKED)
-				fd_log_debug(" - The certificate has been revoked.\n");
-			if (gtret & GNUTLS_CERT_SIGNER_NOT_FOUND)
-				fd_log_debug(" - The certificate hasn't got a known issuer.\n");
-			if (gtret & GNUTLS_CERT_SIGNER_NOT_CA)
-				fd_log_debug(" - The certificate signer is not a CA, or uses version 1, or 3 without basic constraints.\n");
-			if (gtret & GNUTLS_CERT_INSECURE_ALGORITHM)
-				fd_log_debug(" - The certificate signature uses a weak algorithm.\n");
-		}
-		return EINVAL;
-	}
-	
-	/* Code from http://www.gnu.org/software/gnutls/manual/gnutls.html#Verifying-peer_0027s-certificate */
-	if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509)
-		return EINVAL;
-	
-	GNUTLS_TRACE( cert_list = gnutls_certificate_get_peers (session, &cert_list_size) );
-	if (cert_list == NULL)
-		return EINVAL;
-	
-	now = time(NULL);
-	
-	if (verbose && TRACE_BOOL(FULL)) {
-		char serial[40];
-		char dn[128];
-		size_t size;
-		unsigned int algo, bits;
-		time_t expiration_time, activation_time;
-		
-		fd_log_debug("TLS Certificate information for connection '%s' (%d certs provided):\n", conn->cc_id, cert_list_size);
-		for (i = 0; i < cert_list_size; i++)
-		{
-
-			CHECK_GNUTLS_DO( gnutls_x509_crt_init (&cert), return EINVAL);
-			CHECK_GNUTLS_DO( gnutls_x509_crt_import (cert, &cert_list[i], GNUTLS_X509_FMT_DER), return EINVAL);
-		
-			fd_log_debug(" Certificate %d info:\n", i);
-
-			GNUTLS_TRACE( expiration_time = gnutls_x509_crt_get_expiration_time (cert) );
-			GNUTLS_TRACE( activation_time = gnutls_x509_crt_get_activation_time (cert) );
-
-			fd_log_debug("\t - Certificate is valid since: %s", ctime (&activation_time));
-			fd_log_debug("\t - Certificate expires: %s", ctime (&expiration_time));
-
-			/* Print the serial number of the certificate. */
-			size = sizeof (serial);
-			gnutls_x509_crt_get_serial (cert, serial, &size);
-			
-			fd_log_debug("\t - Certificate serial number: ");
-			{
-				int j;
-				for (j = 0; j < size; j++) {
-					fd_log_debug("%02.2hhx", serial[j]);
-				}
-			}
-			fd_log_debug("\n");
-
-			/* Extract some of the public key algorithm's parameters */
-			GNUTLS_TRACE( algo = gnutls_x509_crt_get_pk_algorithm (cert, &bits) );
-			fd_log_debug("\t - Certificate public key: %s\n",
-			      gnutls_pk_algorithm_get_name (algo));
-
-			/* Print the version of the X.509 certificate. */
-			fd_log_debug("\t - Certificate version: #%d\n",
-			      gnutls_x509_crt_get_version (cert));
-
-			size = sizeof (dn);
-			GNUTLS_TRACE( gnutls_x509_crt_get_dn (cert, dn, &size) );
-			fd_log_debug("\t - DN: %s\n", dn);
-
-			size = sizeof (dn);
-			GNUTLS_TRACE( gnutls_x509_crt_get_issuer_dn (cert, dn, &size) );
-			fd_log_debug("\t - Issuer's DN: %s\n", dn);
-
-			GNUTLS_TRACE( gnutls_x509_crt_deinit (cert) );
-		}
-	}
-
-	/* Check validity of all the certificates */
-	for (i = 0; i < cert_list_size; i++)
-	{
-		time_t deadline;
-		
-		CHECK_GNUTLS_DO( gnutls_x509_crt_init (&cert), return EINVAL);
-		CHECK_GNUTLS_DO( gnutls_x509_crt_import (cert, &cert_list[i], GNUTLS_X509_FMT_DER), return EINVAL);
-		
-		GNUTLS_TRACE( deadline = gnutls_x509_crt_get_expiration_time(cert) );
-		if ((deadline != (time_t)-1) && (deadline < now)) {
-			if (TRACE_BOOL(INFO)) {
-				fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
-				fd_log_debug(" - The certificate %d in the chain is expired\n", i);
-			}
-			ret = EINVAL;
-		}
-		
-		GNUTLS_TRACE( deadline = gnutls_x509_crt_get_activation_time(cert) );
-		if ((deadline != (time_t)-1) && (deadline > now)) {
-			if (TRACE_BOOL(INFO)) {
-				fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
-				fd_log_debug(" - The certificate %d in the chain is not yet activated\n", i);
-			}
-			ret = EINVAL;
-		}
-		
-		if ((i == 0) && (conn->cc_tls_para.cn)) {
-			if (!gnutls_x509_crt_check_hostname (cert, conn->cc_tls_para.cn)) {
-				if (TRACE_BOOL(INFO)) {
-					fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
-					fd_log_debug(" - The certificate hostname does not match '%s'\n", conn->cc_tls_para.cn);
-				}
-				ret = EINVAL;
-			}
-		}
-		
-		GNUTLS_TRACE( gnutls_x509_crt_deinit (cert) );
-	}
-
-	return ret;
-}
-
-/* TLS handshake a connection; no need to have called start_clear before. Reception is active if handhsake is successful */
-int fd_cnx_handshake(struct cnxctx * conn, int mode, char * priority, void * alt_creds)
-{
-	TRACE_ENTRY( "%p %d %p %p", conn, mode, priority, alt_creds);
-	CHECK_PARAMS( conn && (!(conn->cc_status & CC_STATUS_TLS)) && ( (mode == GNUTLS_CLIENT) || (mode == GNUTLS_SERVER) ) && (!conn->cc_loop) );
-
-	/* Save the mode */
-	conn->cc_tls_para.mode = mode;
-	
-	/* Cancel receiving thread if any -- it should already be terminated anyway, we just release the resources */
-	CHECK_FCT_DO( fd_thr_term(&conn->cc_rcvthr), /* continue */);
-	
-	/* Once TLS handshake is done, we don't stop after the first message */
-	conn->cc_loop = 1;
-	
-	/* Prepare the master session credentials and priority */
-	CHECK_FCT( fd_tls_prepare(&conn->cc_tls_para.session, mode, priority, alt_creds) );
-
-	/* Special case: multi-stream TLS is not natively managed in GNU TLS, we use a wrapper library */
-	if (conn->cc_sctp_para.pairs > 1) {
-#ifdef DISABLE_SCTP
-		ASSERT(0);
-		CHECK_FCT( ENOTSUP );
-#else /* DISABLE_SCTP */
-		/* Initialize the wrapper, start the demux thread */
-		CHECK_FCT( fd_sctps_init(conn) );
-#endif /* DISABLE_SCTP */
-	} else {
-		/* Set the transport pointer passed to push & pull callbacks */
-		GNUTLS_TRACE( gnutls_transport_set_ptr( conn->cc_tls_para.session, (gnutls_transport_ptr_t) conn ) );
-
-		/* Set the push and pull callbacks */
-		GNUTLS_TRACE( gnutls_transport_set_pull_function(conn->cc_tls_para.session, (void *)fd_cnx_s_recv) );
-		GNUTLS_TRACE( gnutls_transport_set_push_function(conn->cc_tls_para.session, (void *)fd_cnx_s_send) );
-	}
-
-	/* Mark the connection as protected from here, so that the gnutls credentials will be freed */
-	fd_cpu_flush_cache();
-	conn->cc_status |= CC_STATUS_TLS;
-
-	/* Handshake master session */
-	{
-		int ret;
-		
-		/* When gnutls 2.10.1 is around, we should use gnutls_certificate_set_verify_function and fd_tls_verify_credentials, so that handshake fails directly. */
-		
-		CHECK_GNUTLS_DO( ret = gnutls_handshake(conn->cc_tls_para.session),
-			{
-				if (TRACE_BOOL(INFO)) {
-					fd_log_debug("TLS Handshake failed on socket %d (%s) : %s\n", conn->cc_socket, conn->cc_id, gnutls_strerror(ret));
-				}
-				fd_cnx_markerror(conn);
-				return EINVAL;
-			} );
-
-		/* Now verify the remote credentials are valid -- only simple tests here */
-		CHECK_FCT_DO( fd_tls_verify_credentials(conn->cc_tls_para.session, conn, 1), 
-			{  
-				CHECK_GNUTLS_DO( gnutls_bye(conn->cc_tls_para.session, GNUTLS_SHUT_RDWR),  );
-				fd_cnx_markerror(conn);
-				return EINVAL;
-			});
-	}
-
-	/* Multi-stream TLS: handshake other streams as well */
-	if (conn->cc_sctp_para.pairs > 1) {
-#ifndef DISABLE_SCTP
-		/* Start reading the messages from the master session. That way, if the remote peer closed, we are not stuck inside handshake */
-		CHECK_FCT(fd_sctps_startthreads(conn, 0));
-		
-		/* Resume all additional sessions from the master one. */
-		CHECK_FCT(fd_sctps_handshake_others(conn, priority, alt_creds));
-
-		/* Start decrypting the messages from all threads and queuing them in target queue */
-		CHECK_FCT(fd_sctps_startthreads(conn, 1));
-#endif /* DISABLE_SCTP */
-	} else {
-		/* Start decrypting the data */
-		CHECK_POSIX( pthread_create( &conn->cc_rcvthr, NULL, rcvthr_tls_single, conn ) );
-	}
-	
-	return 0;
-}
-
-/* Retrieve TLS credentials of the remote peer, after handshake */
-int fd_cnx_getcred(struct cnxctx * conn, const gnutls_datum_t **cert_list, unsigned int *cert_list_size)
-{
-	TRACE_ENTRY("%p %p %p", conn, cert_list, cert_list_size);
-	CHECK_PARAMS( conn && (conn->cc_status & CC_STATUS_TLS) && cert_list && cert_list_size );
-	
-	/* This function only works for X.509 certificates. */
-	CHECK_PARAMS( gnutls_certificate_type_get (conn->cc_tls_para.session) == GNUTLS_CRT_X509 );
-	
-	GNUTLS_TRACE( *cert_list = gnutls_certificate_get_peers (conn->cc_tls_para.session, cert_list_size) );
-	if (*cert_list == NULL) {
-		TRACE_DEBUG(INFO, "No certificate was provided by remote peer / an error occurred.");
-		return EINVAL;
-	}
-
-	TRACE_DEBUG( FULL, "Saved certificate chain (%d certificates) in peer structure.", *cert_list_size);
-	
-	return 0;
-}
-
-/* Receive next message. if timeout is not NULL, wait only until timeout. This function only pulls from a queue, mgr thread is filling that queue aynchrounously. */
-/* if the altfifo has been set on this conn object, this function must not be called */
-int fd_cnx_receive(struct cnxctx * conn, struct timespec * timeout, unsigned char **buf, size_t * len)
-{
-	int    ev;
-	size_t ev_sz;
-	void * ev_data;
-	
-	TRACE_ENTRY("%p %p %p %p", conn, timeout, buf, len);
-	CHECK_PARAMS(conn && (conn->cc_socket > 0) && buf && len);
-	CHECK_PARAMS(conn->cc_rcvthr != (pthread_t)NULL);
-	CHECK_PARAMS(conn->cc_alt == NULL);
-
-	/* Now, pull the first event */
-get_next:
-	if (timeout) {
-		CHECK_FCT( fd_event_timedget(conn->cc_incoming, timeout, FDEVP_PSM_TIMEOUT, &ev, &ev_sz, &ev_data) );
-	} else {
-		CHECK_FCT( fd_event_get(conn->cc_incoming, &ev, &ev_sz, &ev_data) );
-	}
-	
-	switch (ev) {
-		case FDEVP_CNX_MSG_RECV:
-			/* We got one */
-			*len = ev_sz;
-			*buf = ev_data;
-			return 0;
-			
-		case FDEVP_PSM_TIMEOUT:
-			TRACE_DEBUG(FULL, "Timeout event received");
-			return ETIMEDOUT;
-			
-		case FDEVP_CNX_EP_CHANGE:
-			/* We ignore this event */
-			goto get_next;
-			
-		case FDEVP_CNX_ERROR:
-			TRACE_DEBUG(FULL, "Received ERROR event on the connection");
-			return ENOTCONN;
-	}
-	
-	TRACE_DEBUG(INFO, "Received unexpected event %d (%s)", ev, fd_pev_str(ev));
-	return EINVAL;
-}
-
-/* Set an alternate FIFO list to send FDEVP_CNX_* events to */
-int fd_cnx_recv_setaltfifo(struct cnxctx * conn, struct fifo * alt_fifo)
-{
-	TRACE_ENTRY( "%p %p", conn, alt_fifo );
-	CHECK_PARAMS( conn && alt_fifo && conn->cc_incoming );
-	
-	/* The magic function does it all */
-	CHECK_FCT( fd_fifo_move( conn->cc_incoming, alt_fifo, &conn->cc_alt ) );
-	
-	return 0;
-}
-
-/* Send function when no multi-stream is involved, or sending on stream #0 (send() always use stream 0)*/
-static int send_simple(struct cnxctx * conn, unsigned char * buf, size_t len)
-{
-	ssize_t ret;
-	size_t sent = 0;
-	TRACE_ENTRY("%p %p %zd", conn, buf, len);
-	do {
-		fd_cpu_flush_cache();
-		if (conn->cc_status & CC_STATUS_TLS) {
-			CHECK_GNUTLS_DO( ret = fd_tls_send_handle_error(conn, conn->cc_tls_para.session, buf + sent, len - sent),  );
-		} else {
-			/* Maybe better to replace this call with sendmsg for atomic sending? */
-			CHECK_SYS_DO( ret = fd_cnx_s_send(conn, buf + sent, len - sent), );
-		}
-		if (ret <= 0)
-			return ENOTCONN;
-		
-		sent += ret;
-	} while ( sent < len );
-	return 0;
-}
-
-/* Send a message -- this is synchronous -- and we assume it's never called by several threads at the same time, so we don't protect. */
-int fd_cnx_send(struct cnxctx * conn, unsigned char * buf, size_t len, uint32_t flags)
-{
-	TRACE_ENTRY("%p %p %zd %x", conn, buf, len, flags);
-	
-	CHECK_PARAMS(conn && (conn->cc_socket > 0) && (! (conn->cc_status & CC_STATUS_ERROR)) && buf && len);
-
-	TRACE_DEBUG(FULL, "Sending %zdb %sdata on connection %s", len, (conn->cc_status & CC_STATUS_TLS) ? "TLS-protected ":"", conn->cc_id);
-	
-	switch (conn->cc_proto) {
-		case IPPROTO_TCP:
-			CHECK_FCT( send_simple(conn, buf, len) );
-			break;
-		
-#ifndef DISABLE_SCTP
-		case IPPROTO_SCTP: {
-			if (flags & FD_CNX_BROADCAST) {
-				/* Send the buffer over all other streams */
-				uint16_t str;
-				fd_cpu_flush_cache();
-				if (conn->cc_status & CC_STATUS_TLS) {
-					for ( str=1; str < conn->cc_sctp_para.pairs; str++) {
-						ssize_t ret;
-						size_t sent = 0;
-						do {
-							CHECK_GNUTLS_DO( ret = fd_tls_send_handle_error(conn, conn->cc_sctps_data.array[str].session, buf + sent, len - sent), );
-							if (ret <= 0)
-								return ENOTCONN;
-
-							sent += ret;
-						} while ( sent < len );
-					}
-				} else {
-					for ( str=1; str < conn->cc_sctp_para.str_out; str++) {
-						CHECK_FCT_DO( fd_sctp_sendstr(conn->cc_socket, str, buf, len, &conn->cc_status), { fd_cnx_markerror(conn); return ENOTCONN; } );
-					}
-				}
-				
-				/* Set the ORDERED flag also so that it is sent over stream 0 as well */
-				flags &= FD_CNX_ORDERED;
-			}
-			
-			if (flags & FD_CNX_ORDERED) {
-				/* We send over stream #0 */
-				CHECK_FCT( send_simple(conn, buf, len) );
-			} else {
-				/* Default case : no flag specified */
-			
-				int another_str = 0; /* do we send over stream #0 ? */
-				
-				if ((conn->cc_sctp_para.str_out > 1) && ((! (conn->cc_status & CC_STATUS_TLS)) || (conn->cc_sctp_para.pairs > 1)))  {
-					/* Update the id of the stream we will send this message over */
-					conn->cc_sctp_para.next += 1;
-					conn->cc_sctp_para.next %= ((conn->cc_status & CC_STATUS_TLS) ? conn->cc_sctp_para.pairs : conn->cc_sctp_para.str_out);
-					another_str = (conn->cc_sctp_para.next ? 1 : 0);
-				}
-
-				if ( ! another_str ) {
-					CHECK_FCT( send_simple(conn, buf, len) );
-				} else {
-					if (!(conn->cc_status & CC_STATUS_TLS)) {
-						CHECK_FCT_DO( fd_sctp_sendstr(conn->cc_socket, conn->cc_sctp_para.next, buf, len, &conn->cc_status), { fd_cnx_markerror(conn); return ENOTCONN; } );
-					} else {
-						/* push the record to the appropriate session */
-						ssize_t ret;
-						size_t sent = 0;
-						ASSERT(conn->cc_sctps_data.array != NULL);
-						do {
-							CHECK_GNUTLS_DO( ret = fd_tls_send_handle_error(conn, conn->cc_sctps_data.array[conn->cc_sctp_para.next].session, buf + sent, len - sent), );
-							if (ret <= 0)
-								return ENOTCONN;
-
-							sent += ret;
-						} while ( sent < len );
-					}
-				}
-			}
-		}
-		break;
-#endif /* DISABLE_SCTP */
-	
-		default:
-			TRACE_DEBUG(INFO, "Unknwon protocol: %d", conn->cc_proto);
-			ASSERT(0);
-			return ENOTSUP;	/* or EINVAL... */
-	}
-	
-	return 0;
-}
-
-
-/**************************************/
-/*     Destruction of connection      */
-/**************************************/
-
-/* Destroy a conn structure, and shutdown the socket */
-void fd_cnx_destroy(struct cnxctx * conn)
-{
-	TRACE_ENTRY("%p", conn);
-	
-	CHECK_PARAMS_DO(conn, return);
-	
-	fd_cpu_flush_cache();
-	conn->cc_status |= CC_STATUS_CLOSING;
-	
-	/* Initiate shutdown of the TLS session(s): call gnutls_bye(WR), then read until error */
-	if (conn->cc_status & CC_STATUS_TLS) {
-#ifndef DISABLE_SCTP
-		if (conn->cc_sctp_para.pairs > 1) {
-			if (! (conn->cc_status & CC_STATUS_ERROR )) {
-				/* Bye on master session */
-				CHECK_GNUTLS_DO( gnutls_bye(conn->cc_tls_para.session, GNUTLS_SHUT_WR), fd_cnx_markerror(conn) );
-			}
-
-			if (! (conn->cc_status & CC_STATUS_ERROR ) ) {
-				/* and other stream pairs */
-				fd_sctps_bye(conn);
-			}
-
-			if (! (conn->cc_status & CC_STATUS_ERROR ) ) {
-				/* Now wait for all decipher threads to terminate */
-				fd_sctps_waitthreadsterm(conn);
-			} else {
-				/* Abord the threads, the connection is dead already */
-				fd_sctps_stopthreads(conn);
-			}
-
-			/* Deinit gnutls resources */
-			fd_sctps_gnutls_deinit_others(conn);
-			if (conn->cc_tls_para.session) {
-				GNUTLS_TRACE( gnutls_deinit(conn->cc_tls_para.session) );
-				conn->cc_tls_para.session = NULL;
-			}
-			
-			/* Destroy the wrapper (also stops the demux thread) */
-			fd_sctps_destroy(conn);
-
-		} else {
-#endif /* DISABLE_SCTP */
-		/* We are not using the sctps wrapper layer */
-			if (! (conn->cc_status & CC_STATUS_ERROR ) ) {
-				/* Master session */
-				CHECK_GNUTLS_DO( gnutls_bye(conn->cc_tls_para.session, GNUTLS_SHUT_WR), fd_cnx_markerror(conn) );
-			}
-
-			if (! (conn->cc_status & CC_STATUS_ERROR ) ) {
-				/* In this case, just wait for thread rcvthr_tls_single to terminate */
-				if (conn->cc_rcvthr != (pthread_t)NULL) {
-					CHECK_POSIX_DO(  pthread_join(conn->cc_rcvthr, NULL), /* continue */  );
-					conn->cc_rcvthr = (pthread_t)NULL;
-				}
-			} else {
-				/* Cancel the receiver thread in case it did not already terminate */
-				CHECK_FCT_DO( fd_thr_term(&conn->cc_rcvthr), /* continue */ );
-			}
-			
-			/* Free the resources of the TLS session */
-			if (conn->cc_tls_para.session) {
-				GNUTLS_TRACE( gnutls_deinit(conn->cc_tls_para.session) );
-				conn->cc_tls_para.session = NULL;
-			}
-		
-#ifndef DISABLE_SCTP
-		}
-#endif /* DISABLE_SCTP */
-	}
-	
-	/* Terminate the thread in case it is not done yet -- is there any such case left ?*/
-	CHECK_FCT_DO( fd_thr_term(&conn->cc_rcvthr), /* continue */ );
-		
-	/* Shut the connection down */
-	if (conn->cc_socket > 0) {
-		shutdown(conn->cc_socket, SHUT_RDWR);
-		close(conn->cc_socket);
-		conn->cc_socket = -1;
-	}
-	
-	/* Empty and destroy FIFO list */
-	if (conn->cc_incoming) {
-		fd_event_destroy( &conn->cc_incoming, free );
-	}
-	
-	/* Free the object */
-	free(conn);
-	
-	/* Done! */
-	return;
-}

--- a/freeDiameter/cnxctx.h	Tue Jan 11 15:48:58 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/*********************************************************************************************************
-* Software License Agreement (BSD License)                                                               *
-* Author: Sebastien Decugis <sdecugis@nict.go.jp>							 *
-*													 *
-* Copyright (c) 2010, WIDE Project and NICT								 *
-* All rights reserved.											 *
-* 													 *
-* Redistribution and use of this software in source and binary forms, with or without modification, are  *
-* permitted provided that the following conditions are met:						 *
-* 													 *
-* * Redistributions of source code must retain the above 						 *
-*   copyright notice, this list of conditions and the 							 *
-*   following disclaimer.										 *
-*    													 *
-* * Redistributions in binary form must reproduce the above 						 *
-*   copyright notice, this list of conditions and the 							 *
-*   following disclaimer in the documentation and/or other						 *
-*   materials provided with the distribution.								 *
-* 													 *
-* * Neither the name of the WIDE Project or NICT nor the 						 *
-*   names of its contributors may be used to endorse or 						 *
-*   promote products derived from this software without 						 *
-*   specific prior written permission of WIDE Project and 						 *
-*   NICT.												 *
-* 													 *
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED *
-* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
-* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR *
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 	 *
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 	 *
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR *
-* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF   *
-* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.								 *
-*********************************************************************************************************/
-
-/* This file contains the definitions for internal use in the connection context files */
-
-#ifndef _CNXCTX_H
-#define _CNXCTX_H
-
-/* The connection context structure */
-struct cnxctx {
-	char		cc_id[60];	/* The name of this connection */
-	char		cc_remid[60];	/* Id of remote peer */
-	
-	int 		cc_socket;	/* The socket object of the connection -- <=0 if no socket is created */
-
-	int 		cc_family;	/* AF_INET or AF_INET6 (mixed) */
-	int 		cc_proto;	/* IPPROTO_TCP or IPPROTO_SCTP */
-	uint32_t	cc_status;	/* True if the object is being destroyed: we don't send events anymore */
-	#define 	CC_STATUS_CLOSING	1
-	#define 	CC_STATUS_ERROR		2
-	#define 	CC_STATUS_SIGNALED	4
-	#define 	CC_STATUS_TLS		8
-
-	pthread_t	cc_rcvthr;	/* thread for receiving messages on the connection */
-	int		cc_loop;	/* tell the thread if it loops or stops after the first message is received */
-	
-	struct fifo *	cc_incoming;	/* FIFO queue of events received on the connection, FDEVP_CNX_* */
-	struct fifo *	cc_alt;		/* alternate fifo to send FDEVP_CNX_* events to. */
-	#define Target_Queue(cnx)	((cnx)->cc_alt ?: (cnx)->cc_incoming)
-
-	/* If cc_tls == true */
-	struct {
-		char 				*cn;		/* If not NULL, remote certif will be checked to match this Common Name */
-		int				 mode; 		/* GNUTLS_CLIENT / GNUTLS_SERVER */
-		gnutls_session_t 		 session;	/* Session object (stream #0 in case of SCTP) */
-	}		cc_tls_para;
-
-	/* If cc_proto == SCTP */
-	struct	{
-		uint16_t str_out;	/* Out streams */
-		uint16_t str_in;	/* In streams */
-		uint16_t pairs;		/* max number of pairs ( = min(in, out)) */
-		uint16_t next;		/* # of stream the next message will be sent to */
-	} 		cc_sctp_para;
-
-	/* If both conditions */
-	struct {
-		struct sctps_ctx *array; /* an array of cc_sctp_para.pairs elements -- the #0 is special (session is outside)*/
-		struct sr_store	 *sess_store; /* Session data of the master session, to resume the children sessions */
-	} 		cc_sctps_data;
-};
-
-void fd_cnx_markerror(struct cnxctx * conn);
-
-/* Socket */
-ssize_t fd_cnx_s_recv(struct cnxctx * conn, void *buffer, size_t length);
-void fd_cnx_s_setto(int sock);
-
-/* TLS */
-int fd_tls_rcvthr_core(struct cnxctx * conn, gnutls_session_t session);
-int fd_tls_prepare(gnutls_session_t * session, int mode, char * priority, void * alt_creds);
-int fd_tls_verify_credentials(gnutls_session_t session, struct cnxctx * conn, int verbose);
-
-/* TCP */
-int fd_tcp_create_bind_server( int * sock, sSA * sa, socklen_t salen );
-int fd_tcp_listen( int sock );
-int fd_tcp_client( int *sock, sSA * sa, socklen_t salen );
-int fd_tcp_get_local_ep(int sock, sSS * ss, socklen_t *sl);
-int fd_tcp_get_remote_ep(int sock, sSS * ss, socklen_t *sl);
-
-#ifndef DISABLE_SCTP
-/* SCTP */
-int fd_sctp_create_bind_server( int * sock, int family, struct fd_list * list, uint16_t port );
-int fd_sctp_listen( int sock );
-int fd_sctp_client( int *sock, int no_ip6, uint16_t port, struct fd_list * list );
-int fd_sctp_get_local_ep(int sock,  struct fd_list * list);
-int fd_sctp_get_remote_ep(int sock, struct fd_list * list);
-int fd_sctp_get_str_info( int sock, uint16_t *in, uint16_t *out, sSS *primary );
-int fd_sctp_sendstr(int sock, uint16_t strid, uint8_t * buf, size_t len, uint32_t * cc_closing);
-int fd_sctp_recvmeta(int sock, uint16_t * strid, uint8_t ** buf, size_t * len, int *event, uint32_t * cc_closing);
-
-/* TLS over SCTP (multi-stream) */
-struct sctps_ctx {
-	struct cnxctx 	*parent; 	/* for info such as socket, conn name, event list */
-	uint16_t	 strid;		/* Stream # of this session */
-	struct fifo	*raw_recv;	/* Raw data received on this stream, for demux */
-	struct {
-		uint8_t *buf;
-		size_t   bufsz;
-		size_t   offset;
-	} 		 partial;	/* If the pull function did not read the full content of first message in raw, it stores it here for next read call. */
-	pthread_t	 thr;		/* Thread to decrypt raw data in this pair of streams */
-	gnutls_session_t session;	/* TLS context using this pair of streams -- except if strid == 0, in that case session is outside the array */
-};
-
-int fd_sctps_init(struct cnxctx * conn);
-int fd_sctps_handshake_others(struct cnxctx * conn, char * priority, void * alt_creds);
-int fd_sctps_startthreads(struct cnxctx * conn, int others);
-void fd_sctps_bye(struct cnxctx * conn);
-void fd_sctps_waitthreadsterm(struct cnxctx * conn);
-void fd_sctps_gnutls_deinit_others(struct cnxctx * conn);
-void fd_sctps_stopthreads(struct cnxctx * conn);
-void fd_sctps_destroy(struct cnxctx * conn);
-
-#endif /* DISABLE_SCTP */
-
-
-#endif /* _CNXCTX_H */
-

--- a/freeDiameter/config.c	Tue Jan 11 15:48:58 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,488 +0,0 @@
-/*********************************************************************************************************
-* Software License Agreement (BSD License)                                                               *
-* Author: Sebastien Decugis <sdecugis@nict.go.jp>							 *
-*													 *
-* Copyright (c) 2010, WIDE Project and NICT								 *
-* All rights reserved.											 *
-* 													 *
-* Redistribution and use of this software in source and binary forms, with or without modification, are  *
-* permitted provided that the following conditions are met:						 *
-* 													 *
-* * Redistributions of source code must retain the above 						 *
-*   copyright notice, this list of conditions and the 							 *
-*   following disclaimer.										 *
-*    													 *
-* * Redistributions in binary form must reproduce the above 						 *
-*   copyright notice, this list of conditions and the 							 *
-*   following disclaimer in the documentation and/or other						 *
-*   materials provided with the distribution.								 *
-* 													 *
-* * Neither the name of the WIDE Project or NICT nor the 						 *
-*   names of its contributors may be used to endorse or 						 *
-*   promote products derived from this software without 						 *
-*   specific prior written permission of WIDE Project and 						 *
-*   NICT.												 *
-* 													 *
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED *
-* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
-* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR *
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 	 *
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 	 *
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR *
-* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF   *
-* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.								 *
-*********************************************************************************************************/
-
-#include "fD.h"
-#include <sys/stat.h>
-
-/* Configuration management */
-
-#ifndef GNUTLS_DEFAULT_PRIORITY
-# define GNUTLS_DEFAULT_PRIORITY "NORMAL"
-#endif /* GNUTLS_DEFAULT_PRIORITY */
-#ifndef GNUTLS_DEFAULT_DHBITS
-# define GNUTLS_DEFAULT_DHBITS 1024
-#endif /* GNUTLS_DEFAULT_DHBITS */
-
-/* Initialize the fd_g_config structure to default values */
-int fd_conf_init()
-{
-	TRACE_ENTRY();
-	
-	fd_g_config->cnf_eyec = EYEC_CONFIG;
-	
-	fd_g_config->cnf_timer_tc = 30;
-	fd_g_config->cnf_timer_tw = 30;
-	
-	fd_g_config->cnf_port     = 3868;
-	fd_g_config->cnf_port_tls = 3869;
-	fd_g_config->cnf_sctp_str = 30;
-	fd_g_config->cnf_dispthr  = 4;
-	fd_list_init(&fd_g_config->cnf_endpoints, NULL);
-	fd_list_init(&fd_g_config->cnf_apps, NULL);
-	#ifdef DISABLE_SCTP
-	fd_g_config->cnf_flags.no_sctp = 1;
-	#endif /* DISABLE_SCTP */
-	
-	fd_g_config->cnf_orstateid = (uint32_t) time(NULL);
-	
-	CHECK_FCT( fd_dict_init(&fd_g_config->cnf_dict) );
-	CHECK_FCT( fd_fifo_new(&fd_g_config->cnf_main_ev) );
-	
-	/* TLS parameters */
-	CHECK_GNUTLS_DO( gnutls_certificate_allocate_credentials (&fd_g_config->cnf_sec_data.credentials), return ENOMEM );
-	CHECK_GNUTLS_DO( gnutls_dh_params_init (&fd_g_config->cnf_sec_data.dh_cache), return ENOMEM );
-
-	return 0;
-}
-
-void fd_conf_dump()
-{
-	if (!TRACE_BOOL(INFO))
-		return;
-	
-	fd_log_debug("-- Configuration :\n");
-	fd_log_debug("  Debug trace level ...... : %+d\n", fd_g_debug_lvl);
-	fd_log_debug("  Configuration file ..... : %s\n", fd_g_config->cnf_file);
-	fd_log_debug("  Diameter Identity ...... : %s (l:%Zi)\n", fd_g_config->cnf_diamid, fd_g_config->cnf_diamid_len);
-	fd_log_debug("  Diameter Realm ......... : %s (l:%Zi)\n", fd_g_config->cnf_diamrlm, fd_g_config->cnf_diamrlm_len);
-	fd_log_debug("  Tc Timer ............... : %u\n", fd_g_config->cnf_timer_tc);
-	fd_log_debug("  Tw Timer ............... : %u\n", fd_g_config->cnf_timer_tw);
-	fd_log_debug("  Local port ............. : %hu\n", fd_g_config->cnf_port);
-	fd_log_debug("  Local secure port ...... : %hu\n", fd_g_config->cnf_port_tls);
-	fd_log_debug("  Number of SCTP streams . : %hu\n", fd_g_config->cnf_sctp_str);
-	fd_log_debug("  Number of server threads : %hu\n", fd_g_config->cnf_dispthr);
-	if (FD_IS_LIST_EMPTY(&fd_g_config->cnf_endpoints)) {
-		fd_log_debug("  Local endpoints ........ : Default (use all available)\n");
-	} else {
-		fd_log_debug("  Local endpoints ........ : \n");
-		fd_ep_dump( 29, &fd_g_config->cnf_endpoints );
-	}
-	if (FD_IS_LIST_EMPTY(&fd_g_config->cnf_apps)) {
-		fd_log_debug("  Local applications ..... : (none)\n");
-	} else {
-		struct fd_list * li = fd_g_config->cnf_apps.next;
-		fd_log_debug("  Local applications ..... : ");
-		while (li != &fd_g_config->cnf_apps) {
-			struct fd_app * app = (struct fd_app *)li;
-			if (li != fd_g_config->cnf_apps.next) fd_log_debug("                             ");
-			fd_log_debug("App: %u\t%s%s\tVnd: %u\n", 
-					app->appid,
-					app->flags.auth ? "Au" : "--",
-					app->flags.acct ? "Ac" : "--",
-					app->vndid);
-			li = li->next;
-		}
-	}
-	
-	fd_log_debug("  Flags : - IP ........... : %s\n", fd_g_config->cnf_flags.no_ip4 ? "DISABLED" : "Enabled");
-	fd_log_debug("          - IPv6 ......... : %s\n", fd_g_config->cnf_flags.no_ip6 ? "DISABLED" : "Enabled");
-	fd_log_debug("          - Relay app .... : %s\n", fd_g_config->cnf_flags.no_fwd ? "DISABLED" : "Enabled");
-	fd_log_debug("          - TCP .......... : %s\n", fd_g_config->cnf_flags.no_tcp ? "DISABLED" : "Enabled");
-	#ifdef DISABLE_SCTP
-	fd_log_debug("          - SCTP ......... : DISABLED (at compilation)\n");
-	#else /* DISABLE_SCTP */
-	fd_log_debug("          - SCTP ......... : %s\n", fd_g_config->cnf_flags.no_sctp ? "DISABLED" : "Enabled");
-	#endif /* DISABLE_SCTP */
-	fd_log_debug("          - Pref. proto .. : %s\n", fd_g_config->cnf_flags.pr_tcp ? "TCP" : "SCTP");
-	fd_log_debug("          - TLS method ... : %s\n", fd_g_config->cnf_flags.tls_alg ? "INBAND" : "Separate port");
-	
-	fd_log_debug("  TLS :   - Certificate .. : %s\n", fd_g_config->cnf_sec_data.cert_file ?: "(NONE)");
-	fd_log_debug("          - Private key .. : %s\n", fd_g_config->cnf_sec_data.key_file ?: "(NONE)");
-	fd_log_debug("          - CA (trust) ... : %s (%d certs)\n", fd_g_config->cnf_sec_data.ca_file ?: "(none)", fd_g_config->cnf_sec_data.ca_file_nr);
-	fd_log_debug("          - CRL .......... : %s\n", fd_g_config->cnf_sec_data.crl_file ?: "(none)");
-	fd_log_debug("          - Priority ..... : %s\n", fd_g_config->cnf_sec_data.prio_string ?: "(default: '" GNUTLS_DEFAULT_PRIORITY "')");
-	if (fd_g_config->cnf_sec_data.dh_file)
-		fd_log_debug("          - DH file ...... : %s\n", fd_g_config->cnf_sec_data.dh_file);
-	else
-		fd_log_debug("          - DH bits ...... : %d\n", fd_g_config->cnf_sec_data.dh_bits ?: GNUTLS_DEFAULT_DHBITS);
-	
-	fd_log_debug("  Origin-State-Id ........ : %u\n", fd_g_config->cnf_orstateid);
-}
-
-/* Parse the configuration file (using the yacc parser) */
-int fd_conf_parse()
-{
-	extern FILE * fddin;
-	
-	/* Attempt to find the configuration file */
-	if (!fd_g_config->cnf_file)
-		fd_g_config->cnf_file = FD_DEFAULT_CONF_FILENAME;
-	
-	fddin = fopen(fd_g_config->cnf_file, "r");
-	if ((fddin == NULL) && (*fd_g_config->cnf_file != '/')) {
-		/* We got a relative path, attempt to add the default directory prefix */
-		char * bkp = fd_g_config->cnf_file;
-		CHECK_MALLOC( fd_g_config->cnf_file = malloc(strlen(bkp) + strlen(DEFAULT_CONF_PATH) + 2) ); /* we will not free it, but not important */
-		sprintf( fd_g_config->cnf_file, DEFAULT_CONF_PATH "/%s", bkp );
-		fddin = fopen(fd_g_config->cnf_file, "r");
-	}
-	if (fddin == NULL) {
-		int ret = errno;
-		fprintf(stderr, "Unable to open configuration file %s for reading: %s\n", fd_g_config->cnf_file, strerror(ret));
-		return ret;
-	}
-	
-	/* call yacc parser */
-	TRACE_DEBUG (FULL, "Parsing configuration file: %s", fd_g_config->cnf_file);
-	CHECK_FCT(  fddparse(fd_g_config)  );
-	
-	/* close the file */
-	fclose(fddin);
-	
-	/* Check that TLS private key was given */
-	if (! fd_g_config->cnf_sec_data.key_file) {
-		fprintf(stderr, "Missing private key configuration for TLS. Please provide the TLS_cred configuration directive.\n");
-		return EINVAL;
-	}
-	
-	/* Resolve hostname if not provided */
-	if (fd_g_config->cnf_diamid == NULL) {
-#ifndef HOST_NAME_MAX
-#define HOST_NAME_MAX 1024
-#endif /* HOST_NAME_MAX */
-		char buf[HOST_NAME_MAX + 1];
-		struct addrinfo hints, *info;
-		int ret;
-		
-		/* local host name */
-		CHECK_SYS(gethostname(buf, sizeof(buf)));
-		
-		/* get FQDN */
-		memset(&hints, 0, sizeof hints);
-		hints.ai_flags = AI_CANONNAME;
-
-		ret = getaddrinfo(buf, NULL, &hints, &info);
-		if (ret != 0) {
-			fprintf(stderr, "Error resolving local FQDN :\n"
-					" '%s' : %s\n"
-					"Please provide Identity in configuration file.\n",
-					buf, gai_strerror(ret));
-			return EINVAL;
-		}
-		CHECK_MALLOC( fd_g_config->cnf_diamid = strdup(info->ai_canonname) );
-		freeaddrinfo(info);
-	}
-	
-	/* cache the length of the diameter id for the session module */
-	fd_g_config->cnf_diamid_len = strlen(fd_g_config->cnf_diamid);
-	
-	/* Handle the realm part */
-	if (fd_g_config->cnf_diamrlm == NULL) {
-		char * start = NULL;
-		
-		/* Check the diameter identity is a fqdn */
-		start = strchr(fd_g_config->cnf_diamid, '.');
-		if ((start == NULL) || (start[1] == '\0')) {
-			fprintf(stderr, "Unable to extract realm from the Identity '%s'.\n"
-					"Please fix your Identity setting or provide Realm.\n",
-					fd_g_config->cnf_diamid);
-			return EINVAL;
-		}		
-		
-		CHECK_MALLOC( fd_g_config->cnf_diamrlm = strdup( start + 1 )  ); 
-	}
-	fd_g_config->cnf_diamrlm_len = strlen(fd_g_config->cnf_diamrlm);
-	
-	/* Validate some flags */
-	if (fd_g_config->cnf_flags.no_ip4 && fd_g_config->cnf_flags.no_ip6) {
-		fprintf(stderr, "IP and IPv6 cannot be disabled at the same time.\n");
-		return EINVAL;
-	}
-	if (fd_g_config->cnf_flags.no_tcp && fd_g_config->cnf_flags.no_sctp) {
-		fprintf(stderr, "TCP and SCTP cannot be disabled at the same time.\n");
-		return EINVAL;
-	}
-	
-	/* Validate local endpoints */
-	if ((!FD_IS_LIST_EMPTY(&fd_g_config->cnf_endpoints)) && (fd_g_config->cnf_flags.no_ip4 || fd_g_config->cnf_flags.no_ip6)) {
-		struct fd_list * li;
-		for ( li = fd_g_config->cnf_endpoints.next; li != &fd_g_config->cnf_endpoints; li = li->next) {
-			struct fd_endpoint * ep = (struct fd_endpoint *)li;
-			if ( (fd_g_config->cnf_flags.no_ip4 && (ep->sa.sa_family == AF_INET))
-			   ||(fd_g_config->cnf_flags.no_ip6 && (ep->sa.sa_family == AF_INET6)) ) {
-				li = li->prev;
-				fd_list_unlink(&ep->chain);
-				if (TRACE_BOOL(INFO)) {
-					fd_log_debug("Info: Removing local address conflicting with the flags no_IP / no_IP6 : ");
-					sSA_DUMP_NODE( &ep->sa, NI_NUMERICHOST );
-					fd_log_debug("\n");
-				}
-				free(ep);
-			}
-		}
-	}
-	
-	/* Configure TLS default parameters */
-	if (! fd_g_config->cnf_sec_data.prio_string) {
-		const char * err_pos = NULL;
-		CHECK_GNUTLS_DO( gnutls_priority_init( 
-					&fd_g_config->cnf_sec_data.prio_cache,
-					GNUTLS_DEFAULT_PRIORITY,
-					&err_pos),
-				 { TRACE_DEBUG(INFO, "Error in priority string at position : %s", err_pos); return EINVAL; } );
-	}
-	
-	/* Verify that our certificate is valid -- otherwise remote peers will reject it */
-	{
-		int ret = 0, i;
-		
-		gnutls_datum_t certfile;
-		size_t alloc = 0;
-		
-		gnutls_x509_crt_t * certs = NULL;
-		unsigned int cert_max = 0;
-		
-		gnutls_x509_crt_t * CA_list;
-		int CA_list_length;
-		
-		gnutls_x509_crl_t * CRL_list;
-		int CRL_list_length;
-		
-		unsigned int verify;
-		time_t now;
-		
-		memset(&certfile, 0, sizeof(certfile));
-		
-		/* Read the certificate file */
-		FILE *stream = fopen (fd_g_config->cnf_sec_data.cert_file, "rb");
-		if (!stream) {
-			int err = errno;
-			TRACE_DEBUG(INFO, "An error occurred while opening '%s': %s\n", fd_g_config->cnf_sec_data.cert_file, strerror(err));
-			return err; 
-		}
-		do {
-			uint8_t * realloced = NULL;
-			size_t read = 0;
-			
-			if (alloc < certfile.size + BUFSIZ + 1) {
-				alloc += alloc / 2 + BUFSIZ + 1;
-				CHECK_MALLOC_DO( realloced = realloc(certfile.data, alloc),
-					{
-						free(certfile.data);
-						return ENOMEM;
-					} )
-				certfile.data = realloced;
-			}
-			
-			read = fread( certfile.data + certfile.size, 1, alloc - certfile.size - 1, stream );
-			certfile.size += read;
-			
-			if (ferror(stream)) {
-				int err = errno;
-				TRACE_DEBUG(INFO, "An error occurred while reading '%s': %s\n", fd_g_config->cnf_sec_data.cert_file, strerror(err));
-				return err; 
-			}
-		} while (!feof(stream));
-		certfile.data[certfile.size] = '\0';
-		fclose(stream);
-		
-		/* Import the certificate(s) */
-		GNUTLS_TRACE( ret = gnutls_x509_crt_list_import(NULL, &cert_max, &certfile, GNUTLS_X509_FMT_PEM, GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED) );
-		if (ret != GNUTLS_E_SHORT_MEMORY_BUFFER) {
-			CHECK_GNUTLS_DO(ret, return EINVAL);
-		}
-		
-		CHECK_MALLOC( certs = calloc(cert_max, sizeof(gnutls_x509_crt_t)) );
-		CHECK_GNUTLS_DO( gnutls_x509_crt_list_import(certs, &cert_max, &certfile, GNUTLS_X509_FMT_PEM, 0),
-			{
-				TRACE_DEBUG(INFO, "Failed to import the data from file '%s'", fd_g_config->cnf_sec_data.cert_file);
-				free(certfile.data);
-				return EINVAL;
-			} );
-		free(certfile.data);
-		
-		ASSERT(cert_max >= 1);
-		
-		/* Now, verify the list against the local CA and CRL */
-		GNUTLS_TRACE( gnutls_certificate_get_x509_cas (fd_g_config->cnf_sec_data.credentials, &CA_list, (unsigned int *) &CA_list_length) );
-		GNUTLS_TRACE( gnutls_certificate_get_x509_crls (fd_g_config->cnf_sec_data.credentials, &CRL_list, (unsigned int *) &CRL_list_length) );
-		CHECK_GNUTLS_DO( gnutls_x509_crt_list_verify(certs, cert_max, CA_list, CA_list_length, CRL_list, CRL_list_length, 0, &verify),
-			{
-				TRACE_DEBUG(INFO, "Failed to verify the local certificate '%s' against local credentials. Please check your certificate is valid.", fd_g_config->cnf_sec_data.cert_file);
-				return EINVAL;
-			} );
-		if (verify) {
-			fd_log_debug("TLS: Local certificate chain '%s' is invalid :\n", fd_g_config->cnf_sec_data.cert_file);
-			if (verify & GNUTLS_CERT_INVALID)
-				fd_log_debug(" - The certificate is not trusted (unknown CA? expired?)\n");
-			if (verify & GNUTLS_CERT_REVOKED)
-				fd_log_debug(" - The certificate has been revoked.\n");
-			if (verify & GNUTLS_CERT_SIGNER_NOT_FOUND)
-				fd_log_debug(" - The certificate hasn't got a known issuer.\n");
-			if (verify & GNUTLS_CERT_SIGNER_NOT_CA)
-				fd_log_debug(" - The certificate signer is not a CA, or uses version 1, or 3 without basic constraints.\n");
-			if (verify & GNUTLS_CERT_INSECURE_ALGORITHM)
-				fd_log_debug(" - The certificate signature uses a weak algorithm.\n");
-			return EINVAL;
-		}
-	
-		/* Check the local Identity is valid with the certificate */
-		if (!gnutls_x509_crt_check_hostname (certs[0], fd_g_config->cnf_diamid)) {
-			fd_log_debug("TLS: Local certificate '%s' is invalid :\n", fd_g_config->cnf_sec_data.cert_file);
-			fd_log_debug(" - The certificate hostname does not match '%s'\n", fd_g_config->cnf_diamid);
-			return EINVAL;
-		}
-		
-		/* Check validity of all the certificates in the chain */
-		now = time(NULL);
-		for (i = 0; i < cert_max; i++)
-		{
-			time_t deadline;
-
-			GNUTLS_TRACE( deadline = gnutls_x509_crt_get_expiration_time(certs[i]) );
-			if ((deadline != (time_t)-1) && (deadline < now)) {
-				fd_log_debug("TLS: Local certificate chain '%s' is invalid :\n", fd_g_config->cnf_sec_data.cert_file);
-				fd_log_debug(" - The certificate %d in the chain is expired\n", i);
-				return EINVAL;
-			}
-
-			GNUTLS_TRACE( deadline = gnutls_x509_crt_get_activation_time(certs[i]) );
-			if ((deadline != (time_t)-1) && (deadline > now)) {
-				fd_log_debug("TLS: Local certificate chain '%s' is invalid :\n", fd_g_config->cnf_sec_data.cert_file);
-				fd_log_debug(" - The certificate %d in the chain is not yet activated\n", i);
-				return EINVAL;
-			}
-		}
-		
-		/* Everything checked OK, free the certificate list */
-		for (i = 0; i < cert_max; i++)
-		{
-			GNUTLS_TRACE( gnutls_x509_crt_deinit (certs[i]) );
-		}
-		free(certs);
-	}
-	
-	
-	/* gnutls_certificate_set_verify_limits -- so far the default values are fine... */
-	
-	/* DH */
-	if (fd_g_config->cnf_sec_data.dh_file) {
-		gnutls_datum_t dhparams = { NULL, 0 };
-		size_t alloc = 0;
-		FILE *stream = fopen (fd_g_config->cnf_sec_data.dh_file, "rb");
-		if (!stream) {
-			int err = errno;
-			TRACE_DEBUG(INFO, "An error occurred while opening '%s': %s\n", fd_g_config->cnf_sec_data.dh_file, strerror(err));
-			return err; 
-		}
-		do {
-			uint8_t * realloced = NULL;
-			size_t read = 0;
-			
-			if (alloc < dhparams.size + BUFSIZ + 1) {
-				alloc += alloc / 2 + BUFSIZ + 1;
-				CHECK_MALLOC_DO( realloced = realloc(dhparams.data, alloc),
-					{
-						free(dhparams.data);
-						return ENOMEM;
-					} )
-				dhparams.data = realloced;
-			}
-			
-			read = fread( dhparams.data + dhparams.size, 1, alloc - dhparams.size - 1, stream );
-			dhparams.size += read;
-			
-			if (ferror(stream)) {
-				int err = errno;
-				TRACE_DEBUG(INFO, "An error occurred while reading '%s': %s\n", fd_g_config->cnf_sec_data.dh_file, strerror(err));
-				return err; 
-			}
-		} while (!feof(stream));
-		dhparams.data[dhparams.size] = '\0';
-		fclose(stream);
-		CHECK_GNUTLS_DO( gnutls_dh_params_import_pkcs3( 
-					fd_g_config->cnf_sec_data.dh_cache,
-					&dhparams,
-					GNUTLS_X509_FMT_PEM),
-					 { TRACE_DEBUG(INFO, "Error in DH bits value : %d", fd_g_config->cnf_sec_data.dh_bits ?: GNUTLS_DEFAULT_DHBITS); return EINVAL; } );
-		free(dhparams.data);
-		
-	} else {
-		TRACE_DEBUG(INFO, "Generating fresh Diffie-Hellman parameters of size %d (this takes some time)... ", fd_g_config->cnf_sec_data.dh_bits ?: GNUTLS_DEFAULT_DHBITS);
-		CHECK_GNUTLS_DO( gnutls_dh_params_generate2( 
-					fd_g_config->cnf_sec_data.dh_cache,
-					fd_g_config->cnf_sec_data.dh_bits ?: GNUTLS_DEFAULT_DHBITS),
-					 { TRACE_DEBUG(INFO, "Error in DH bits value : %d", fd_g_config->cnf_sec_data.dh_bits ?: GNUTLS_DEFAULT_DHBITS); return EINVAL; } );
-	}			
-	
-	return 0;
-}
-
-
-/* Destroy contents of fd_g_config structure */
-int fd_conf_deinit()
-{
-	TRACE_ENTRY();
-	
-	/* Free the TLS parameters */
-	gnutls_priority_deinit(fd_g_config->cnf_sec_data.prio_cache);
-	gnutls_dh_params_deinit(fd_g_config->cnf_sec_data.dh_cache);
-	gnutls_certificate_free_credentials(fd_g_config->cnf_sec_data.credentials);
-	
-	free(fd_g_config->cnf_sec_data.cert_file); fd_g_config->cnf_sec_data.cert_file = NULL;
-	free(fd_g_config->cnf_sec_data.key_file); fd_g_config->cnf_sec_data.key_file = NULL;
-	free(fd_g_config->cnf_sec_data.ca_file); fd_g_config->cnf_sec_data.ca_file = NULL;
-	free(fd_g_config->cnf_sec_data.crl_file); fd_g_config->cnf_sec_data.crl_file = NULL;
-	free(fd_g_config->cnf_sec_data.prio_string); fd_g_config->cnf_sec_data.prio_string = NULL;
-	free(fd_g_config->cnf_sec_data.dh_file); fd_g_config->cnf_sec_data.dh_file = NULL;
-	
-	/* Destroy dictionary */
-	CHECK_FCT_DO( fd_dict_fini(&fd_g_config->cnf_dict), );
-	
-	/* Destroy the main event queue */
-	CHECK_FCT_DO( fd_fifo_del(&fd_g_config->cnf_main_ev), );
-	
-	/* Destroy the local endpoints and applications */
-	CHECK_FCT_DO(fd_ep_filter(&fd_g_config->cnf_endpoints, 0 ), );
-	CHECK_FCT_DO(fd_app_empty(&fd_g_config->cnf_apps ), );
-	
-	/* Destroy the local identity */	
-	free(fd_g_config->cnf_diamid); fd_g_config->cnf_diamid = NULL;
-	free(fd_g_config->cnf_diamrlm); fd_g_config->cnf_diamrlm = NULL;
-	
-	return 0;
-}
-
-

--- a/freeDiameter/dict_base_proto.c	Tue Jan 11 15:48:58 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3569 +0,0 @@
-/*********************************************************************************************************
-* Software License Agreement (BSD License)                                                               *
-* Author: Sebastien Decugis <sdecugis@nict.go.jp>							 *
-*													 *
-* Copyright (c) 2010, WIDE Project and NICT								 *
-* All rights reserved.											 *
-* 													 *
-* Redistribution and use of this software in source and binary forms, with or without modification, are  *
-* permitted provided that the following conditions are met:						 *
-* 													 *
-* * Redistributions of source code must retain the above 						 *
-*   copyright notice, this list of conditions and the 							 *
-*   following disclaimer.										 *
-*    													 *
-* * Redistributions in binary form must reproduce the above 						 *
-*   copyright notice, this list of conditions and the 							 *
-*   following disclaimer in the documentation and/or other						 *
-*   materials provided with the distribution.								 *
-* 													 *
-* * Neither the name of the WIDE Project or NICT nor the 						 *
-*   names of its contributors may be used to endorse or 						 *
-*   promote products derived from this software without 						 *
-*   specific prior written permission of WIDE Project and 						 *
-*   NICT.												 *
-* 													 *
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED *
-* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
-* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR *
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 	 *
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 	 *
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR *
-* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF   *
-* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.								 *
-*********************************************************************************************************/
-
-/* Diameter Base protocol definitions.
- */
-
-#include "fD.h"
-
-#include <netinet/in.h>
-#include <sys/socket.h>
-
-/* The pointer for the global dictionary (initialized from main) */
-struct dictionary * fd_g_dict = NULL;
-
-/* The functions to encode and interpret the derived types defined in the base protocol */
-
-/* Address AVP <-> struct sockaddr_storage */
-static int Address_encode(void * data, union avp_value * avp_value)
-{
-	sSS * ss = (sSS *) data;
-	uint16_t AddressType = 0;
-	size_t	size = 0;
-	unsigned char * buf = NULL;
-	
-	TRACE_ENTRY("%p %p", data, avp_value);
-	CHECK_PARAMS( data && avp_value  );
-	
-	switch (ss->ss_family) {
-		case AF_INET:
-			{
-				/* We are encoding an IP address */
-				sSA4 * sin = (sSA4 *)ss;
-				
-				AddressType = 1;/* see http://www.iana.org/assignments/address-family-numbers/ */
-				size = 6;	/* 2 for AddressType + 4 for data */
-				
-				CHECK_MALLOC(  buf = malloc(size)  );
-				
-				/* may not work because of alignment: *(uint32_t *)(buf+2) = htonl(sin->sin_addr.s_addr); */
-				memcpy(buf + 2, &sin->sin_addr.s_addr, 4);
-			}
-			break;
-				
-		case AF_INET6:
-			{
-				/* We are encoding an IPv6 address */
-				sSA6 * sin6 = (sSA6 *)ss;
-				
-				AddressType = 2;/* see http://www.iana.org/assignments/address-family-numbers/ */
-				size = 18;	/* 2 for AddressType + 16 for data */
-				
-				CHECK_MALLOC(  buf = malloc(size)  );
-				
-				/* The order is already good here */
-				memcpy(buf + 2, &sin6->sin6_addr.s6_addr, 16);
-			}
-			break;
-				
-		default:
-			CHECK_PARAMS( AddressType = 0 );
-	}
-	
-	*(uint16_t *)buf = htons(AddressType);
-
-	avp_value->os.len = size;
-	avp_value->os.data = buf;
-	
-	return 0;
-}
-
-static int Address_interpret(union avp_value * avp_value, void * interpreted)
-{
-	uint16_t AddressType = 0;
-	unsigned char * buf;
-	
-	TRACE_ENTRY("%p %p", avp_value, interpreted);
-	
-	CHECK_PARAMS( avp_value && interpreted && (avp_value->os.len >= 2)  );
-	
-	AddressType = ntohs(*(uint16_t *)avp_value->os.data);
-	buf = &avp_value->os.data[2];
-	
-	switch (AddressType) {
-		case 1 /* IP */:
-			{
-				sSA4 * sin = (sSA4 *)interpreted;
-				
-				CHECK_PARAMS(  avp_value->os.len == 6  );
-				
-				sin->sin_family = AF_INET;
-				/* sin->sin_addr.s_addr = ntohl( * (uint32_t *) buf); -- may not work because of bad alignment */
-				memcpy(&sin->sin_addr.s_addr, buf, 4);
-			}
-			break;
-				
-		case 2 /* IP6 */:
-			{
-				sSA6 * sin6 = (sSA6 *)interpreted;
-				
-				CHECK_PARAMS(  avp_value->os.len == 18  );
-				
-				sin6->sin6_family = AF_INET6;
-				memcpy(&sin6->sin6_addr.s6_addr, buf, 16);
-			}
-			break;
-				
-		default:
-			CHECK_PARAMS( AddressType = 0 );
-	}
-	
-	return 0;
-}
-
-/* Dump the content of an Address AVP */
-static void Address_dump(union avp_value * avp_value)
-{
-	union {
-		sSA	sa;
-		sSS	ss;
-		sSA4	sin;
-		sSA6	sin6;
-	} s;
-	uint16_t fam;
-	
-	memset(&s, 0, sizeof(s));
-	
-	/* The first two octets represent the address family, http://www.iana.org/assignments/address-family-numbers/ */
-	if (avp_value->os.len < 2) {
-		fd_log_debug("[invalid length: %d]", avp_value->os.len);
-		return;
-	}
-	
-	/* Following octets are the address in network byte order already */
-	fam = avp_value->os.data[0] << 8 | avp_value->os.data[1];
-	switch (fam) {
-		case 1:
-			/* IP */
-			s.sa.sa_family = AF_INET;
-			if (avp_value->os.len != 6) {
-				fd_log_debug("[invalid IP length: %d]", avp_value->os.len);
-				return;
-			}
-			memcpy(&s.sin.sin_addr.s_addr, avp_value->os.data + 2, 4);
-			break;
-		case 2:
-			/* IP6 */
-			s.sa.sa_family = AF_INET6;
-			if (avp_value->os.len != 18) {
-				fd_log_debug("[invalid IP6 length: %d]", avp_value->os.len);
-				return;
-			}
-			memcpy(&s.sin6.sin6_addr.s6_addr, avp_value->os.data + 2, 16);
-			break;
-		default:
-			fd_log_debug("[unsupported family: 0x%hx]", fam);
-			return;
-	}
-
-	sSA_DUMP_NODE(&s.sa, NI_NUMERICHOST);
-}
-
-static void UTF8String_dump(union avp_value * avp_value)
-{
-	size_t len = avp_value->os.len;
-	if (len > 42)
-		len = 42; /* avoid very long strings */
-	fd_log_debug("%.*s", len, avp_value->os.data);
-}
-
-
-
-
-#define CHECK_dict_new( _type, _data, _parent, _ref )				\
-	CHECK_FCT(  fd_dict_new( dict, (_type), (_data), (_parent), (_ref))  );
-
-#define CHECK_dict_search( _type, _criteria, _what, _result )					\
-	CHECK_FCT(  fd_dict_search( dict, (_type), (_criteria), (_what), (_result), ENOENT)  );
-
-struct local_rules_definition {
-	char 			*avp_name;
-	enum rule_position	position;
-	int 			min;
-	int			max;
-};
-
-#define RULE_ORDER( _position ) ((((_position) == RULE_FIXED_HEAD) || ((_position) == RULE_FIXED_TAIL)) ? 1 : 0 )
-
-#define PARSE_loc_rules( _rulearray, _parent) {						\
-	int __ar;									\
-	for (__ar=0; __ar < sizeof(_rulearray) / sizeof((_rulearray)[0]); __ar++) {	\
-		struct dict_rule_data __data = { NULL, 					\
-			(_rulearray)[__ar].position,					\
-			0, 								\
-			(_rulearray)[__ar].min,						\
-			(_rulearray)[__ar].max};					\
-		__data.rule_order = RULE_ORDER(__data.rule_position);			\
-		CHECK_FCT(  fd_dict_search( 						\
-			dict,								\
-			DICT_AVP, 							\
-			AVP_BY_NAME, 							\
-			(_rulearray)[__ar].avp_name, 					\
-			&__data.rule_avp, 0 ) );					\
-		if ( !__data.rule_avp ) {						\
-			TRACE_DEBUG(INFO, "AVP Not found: '%s'", (_rulearray)[__ar].avp_name );	\
-			return ENOENT;							\
-		}									\
-		CHECK_FCT_DO( fd_dict_new( dict, DICT_RULE, &__data, _parent, NULL),	\
-			{								\
-				TRACE_DEBUG(INFO, "Error on rule with AVP '%s'",	\
-					 (_rulearray)[__ar].avp_name );			\
-				return EINVAL;						\
-			} );								\
-	}										\
-}
-
-int fd_dict_base_protocol(struct dictionary * dict)
-{
-	TRACE_ENTRY("%p", dict);
-	CHECK_PARAMS(dict);
-	
-	/* Vendors section */
-	{
-		/* The base RFC has no vendor information */
-		;
-	}
-	
-	/* Applications section */
-	{
-		/* base accounting application */
-		{
-			struct dict_application_data data = {          3, "Diameter Base Accounting" 	};
-			CHECK_dict_new( DICT_APPLICATION, &data, NULL, NULL);
-		}
-		
-		/* relay application */
-		{
-			struct dict_application_data data  = { 0xffffffff, "Relay" 				};
-			#if AI_RELAY != 0xffffffff
-			#error "AI_RELAY definition mismatch"
-			#endif
-			CHECK_dict_new( DICT_APPLICATION, &data , NULL, NULL);
-		}
-	}
-	
-	/* Derived AVP types section */
-	{
-		/* Address */
-		{
-			/*
-				The Address format is derived from the OctetString AVP Base
-				Format.  It is a discriminated union, representing, for example a
-				32-bit (IPv4) [RFC791] or 128-bit (IPv6) [RFC4291] address, most
-				significant octet first.  The first two octets of the Address AVP
-				represents the AddressType, which contains an Address Family
-				defined in [IANAADFAM].  The AddressType is used to discriminate
-				the content and format of the remaining octets.
-			*/
-			struct dict_type_data data = { AVP_TYPE_OCTETSTRING,	"Address"		, Address_interpret	, Address_encode,	Address_dump	};
-			CHECK_dict_new( DICT_TYPE, &data , NULL, NULL);
-		}
-		
-		/* Time */
-		{
-			/*
-				The Time format is derived from the OctetString AVP Base Format.
-				The string MUST contain four octets, in the same format as the
-				first four bytes are in the NTP timestamp format.  The NTP
-				Timestamp format is defined in chapter 3 of [RFC4330].
-
-				This represents the number of seconds since 0h on 1 January 1900
-				with respect to the Coordinated Universal Time (UTC).
-
-				On 6h 28m 16s UTC, 7 February 2036 the time value will overflow.
-				SNTP [RFC4330] describes a procedure to extend the time to 2104.
-				This procedure MUST be supported by all DIAMETER nodes.
-			*/
-			struct dict_type_data data = { AVP_TYPE_OCTETSTRING,	"Time"			, NULL			, NULL		, NULL		};
-			CHECK_dict_new( DICT_TYPE, &data , NULL, NULL);
-		}
-		
-		/* UTF8String */
-		{
-			/*
-				The UTF8String format is derived from the OctetString AVP Base
-				Format.  This is a human readable string represented using the
-				ISO/IEC IS 10646-1 character set, encoded as an OctetString using
-				the UTF-8 [RFC3629] transformation format described in RFC 3629.
-
-				Since additional code points are added by amendments to the 10646
-				standard from time to time, implementations MUST be prepared to
-				encounter any code point from 0x00000001 to 0x7fffffff.  Byte
-				sequences that do not correspond to the valid encoding of a code
-				point into UTF-8 charset or are outside this range are prohibited.
-
-				The use of control codes SHOULD be avoided.  When it is necessary
-				to represent a new line, the control code sequence CR LF SHOULD be
-				used.
-
-				The use of leading or trailing white space SHOULD be avoided.
-
-				For code points not directly supported by user interface hardware
-				or software, an alternative means of entry and display, such as
-				hexadecimal, MAY be provided.
-
-				For information encoded in 7-bit US-ASCII, the UTF-8 charset is
-				identical to the US-ASCII charset.
-
-				UTF-8 may require multiple bytes to represent a single character /
-				code point; thus the length of an UTF8String in octets may be
-				different from the number of characters encoded.
-
-				Note that the AVP Length field of an UTF8String is measured in
-				octets, not characters.
-			*/
-			struct dict_type_data data = { AVP_TYPE_OCTETSTRING,	"UTF8String"		, NULL			, NULL	, UTF8String_dump	};
-			CHECK_dict_new( DICT_TYPE, &data , NULL, NULL);
-		}
-		
-		/* DiameterIdentity */
-		{
-			/*
-				The DiameterIdentity format is derived from the OctetString AVP
-				Base Format.
-
-                				DiameterIdentity  = FQDN
-
-
-				DiameterIdentity value is used to uniquely identify a Diameter
-				node for purposes of duplicate connection and routing loop
-				detection.
-
-				The contents of the string MUST be the FQDN of the Diameter node.
-				If multiple Diameter nodes run on the same host, each Diameter
-				node MUST be assigned a unique DiameterIdentity.  If a Diameter
-
-				node can be identified by several FQDNs, a single FQDN should be
-				picked at startup, and used as the only DiameterIdentity for that
-				node, whatever the connection it is sent on.  Note that in this
-				document, DiameterIdentity is in ASCII form in order to be
-				compatible with existing DNS infrastructure.  See Appendix D for
-				interactions between the Diameter protocol and Internationalized
-				Domain Name (IDNs).
-			*/
-			struct dict_type_data data = { AVP_TYPE_OCTETSTRING,	"DiameterIdentity"	, NULL			, NULL		, UTF8String_dump	};
-			CHECK_dict_new( DICT_TYPE, &data , NULL, NULL);
-		}
-		
-		/* DiameterURI */
-		{
-			/*
-				The DiameterURI MUST follow the Uniform Resource Identifiers (URI)
-				syntax [RFC3986] rules specified below:
-
-				 "aaa://" FQDN [ port ] [ transport ] [ protocol ]
-
-                				 ; No transport security
-
-				 "aaas://" FQDN [ port ] [ transport ] [ protocol ]
-
-                				 ; Transport security used
-
-				 FQDN               = Fully Qualified Host Name
-
-				 port               = ":" 1*DIGIT
-
-                				 ; One of the ports used to listen for
-                				 ; incoming connections.
-                				 ; If absent,
-                				 ; the default Diameter port (3868) is
-                				 ; assumed.
-
-				 transport          = ";transport=" transport-protocol
-
-                				 ; One of the transports used to listen
-                				 ; for incoming connections.  If absent,
-                				 ; the default SCTP [RFC2960] protocol is
-                				 ; assumed. UDP MUST NOT be used when
-                				 ; the aaa-protocol field is set to
-                				 ; diameter.
-
-				transport-protocol = ( "tcp" / "sctp" / "udp" )
-
-				protocol           = ";protocol=" aaa-protocol
-
-                				 ; If absent, the default AAA protocol
-                				 ; is diameter.
-
-				aaa-protocol       = ( "diameter" / "radius" / "tacacs+" )
-
-				The following are examples of valid Diameter host identities:
-
-				aaa://host.example.com;transport=tcp
-				aaa://host.example.com:6666;transport=tcp
-				aaa://host.example.com;protocol=diameter
-				aaa://host.example.com:6666;protocol=diameter
-				aaa://host.example.com:6666;transport=tcp;protocol=diameter
-				aaa://host.example.com:1813;transport=udp;protocol=radius
-			*/
-			struct dict_type_data data = { AVP_TYPE_OCTETSTRING,	"DiameterURI"		, NULL			, NULL		, UTF8String_dump	};
-			CHECK_dict_new( DICT_TYPE, &data , NULL, NULL);
-		}
-		
-		/* Enumerated */
-		{
-			/*
-				Enumerated is derived from the Integer32 AVP Base Format.  The
-				definition contains a list of valid values and their
-				interpretation and is described in the Diameter application
-				introducing the AVP.
-			*/
-			
-			/* We don't use a generic "Enumerated" type in freeDiameter. Instead, we define
-			 * types of the form "Enumerated(<avpname>)" where <avpname> is replaced 
-			 * by the name of the AVP to which the type applies.
-			 *  Example: Enumerated(Disconnect-Cause)
-			 */
-			;
-		}
-		
-		/* IPFilterRule */
-		{
-			/*
-				The IPFilterRule format is derived from the OctetString AVP Base
-				Format and uses the ASCII charset.  The rule syntax is a modified
-				subset of ipfw(8) from FreeBSD.  Packets may be filtered based on
-				the following information that is associated with it:
-
-				    Direction                          (in or out)
-				    Source and destination IP address  (possibly masked)
-				    Protocol
-				    Source and destination port        (lists or ranges)
-				    TCP flags
-				    IP fragment flag
-				    IP options
-				    ICMP types
-
-				Rules for the appropriate direction are evaluated in order, with
-				the first matched rule terminating the evaluation.  Each packet is
-				evaluated once.  If no rule matches, the packet is dropped if the
-				last rule evaluated was a permit, and passed if the last rule was
-				a deny.
-
-				IPFilterRule filters MUST follow the format:
-				
-				    action dir proto from src to dst [options]
-				
-			(...skipped loooong explanation...)
-				
-				There is one kind of packet that the access device MUST always
-				discard, that is an IP fragment with a fragment offset of one.
-				This is a valid packet, but it only has one use, to try to
-				circumvent firewalls.
-
-				An access device that is unable to interpret or apply a deny rule
-				MUST terminate the session.  An access device that is unable to
-				interpret or apply a permit rule MAY apply a more restrictive
-				rule.  An access device MAY apply deny rules of its own before the
-				supplied rules, for example to protect the access device owner's
-				infrastructure.
-			*/
-			struct dict_type_data data = { AVP_TYPE_OCTETSTRING,	"IPFilterRule"		, NULL			, NULL		, UTF8String_dump	};
-			CHECK_dict_new( DICT_TYPE, &data , NULL, NULL);
-		}
-	}
-	
-	/* AVP section */
-	{
-		struct dict_object * Address_type;
-		struct dict_object * UTF8String_type;
-		struct dict_object * DiameterIdentity_type;
-		struct dict_object * DiameterURI_type;
-		struct dict_object * Time_type;
-		
-		CHECK_dict_search( DICT_TYPE, TYPE_BY_NAME, "Address", &Address_type);
-		CHECK_dict_search( DICT_TYPE, TYPE_BY_NAME, "UTF8String", &UTF8String_type);
-		CHECK_dict_search( DICT_TYPE, TYPE_BY_NAME, "DiameterIdentity", &DiameterIdentity_type);
-		CHECK_dict_search( DICT_TYPE, TYPE_BY_NAME, "DiameterURI", &DiameterURI_type);
-		CHECK_dict_search( DICT_TYPE, TYPE_BY_NAME, "Time", &Time_type);
-		
-		/* Vendor-Id */
-		{
-			/*
-				The Vendor-Id AVP (AVP Code 266) is of type Unsigned32 and contains
-				the IANA "SMI Network Management Private Enterprise Codes" [RFC3232]
-				value assigned to the vendor of the Diameter device.  It is
-				envisioned that the combination of the Vendor-Id, Product-Name
-				(Section 5.3.7) and the Firmware-Revision (Section 5.3.4) AVPs may
-				provide useful debugging information.
-
-				A Vendor-Id value of zero in the CER or CEA messages is reserved and
-				indicates that this field is ignored.
-			*/
-			struct dict_avp_data data = { 
-					266, 					/* Code */
-					#if AC_VENDOR_ID != 266
-					#error "AC_VENDOR_ID definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Vendor-Id", 				/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY, 			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data, NULL, NULL);
-		}
-		
-		/* Firmware-Revision */
-		{
-			/*
-				The Firmware-Revision AVP (AVP Code 267) is of type Unsigned32 and is
-				used to inform a Diameter peer of the firmware revision of the
-				issuing device.
-
-				For devices that do not have a firmware revision (general purpose
-				computers running Diameter software modules, for instance), the
-				revision of the Diameter software module may be reported instead.
-			*/
-			struct dict_avp_data data = { 
-					267, 					/* Code */
-					#if AC_FIRMWARE_REVISION != 267
-					#error "AC_FIRMWARE_REVISION definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Firmware-Revision", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					0,		 			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Host-IP-Address */
-		{
-			/*
-				The Host-IP-Address AVP (AVP Code 257) is of type Address and is used
-				to inform a Diameter peer of the sender's IP address.  All source
-				addresses that a Diameter node expects to use with SCTP [RFC2960]
-				MUST be advertised in the CER and CEA messages by including a
-				Host-IP- Address AVP for each address.  This AVP MUST ONLY be used in
-				the CER and CEA messages.
-			*/
-			struct dict_avp_data data = { 
-					257, 					/* Code */
-					#if AC_HOST_IP_ADDRESS != 257
-					#error "AC_HOST_IP_ADDRESS definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Host-IP-Address", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , Address_type, NULL);
-		}
-		
-		/* Supported-Vendor-Id */
-		{
-			/*
-				The Supported-Vendor-Id AVP (AVP Code 265) is of type Unsigned32 and
-				contains the IANA "SMI Network Management Private Enterprise Codes"
-				[RFC3232] value assigned to a vendor other than the device vendor but
-				including the application vendor.  This is used in the CER and CEA
-				messages in order to inform the peer that the sender supports (a
-				subset of) the vendor-specific AVPs defined by the vendor identified
-				in this AVP.  The value of this AVP SHOULD NOT be set to zero.
-				Multiple instances of this AVP containing the same value SHOULD NOT
-				be sent.
-			*/
-			struct dict_avp_data data = { 
-					265, 					/* Code */
-					#if AC_SUPPORTED_VENDOR_ID != 265
-					#error "AC_SUPPORTED_VENDOR_ID definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Supported-Vendor-Id", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Product-Name */
-		{
-			/*
-				The Product-Name AVP (AVP Code 269) is of type UTF8String, and
-				contains the vendor assigned name for the product.  The Product-Name
-				AVP SHOULD remain constant across firmware revisions for the same
-				product.
-			*/
-			struct dict_avp_data data = { 
-					269, 					/* Code */
-					#if AC_PRODUCT_NAME != 269
-					#error "AC_PRODUCT_NAME definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Product-Name", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					0,					/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , UTF8String_type, NULL);
-		}
-		
-		/* Disconnect-Cause */
-		{
-			/*
-				The Disconnect-Cause AVP (AVP Code 273) is of type Enumerated.  A
-				Diameter node MUST include this AVP in the Disconnect-Peer-Request
-				message to inform the peer of the reason for its intention to
-				shutdown the transport connection.  The following values are
-				supported:
-
-				REBOOTING                         0
-				A scheduled reboot is imminent. Receiver of DPR with above result
-				code MAY attempt reconnection.
-
-				BUSY                              1
-				The peer's internal resources are constrained, and it has
-				determined that the transport connection needs to be closed.
-				Receiver of DPR with above result code SHOULD NOT attempt
-				reconnection.
-
-				DO_NOT_WANT_TO_TALK_TO_YOU        2
-				The peer has determined that it does not see a need for the
-				transport connection to exist, since it does not expect any
-				messages to be exchanged in the near future. Receiver of DPR
-				with above result code SHOULD NOT attempt reconnection.
-			*/
-			struct dict_object 	* 	type;
-			struct dict_type_data 		tdata = { AVP_TYPE_INTEGER32,	"Enumerated(Disconnect-Cause)"	, NULL, NULL, NULL };
-			struct dict_enumval_data 	t_0 = { "REBOOTING", 			{ .i32 = 0 }};
-			struct dict_enumval_data 	t_1 = { "BUSY", 			{ .i32 = 1 }};
-			struct dict_enumval_data 	t_2 = { "DO_NOT_WANT_TO_TALK_TO_YOU", 	{ .i32 = 2 }};
-			struct dict_avp_data 		data = { 
-					273, 					/* Code */
-					#if AC_DISCONNECT_CAUSE != 273
-					#error "AC_DISCONNECT_CAUSE definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Disconnect-Cause", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_INTEGER32 			/* base type of data */
-					};
-			/* Create the Enumerated type, and then the AVP */
-			CHECK_dict_new( DICT_TYPE, &tdata , NULL, &type);
-			CHECK_dict_new( DICT_ENUMVAL, &t_0 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_1 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_2 , type, NULL);
-			CHECK_dict_new( DICT_AVP, &data , type, NULL);
-		}
-		
-		/* Origin-Host */
-		{
-			/*
-				The Origin-Host AVP (AVP Code 264) is of type DiameterIdentity, and
-				MUST be present in all Diameter messages.  This AVP identifies the
-				endpoint that originated the Diameter message.  Relay agents MUST NOT
-				modify this AVP.
-
-				The value of the Origin-Host AVP is guaranteed to be unique within a
-				single host.
-
-				Note that the Origin-Host AVP may resolve to more than one address as
-				the Diameter peer may support more than one address.
-
-				This AVP SHOULD be placed as close to the Diameter header as
-				possible.
-			*/
-			struct dict_avp_data data = { 
-					264, 					/* Code */
-					#if AC_ORIGIN_HOST != 264
-					#error "AC_ORIGIN_HOST definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Origin-Host", 				/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , DiameterIdentity_type, NULL);
-		}
-		
-		/* Origin-Realm */
-		{
-			/*
-				The Origin-Realm AVP (AVP Code 296) is of type DiameterIdentity.
-				This AVP contains the Realm of the originator of any Diameter message
-				and MUST be present in all messages.
-
-				This AVP SHOULD be placed as close to the Diameter header as
-				possible.
-			*/
-			struct dict_avp_data data = { 
-					296, 					/* Code */
-					#if AC_ORIGIN_REALM != 296
-					#error "AC_ORIGIN_REALM definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Origin-Realm", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , DiameterIdentity_type, NULL);
-		}
-		
-		/* Destination-Host */
-		{
-			/*
-				The Destination-Host AVP (AVP Code 293) is of type DiameterIdentity.
-				This AVP MUST be present in all unsolicited agent initiated messages,
-				MAY be present in request messages, and MUST NOT be present in Answer
-				messages.
-
-				The absence of the Destination-Host AVP will cause a message to be
-				sent to any Diameter server supporting the application within the
-				realm specified in Destination-Realm AVP.
-
-				This AVP SHOULD be placed as close to the Diameter header as
-				possible.
-			*/
-			struct dict_avp_data data = { 
-					293, 					/* Code */
-					#if AC_DESTINATION_HOST != 293
-					#error "AC_DESTINATION_HOST definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Destination-Host", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , DiameterIdentity_type, NULL);
-		}
-		
-		/* Destination-Realm */
-		{
-			/*
-				The Destination-Realm AVP (AVP Code 283) is of type DiameterIdentity,
-				and contains the realm the message is to be routed to.  The
-				Destination-Realm AVP MUST NOT be present in Answer messages.
-				Diameter Clients insert the realm portion of the User-Name AVP.
-				Diameter servers initiating a request message use the value of the
-				Origin-Realm AVP from a previous message received from the intended
-				target host (unless it is known a priori).  When present, the
-				Destination-Realm AVP is used to perform message routing decisions.
-
-				Request messages whose ABNF does not list the Destination-Realm AVP
-				as a mandatory AVP are inherently non-routable messages.
-
-				This AVP SHOULD be placed as close to the Diameter header as
-				possible.
-			*/
-			struct dict_avp_data data = { 
-					283, 					/* Code */
-					#if AC_DESTINATION_REALM != 283
-					#error "AC_DESTINATION_REALM definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Destination-Realm", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , DiameterIdentity_type, NULL);
-		}
-		
-		/* Route-Record */
-		{
-			/*
-				The Route-Record AVP (AVP Code 282) is of type DiameterIdentity.  The
-				identity added in this AVP MUST be the same as the one received in
-				the Origin-Host of the Capabilities Exchange message.
-			*/
-			struct dict_avp_data data = { 
-					282, 					/* Code */
-					#if AC_ROUTE_RECORD != 282
-					#error "AC_ROUTE_RECORD definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Route-Record", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , DiameterIdentity_type, NULL);
-		}
-		
-		/* Proxy-Host */
-		{
-			/*
-				The Proxy-Host AVP (AVP Code 280) is of type DiameterIdentity.  This
-				AVP contains the identity of the host that added the Proxy-Info AVP.
-			*/
-			struct dict_avp_data adata = { 
-					280, 					/* Code */
-					#if AC_PROXY_HOST != 280
-					#error "AC_PROXY_HOST definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Proxy-Host", 				/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &adata , DiameterIdentity_type, NULL);
-		}
-		
-		/* Proxy-State */
-		{
-			/*
-				The Proxy-State AVP (AVP Code 33) is of type OctetString, and
-				contains state local information, and MUST be treated as opaque data.
-			*/
-			struct dict_avp_data adata = { 
-					33, 					/* Code */
-					#if AC_PROXY_STATE != 33
-					#error "AC_PROXY_STATE definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Proxy-State", 				/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &adata , NULL, NULL);
-		}
-			
-		/* Proxy-Info */
-		{
-			/*
-				The Proxy-Info AVP (AVP Code 284) is of type Grouped.  The Grouped
-				Data field has the following ABNF grammar:
-
-				 Proxy-Info ::= < AVP Header: 284 >
-                				{ Proxy-Host }
-                				{ Proxy-State }
-        				      * [ AVP ]
-			*/
-			struct dict_object * avp;
-			struct dict_avp_data data = { 
-					284, 					/* Code */
-					#if AC_PROXY_INFO != 284
-					#error "AC_PROXY_INFO definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Proxy-Info", 				/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_GROUPED 			/* base type of data */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Proxy-Host", 			RULE_REQUIRED, -1, 1 }
-							,{  "Proxy-State",			RULE_REQUIRED, -1, 1 }
-						};
-			
-			CHECK_dict_new( DICT_AVP, &data , NULL, &avp);
-			PARSE_loc_rules( rules, avp );
-		}
-		
-		/* Auth-Application-Id */
-		{
-			/*
-				The Auth-Application-Id AVP (AVP Code 258) is of type Unsigned32 and
-				is used in order to advertise support of the Authentication and
-				Authorization portion of an application (see Section 2.4).  If
-				present in a message other than CER and CEA, the value of the Auth-
-				Application-Id AVP MUST match the Application Id present in the
-				Diameter message header.
-			*/
-			struct dict_avp_data data = { 
-					258, 					/* Code */
-					#if AC_AUTH_APPLICATION_ID != 258
-					#error "AC_AUTH_APPLICATION_ID definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Auth-Application-Id", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Acct-Application-Id */
-		{
-			/*
-				The Acct-Application-Id AVP (AVP Code 259) is of type Unsigned32 and
-				is used in order to advertise support of the Accounting portion of an
-				application (see Section 2.4).  If present in a message other than
-				CER and CEA, the value of the Acct-Application-Id AVP MUST match the
-				Application Id present in the Diameter message header.
-			*/
-			struct dict_avp_data data = { 
-					259, 					/* Code */
-					#if AC_ACCT_APPLICATION_ID != 259
-					#error "AC_ACCT_APPLICATION_ID definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Acct-Application-Id", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Inband-Security-Id */
-		{
-			/*
-				The Inband-Security-Id AVP (AVP Code 299) is of type Unsigned32 and
-				is used in order to advertise support of the Security portion of the
-				application.
-
-				Currently, the following values are supported, but there is ample
-				room to add new security Ids.
-
-
-				NO_INBAND_SECURITY 0
-
-				This peer does not support TLS.  This is the default value, if the
-				AVP is omitted.
-
-				TLS 1
-
-				This node supports TLS security, as defined by [RFC4346].
-			*/
-			
-			/* Although the RFC does not specify an "Enumerated" type here, we go forward and create one.
-			 * This is the reason for the "*" in the type name
-			 */
-			
-			struct dict_object 	* 	type;
-			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 = { 
-					299, 					/* Code */
-					#if AC_INBAND_SECURITY_ID != 299
-					#error "AC_INBAND_SECURITY_ID definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Inband-Security-Id", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			/* Create the Enumerated type, and then the AVP */
-			CHECK_dict_new( DICT_TYPE, &tdata , NULL, &type);
-			CHECK_dict_new( DICT_ENUMVAL, &t_0 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_1 , type, NULL);
-			CHECK_dict_new( DICT_AVP, &data , type, NULL);
-		}
-		
-		/* Vendor-Specific-Application-Id */
-		{
-			/*
-				The Vendor-Specific-Application-Id AVP (AVP Code 260) is of type
-				Grouped and is used to advertise support of a vendor-specific
-				Diameter Application.  Exactly one instance of either Auth-
-				Application-Id or Acct-Application-Id AVP MUST be present.  The
-				Application Id carried by either Auth-Application-Id or Acct-
-				Application-Id AVP MUST comply with vendor specific Application Id
-				assignment described in Sec 11.3.  It MUST also match the Application
-				Id present in the diameter header except when used in a CER or CEA
-				messages.
-
-				The Vendor-Id AVP is an informational AVP pertaining to the vendor
-				who may have authorship of the vendor-specific Diameter application.
-				It MUST NOT be used as a means of defining a completely separate
-				vendor-specific Application Id space.
-
-				This AVP MUST also be present as the first AVP in all experimental
-				commands defined in the vendor-specific application.
-
-				This AVP SHOULD be placed as close to the Diameter header as
-				possible.
-
-				AVP Format
-
-				<Vendor-Specific-Application-Id> ::= < AVP Header: 260 >
-                                				   { Vendor-Id }
-                                				   [ Auth-Application-Id ]
-                                				   [ Acct-Application-Id ]
-
-				A Vendor-Specific-Application-Id AVP MUST contain exactly one of
-				either Auth-Application-Id or Acct-Application-Id.  If a Vendor-
-				Specific-Application-Id is received without any of these two AVPs,
-				then the recipient SHOULD issue an answer with a Result-Code set to
-				DIAMETER_MISSING_AVP.  The answer SHOULD also include a Failed-AVP
-				which MUST contain an example of an Auth-Application-Id AVP and an
-				Acct-Application-Id AVP.
-
-				If a Vendor-Specific-Application-Id is received that contains both
-				Auth-Application-Id and Acct-Application-Id, then the recipient
-				SHOULD issue an answer with Result-Code set to
-				DIAMETER_AVP_OCCURS_TOO_MANY_TIMES.  The answer SHOULD also include a
-				Failed-AVP which MUST contain the received Auth-Application-Id AVP
-				and Acct-Application-Id AVP.
-			*/
-			struct dict_object 	* avp;
-			struct dict_avp_data	  data = { 
-					260, 					/* Code */
-					#if AC_VENDOR_SPECIFIC_APPLICATION_ID != 260
-					#error "AC_VENDOR_SPECIFIC_APPLICATION_ID definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Vendor-Specific-Application-Id", 	/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_GROUPED 			/* base type of data */
-					};
-					
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Vendor-Id", 			RULE_REQUIRED, -1, 1 }
-							,{  "Auth-Application-Id",		RULE_OPTIONAL, -1, 1 }
-							,{  "Acct-Application-Id",		RULE_OPTIONAL, -1, 1 }
-						};
-			
-			/* Create the grouped AVP */
-			CHECK_dict_new( DICT_AVP, &data , NULL, &avp);
-			PARSE_loc_rules( rules, avp );
-			
-		}
-		
-		/* Redirect-Host */
-		{
-			/*
-				One or more of instances of this AVP MUST be present if the answer
-				message's 'E' bit is set and the Result-Code AVP is set to
-				DIAMETER_REDIRECT_INDICATION.
-
-				Upon receiving the above, the receiving Diameter node SHOULD forward
-				the request directly to one of the hosts identified in these AVPs.
-				The server contained in the selected Redirect-Host AVP SHOULD be used
-				for all messages pertaining to this session.
-			*/
-			struct dict_avp_data data = { 
-					292, 					/* Code */
-					#if AC_REDIRECT_HOST != 292
-					#error "AC_REDIRECT_HOST definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Redirect-Host", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , DiameterURI_type, NULL);
-		}
-		
-		/* Redirect-Host-Usage */
-		{
-			/*
-				The Redirect-Host-Usage AVP (AVP Code 261) is of type Enumerated.
-				This AVP MAY be present in answer messages whose 'E' bit is set and
-				the Result-Code AVP is set to DIAMETER_REDIRECT_INDICATION.
-
-				When present, this AVP dictates how the routing entry resulting from
-				the Redirect-Host is to be used.  The following values are supported:
-
-
-				DONT_CACHE 0
-
-				The host specified in the Redirect-Host AVP should not be cached.
-				This is the default value.
-
-
-				ALL_SESSION 1
-
-				All messages within the same session, as defined by the same value
-				of the Session-ID AVP MAY be sent to the host specified in the
-				Redirect-Host AVP.
-
-
-				ALL_REALM 2
-
-				All messages destined for the realm requested MAY be sent to the
-				host specified in the Redirect-Host AVP.
-
-
-				REALM_AND_APPLICATION 3
-
-				All messages for the application requested to the realm specified
-				MAY be sent to the host specified in the Redirect-Host AVP.
-
-				ALL_APPLICATION 4
-
-				All messages for the application requested MAY be sent to the host
-				specified in the Redirect-Host AVP.
-
-
-				ALL_HOST 5
-
-				All messages that would be sent to the host that generated the
-				Redirect-Host MAY be sent to the host specified in the Redirect-
-				Host AVP.
-
-
-				ALL_USER 6
-
-				All messages for the user requested MAY be sent to the host
-				specified in the Redirect-Host AVP.
-
-
-				When multiple cached routes are created by redirect indications and
-				they differ only in redirect usage and peers to forward requests to
-				(see Section 6.1.8), a precedence rule MUST be applied to the
-				redirect usage values of the cached routes during normal routing to
-				resolve contentions that may occur.  The precedence rule is the order
-				that dictate which redirect usage should be considered before any
-				other as they appear.  The order is as follows:
-
-
-				1.  ALL_SESSION
-
-				2.  ALL_USER
-
-				3.  REALM_AND_APPLICATION
-
-				4.  ALL_REALM
-
-				5.  ALL_APPLICATION
-
-				6.  ALL_HOST
-			*/
-			struct dict_object 	* 	type;
-			struct dict_type_data	 	tdata = { AVP_TYPE_INTEGER32,	"Enumerated(Redirect-Host-Usage)"	, NULL, NULL, NULL };
-			struct dict_enumval_data 	t_0 = { "DONT_CACHE", 			{ .i32 = 0 }};
-			struct dict_enumval_data 	t_1 = { "ALL_SESSION", 			{ .i32 = 1 }};
-			struct dict_enumval_data 	t_2 = { "ALL_REALM", 			{ .i32 = 2 }};
-			struct dict_enumval_data 	t_3 = { "REALM_AND_APPLICATION", 	{ .i32 = 3 }};
-			struct dict_enumval_data 	t_4 = { "ALL_APPLICATION", 		{ .i32 = 4 }};
-			struct dict_enumval_data 	t_5 = { "ALL_HOST", 			{ .i32 = 5 }};
-			struct dict_enumval_data 	t_6 = { "ALL_USER", 			{ .i32 = 6 }};
-			struct dict_avp_data 		data = { 
-					261, 					/* Code */
-					#if AC_REDIRECT_HOST_USAGE != 261
-					#error "AC_REDIRECT_HOST_USAGE definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Redirect-Host-Usage", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_INTEGER32 			/* base type of data */
-					};
-			/* Create the Enumerated type, and then the AVP */
-			CHECK_dict_new( DICT_TYPE, &tdata , NULL, &type);
-			CHECK_dict_new( DICT_ENUMVAL, &t_0 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_1 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_2 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_3 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_4 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_5 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_6 , type, NULL);
-			CHECK_dict_new( DICT_AVP, &data , type, NULL);
-		}
-		
-		/* Redirect-Max-Cache-Time */
-		{
-			/*
-				The Redirect-Max-Cache-Time AVP (AVP Code 262) is of type Unsigned32.
-				This AVP MUST be present in answer messages whose 'E' bit is set, the
-				Result-Code AVP is set to DIAMETER_REDIRECT_INDICATION and the
-				Redirect-Host-Usage AVP set to a non-zero value.
-
-				This AVP contains the maximum number of seconds the peer and route
-				table entries, created as a result of the Redirect-Host, will be
-				cached.  Note that once a host created due to a redirect indication
-				is no longer reachable, any associated peer and routing table entries
-				MUST be deleted.
-			*/
-			struct dict_avp_data data = { 
-					262, 					/* Code */
-					#if AC_REDIRECT_MAX_CACHE_TIME != 262
-					#error "AC_REDIRECT_MAX_CACHE_TIME definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Redirect-Max-Cache-Time", 		/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Result-Code */
-		{
-			/*
-				The Result-Code AVP (AVP Code 268) is of type Unsigned32 and
-				indicates whether a particular request was completed successfully or
-				whether an error occurred.  All Diameter answer messages defined in
-				IETF applications MUST include one Result-Code AVP.  A non-successful
-				Result-Code AVP (one containing a non 2xxx value other than
-				DIAMETER_REDIRECT_INDICATION) MUST include the Error-Reporting-Host
-				AVP if the host setting the Result-Code AVP is different from the
-				identity encoded in the Origin-Host AVP.
-
-				The Result-Code data field contains an IANA-managed 32-bit address
-				space representing errors (see Section 11.4).  Diameter provides the
-				following classes of errors, all identified by the thousands digit in
-				the decimal notation:
-
-				o  1xxx (Informational)
-
-				o  2xxx (Success)
-
-				o  3xxx (Protocol Errors)
-
-				o  4xxx (Transient Failures)
-
-				o  5xxx (Permanent Failure)
-
-				A non-recognized class (one whose first digit is not defined in this
-				section) MUST be handled as a permanent failure.
-			*/
-			
-			/* Although the RFC does not specify an "Enumerated" type here, we go forward and create one.
-			 * 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_avp_data 	data = { 
-					268, 					/* Code */
-					#if AC_RESULT_CODE != 268
-					#error "AC_RESULT_CODE definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Result-Code", 				/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			/* Create the Enumerated type, and then the AVP */
-			CHECK_dict_new( DICT_TYPE, &tdata , NULL, &type);
-			CHECK_dict_new( DICT_AVP, &data , type, NULL);
-			
-			/* Informational */
-			{
-				/* 1001 */
-				{
-					/*
-						This informational error is returned by a Diameter server to
-						inform the access device that the authentication mechanism being
-						used requires multiple round trips, and a subsequent request needs
-						to be issued in order for access to be granted.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_MULTI_ROUND_AUTH", 	{ .u32 = 1001 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-			}
-			/* Success */
-			{
-				/* 2001 */
-				{
-					/*
-						The Request was successfully completed.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_SUCCESS", 		{ .u32 = 2001 }};
-					#if ER_DIAMETER_SUCCESS != 2001
-					#error "ER_DIAMETER_SUCCESS definition mismatch"
-					#endif
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 2002 */
-				{
-					/*
-						When returned, the request was successfully completed, but
-						additional processing is required by the application in order to
-						provide service to the user.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_LIMITED_SUCCESS", 	{ .u32 = 2002 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-			}
-			/* Protocol Errors */
-			{
-				/* 3001 */
-				{
-					/*
-						The Request contained a Command-Code that the receiver did not
-						recognize or support.  This MUST be used when a Diameter node
-						receives an experimental command that it does not understand.
-					*/
-					/* (old): it has been changed to 5019 in 3588bis */
-					struct dict_enumval_data 	error_code = { "DIAMETER_COMMAND_UNSUPPORTED(old)", 	{ .u32 = 3001 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 3002 */
-				{
-					/*
-						This error is given when Diameter can not deliver the message to
-						the destination, either because no host within the realm
-						supporting the required application was available to process the
-						request, or because Destination-Host AVP was given without the
-						associated Destination-Realm AVP.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_UNABLE_TO_DELIVER", 	{ .u32 = 3002 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 3003 */
-				{
-					/*
-						The intended realm of the request is not recognized.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_REALM_NOT_SERVED", 	{ .u32 = 3003 }};
-					#if ER_DIAMETER_REALM_NOT_SERVED != 3003
-					#error "ER_DIAMETER_REALM_NOT_SERVED definition mismatch"
-					#endif
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 3004 */
-				{
-					/*
-						When returned, a Diameter node SHOULD attempt to send the message
-						to an alternate peer.  This error MUST only be used when a
-						specific server is requested, and it cannot provide the requested
-						service.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_TOO_BUSY", 		{ .u32 = 3004 }};
-					#if ER_DIAMETER_TOO_BUSY != 3004
-					#error "ER_DIAMETER_TOO_BUSY definition mismatch"
-					#endif
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 3005 */
-				{
-					/*
-						An agent detected a loop while trying to get the message to the
-						intended recipient.  The message MAY be sent to an alternate peer,
-						if one is available, but the peer reporting the error has
-						identified a configuration problem.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_LOOP_DETECTED", 	{ .u32 = 3005 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 3006 */
-				{
-					/*
-						A redirect agent has determined that the request could not be
-						satisfied locally and the initiator of the request should direct
-						the request directly to the server, whose contact information has
-						been added to the response.  When set, the Redirect-Host AVP MUST
-						be present.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_REDIRECT_INDICATION", 	{ .u32 = 3006 }};
-					#if ER_DIAMETER_REDIRECT_INDICATION != 3006
-					#error "ER_DIAMETER_REDIRECT_INDICATION definition mismatch"
-					#endif
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 3007 */
-				{
-					/*
-						A request was sent for an application that is not supported.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_APPLICATION_UNSUPPORTED",	{ .u32 = 3007 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 3008 */
-				{
-					/*
-						A request was received whose bits in the Diameter header were
-						either set to an invalid combination, or to a value that is
-						inconsistent with the command code's definition.
-					*/
-					/* (old): it has been changed in 3588bis */
-					struct dict_enumval_data 	error_code = { "DIAMETER_INVALID_HDR_BITS(old)", 	{ .u32 = 3008 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 3009 */
-				{
-					/*
-						A request was received that included an AVP whose flag bits are
-						set to an unrecognized value, or that is inconsistent with the
-						AVP's definition.
-					*/
-					/* (old): it has been changed in 3588bis */
-					struct dict_enumval_data 	error_code = { "DIAMETER_INVALID_AVP_BITS(old)", 	{ .u32 = 3009 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 3010 */
-				{
-					/*
-						 A CER was received from an unknown peer.
-					*/
-					/* (old): it has been changed in 3588bis */
-					struct dict_enumval_data 	error_code = { "DIAMETER_UNKNOWN_PEER(old)", 	{ .u32 = 3010 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 3011 */
-				{
-					/*
-						This error is returned when a reserved bit in the Diameter header
-						is set to one (1) or the bits in the Diameter header defined in
-						Sec 3 are set incorrectly.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_INVALID_BIT_IN_HEADER",	{ .u32 = 3011 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 3012 */
-				{
-					/*
-						This error is returned when a request is received with an invalid
-						message length.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_INVALID_MESSAGE_LENGTH",	{ .u32 = 3012 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-			}
-			/* Transient Failures */
-			{
-				/* 4001 */
-				{
-					/*
-						The authentication process for the user failed, most likely due to
-						an invalid password used by the user.  Further attempts MUST only
-						be tried after prompting the user for a new password.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_AUTHENTICATION_REJECTED", 	{ .u32 = 4001 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 4002 */
-				{
-					/*
-						A Diameter node received the accounting request but was unable to
-						commit it to stable storage due to a temporary lack of space.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_OUT_OF_SPACE", 		{ .u32 = 4002 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 4003 */
-				{
-					/*
-						The peer has determined that it has lost the election process and
-						has therefore disconnected the transport connection.
-					*/
-					struct dict_enumval_data 	error_code = { "ELECTION_LOST", 			{ .u32 = 4003 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-			}
-			/* Permanent Failures */
-			{
-				/* 5001 */
-				{
-					/*
-						The peer received a message that contained an AVP that is not
-						recognized or supported and was marked with the Mandatory bit.  A
-						Diameter message with this error MUST contain one or more Failed-
-						AVP AVP containing the AVPs that caused the failure.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_AVP_UNSUPPORTED", 	{ .u32 = 5001 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5002 */
-				{
-					/*
-						The request contained an unknown Session-Id.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_UNKNOWN_SESSION_ID", 	{ .u32 = 5002 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5003 */
-				{
-					/*
-						A request was received for which the user could not be authorized.
-						This error could occur if the service requested is not permitted
-						to the user.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_AUTHORIZATION_REJECTED",{ .u32 = 5003 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5004 */
-				{
-					/*
-						The request contained an AVP with an invalid value in its data
-						portion.  A Diameter message indicating this error MUST include
-						the offending AVPs within a Failed-AVP AVP.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_INVALID_AVP_VALUE",	{ .u32 = 5004 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5005 */
-				{
-					/*
-						The request did not contain an AVP that is required by the Command
-						Code definition.  If this value is sent in the Result-Code AVP, a
-						Failed-AVP AVP SHOULD be included in the message.  The Failed-AVP
-						AVP MUST contain an example of the missing AVP complete with the
-						Vendor-Id if applicable.  The value field of the missing AVP
-						should be of correct minimum length and contain zeroes.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_MISSING_AVP",		{ .u32 = 5005 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5006 */
-				{
-					/*
-						A request was received that cannot be authorized because the user
-						has already expended allowed resources.  An example of this error
-						condition is a user that is restricted to one dial-up PPP port,
-						attempts to establish a second PPP connection.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_RESOURCES_EXCEEDED",	{ .u32 = 5006 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5007 */
-				{
-					/*
-						The Home Diameter server has detected AVPs in the request that
-						contradicted each other, and is not willing to provide service to
-						the user.  The Failed-AVP AVPs MUST be present which contains the
-						AVPs that contradicted each other.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_CONTRADICTING_AVPS",	{ .u32 = 5007 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5008 */
-				{
-					/*
-						A message was received with an AVP that MUST NOT be present.  The
-						Failed-AVP AVP MUST be included and contain a copy of the
-						offending AVP.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_AVP_NOT_ALLOWED",	{ .u32 = 5008 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5009 */
-				{
-					/*
-						A message was received that included an AVP that appeared more
-						often than permitted in the message definition.  The Failed-AVP
-						AVP MUST be included and contain a copy of the first instance of
-						the offending AVP that exceeded the maximum number of occurrences
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_AVP_OCCURS_TOO_MANY_TIMES",{ .u32 = 5009 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5010 */
-				{
-					/*
-						This error is returned by a Diameter node that is not acting as a
-						relay when it receives a CER which advertises a set of
-						applications that it does not support.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_NO_COMMON_APPLICATION",{ .u32 = 5010 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5011 */
-				{
-					/*
-						This error is returned when a request was received, whose version
-						number is unsupported.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_UNSUPPORTED_VERSION",	{ .u32 = 5011 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5012 */
-				{
-					/*
-						This error is returned when a request is rejected for unspecified
-						reasons.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_UNABLE_TO_COMPLY",	{ .u32 = 5012 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5013 */
-				{
-					/*
-						This error is returned when an unrecognized bit in the Diameter
-						header is set to one (1).
-					*/
-					/* (old): it has been changed in 3588bis */
-					struct dict_enumval_data 	error_code = { "DIAMETER_INVALID_BIT_IN_HEADER(old)", 	{ .u32 = 5013 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5014 */
-				{
-					/*
-						The request contained an AVP with an invalid length.  A Diameter
-						message indicating this error MUST include the offending AVPs
-						within a Failed-AVP AVP.  In cases where the erroneous avp length
-						value exceeds the message length or is less than the minimum AVP
-						header length, it is sufficient to include the offending AVP
-						header and a zero filled payload of the minimum required length
-						for the payloads data type.  If the AVP is a grouped AVP, the
-						grouped AVP header with an empty payload would be sufficient to
-						indicate the offending AVP.  In the case where the offending AVP
-						header cannot be fully decoded when avp length is less than the
-						minimum AVP header length, it is sufficient to include an
-						offending AVP header that is formulated by padding the incomplete
-						AVP header with zero up to the minimum AVP header length.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_INVALID_AVP_LENGTH",	{ .u32 = 5014 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5015 */
-				{
-					/*
-						This error is returned when a request is received with an invalid
-						message length.
-					*/
-					/* (old): it has been changed in 3588bis */
-					struct dict_enumval_data 	error_code = { "DIAMETER_INVALID_MESSAGE_LENGTH(old)", 	{ .u32 = 5015 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5016 */
-				{
-					/*
-						The request contained an AVP with which is not allowed to have the
-						given value in the AVP Flags field.  A Diameter message indicating
-						this error MUST include the offending AVPs within a Failed-AVP
-						AVP.
-					*/
-					/* (old): it has been changed in 3588bis */
-					struct dict_enumval_data 	error_code = { "DIAMETER_INVALID_AVP_BIT_COMBO(old)", 	{ .u32 = 5016 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5017 */
-				{
-					/*
-						This error is returned when a CER message is received, and there
-						are no common security mechanisms supported between the peers.  A
-						Capabilities-Exchange-Answer (CEA) MUST be returned with the
-						Result-Code AVP set to DIAMETER_NO_COMMON_SECURITY.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_NO_COMMON_SECURITY",	{ .u32 = 5017 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5018 */
-				{
-					/*
-						A CER was received from an unknown peer.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_UNKNOWN_PEER",		{ .u32 = 5018 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5019 */
-				{
-					/*
-						The Request contained a Command-Code that the receiver did not
-						recognize or support.  This MUST be used when a Diameter node
-						receives an experimental command that it does not understand.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_COMMAND_UNSUPPORTED",	{ .u32 = 5019 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5020 */
-				{
-					/*
-						A request was received whose bits in the Diameter header were
-						either set to an invalid combination, or to a value that is
-						inconsistent with the command code's definition.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_INVALID_HDR_BITS",	{ .u32 = 5020 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-				/* 5021 */
-				{
-					/*
-						A request was received that included an AVP whose flag bits are
-						set to an unrecognized value, or that is inconsistent with the
-						AVP's definition.
-					*/
-					struct dict_enumval_data 	error_code = { "DIAMETER_INVALID_AVP_BITS",	{ .u32 = 5021 }};
-					CHECK_dict_new( DICT_ENUMVAL, &error_code , type, NULL);
-				}
-			}
-		}
-		
-		/* Error-Message */
-		{
-			/*
-				The Error-Message AVP (AVP Code 281) is of type UTF8String.  It MAY
-				accompany a Result-Code AVP as a human readable error message.  The
-				Error-Message AVP is not intended to be useful in real-time, and
-				SHOULD NOT be expected to be parsed by network entities.
-			*/
-			struct dict_avp_data data = { 
-					281, 					/* Code */
-					#if AC_ERROR_MESSAGE != 281
-					#error "AC_ERROR_MESSAGE definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Error-Message", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					0,					/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , UTF8String_type, NULL);
-		}
-		
-		/* Error-Reporting-Host */
-		{
-			/*
-				The Error-Reporting-Host AVP (AVP Code 294) is of type
-				DiameterIdentity.  This AVP contains the identity of the Diameter
-				host that sent the Result-Code AVP to a value other than 2001
-				(Success), only if the host setting the Result-Code is different from
-				the one encoded in the Origin-Host AVP.  This AVP is intended to be
-				used for troubleshooting purposes, and MUST be set when the Result-
-				Code AVP indicates a failure.
-			*/
-			struct dict_avp_data data = { 
-					294, 					/* Code */
-					#if AC_ERROR_REPORTING_HOST != 294
-					#error "AC_ERROR_REPORTING_HOST definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Error-Reporting-Host", 		/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					0,					/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , DiameterIdentity_type, NULL);
-		}
-		
-		/* Failed-AVP */
-		{
-			/*
-				The Failed-AVP AVP (AVP Code 279) is of type Grouped and provides
-				debugging information in cases where a request is rejected or not
-				fully processed due to erroneous information in a specific AVP.  The
-				value of the Result-Code AVP will provide information on the reason
-				for the Failed-AVP AVP.  A Diameter message SHOULD contain only one
-				Failed-AVP that corresponds to the error indicated by the Result-Code
-				AVP.  For practical purposes, this Failed-AVP would typically refer
-				to the first AVP processing error that a Diameter node encounters.
-
-				The possible reasons for this AVP are the presence of an improperly
-				constructed AVP, an unsupported or unrecognized AVP, an invalid AVP
-				value, the omission of a required AVP, the presence of an explicitly
-				excluded AVP (see tables in Section 10), or the presence of two or
-				more occurrences of an AVP which is restricted to 0, 1, or 0-1
-				occurrences.
-
-				A Diameter message SHOULD contain one Failed-AVP AVP, containing the
-				entire AVP that could not be processed successfully.  If the failure
-				reason is omission of a required AVP, an AVP with the missing AVP
-				code, the missing vendor id, and a zero filled payload of the minimum
-				required length for the omitted AVP will be added.  If the failure
-				reason is an invalid AVP length where the reported length is less
-				than the minimum AVP header length or greater than the reported
-				message length, a copy of the offending AVP header and a zero filled
-				payload of the minimum required length SHOULD be added.
-
-				In the case where the offending AVP is embedded within a grouped AVP,
-				the Failed-AVP MAY contain the grouped AVP which in turn contains the
-				single offending AVP.  The same method MAY be employed if the grouped
-				AVP itself is embedded in yet another grouped AVP and so on.  In this
-				case, the Failed-AVP MAY contain the grouped AVP heirarchy up to the
-				single offending AVP.  This enables the recipient to detect the
-				location of the offending AVP when embedded in a group.
-
-				AVP Format
-
-				 <Failed-AVP> ::= < AVP Header: 279 >
-        				       1* {AVP}
-			*/
-			struct dict_avp_data data = { 
-					279, 					/* Code */
-					#if AC_FAILED_AVP != 279
-					#error "AC_FAILED_AVP definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Failed-AVP", 				/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_GROUPED 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Experimental-Result */
-		{
-			/*
-				The Experimental-Result AVP (AVP Code 297) is of type Grouped, and
-				indicates whether a particular vendor-specific request was completed
-				successfully or whether an error occurred.  Its Data field has the
-				following ABNF grammar:
-
-				AVP Format
-
-				 Experimental-Result ::= < AVP Header: 297 >
-                        				 { Vendor-Id }
-                        				 { Experimental-Result-Code }
-
-				The Vendor-Id AVP (see Section 5.3.3) in this grouped AVP identifies
-				the vendor responsible for the assignment of the result code which
-				follows.  All Diameter answer messages defined in vendor-specific
-				applications MUST include either one Result-Code AVP or one
-				Experimental-Result AVP.
-			*/
-			struct dict_avp_data data = { 
-					297, 					/* Code */
-					0, 					/* Vendor */
-					"Experimental-Result", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_GROUPED 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Experimental-Result-Code */
-		{
-			/*
-				The Experimental-Result-Code AVP (AVP Code 298) is of type Unsigned32
-				and contains a vendor-assigned value representing the result of
-				processing the request.
-
-				It is recommended that vendor-specific result codes follow the same
-				conventions given for the Result-Code AVP regarding the different
-				types of result codes and the handling of errors (for non 2xxx
-				values).
-			*/
-			/* Although the RFC does not specify an "Enumerated" type here, we go forward and create one.
-			 * 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_avp_data 	data = { 
-					298, 					/* Code */
-					0, 					/* Vendor */
-					"Experimental-Result-Code", 		/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			
-			CHECK_dict_new( DICT_TYPE, &tdata , NULL, &type);
-			CHECK_dict_new( DICT_AVP, &data , type, NULL);
-		}
-		
-		/* Auth-Request-Type */
-		{
-			/*
-				The Auth-Request-Type AVP (AVP Code 274) is of type Enumerated and is
-				included in application-specific auth requests to inform the peers
-				whether a user is to be authenticated only, authorized only or both.
-				Note any value other than both MAY cause RADIUS interoperability
-				issues.  The following values are defined:
-
-
-				AUTHENTICATE_ONLY 1
-
-				The request being sent is for authentication only, and MUST
-				contain the relevant application specific authentication AVPs that
-				are needed by the Diameter server to authenticate the user.
-
-
-				AUTHORIZE_ONLY 2
-
-				The request being sent is for authorization only, and MUST contain
-				the application specific authorization AVPs that are necessary to
-				identify the service being requested/offered.
-
-
-				AUTHORIZE_AUTHENTICATE 3
-
-				The request contains a request for both authentication and
-				authorization.  The request MUST include both the relevant
-				application specific authentication information, and authorization
-				information necessary to identify the service being requested/
-				offered.
-			*/
-			struct dict_object 	* 	type;
-			struct dict_type_data 		tdata = { AVP_TYPE_INTEGER32,	"Enumerated(Auth-Request-Type)"	, NULL, NULL, NULL };
-			struct dict_enumval_data 	t_1 = { "AUTHENTICATE_ONLY", 		{ .i32 = 1 }};
-			struct dict_enumval_data 	t_2 = { "AUTHORIZE_ONLY", 		{ .i32 = 2 }};
-			struct dict_enumval_data 	t_3 = { "AUTHORIZE_AUTHENTICATE", 	{ .i32 = 3 }};
-			struct dict_avp_data 	data = { 
-					274, 					/* Code */
-					0, 					/* Vendor */
-					"Auth-Request-Type", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_INTEGER32 			/* base type of data */
-					};
-			/* Create the Enumerated type, and then the AVP */
-			CHECK_dict_new( DICT_TYPE, &tdata , NULL, &type);
-			CHECK_dict_new( DICT_ENUMVAL, &t_1 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_2 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_3 , type, NULL);
-			CHECK_dict_new( DICT_AVP, &data , type, NULL);
-		}
-		
-		/* Session-Id */
-		{
-			/*
-				The Session-Id AVP (AVP Code 263) is of type UTF8String and is used
-				to identify a specific session (see Section 8).  All messages
-				pertaining to a specific session MUST include only one Session-Id AVP
-				and the same value MUST be used throughout the life of a session.
-				When present, the Session-Id SHOULD appear immediately following the
-				Diameter Header (see Section 3).
-
-				The Session-Id MUST be globally and eternally unique, as it is meant
-				to uniquely identify a user session without reference to any other
-				information, and may be needed to correlate historical authentication
-				information with accounting information.  The Session-Id includes a
-				mandatory portion and an implementation-defined portion; a
-				recommended format for the implementation-defined portion is outlined
-				below.
-				
-				(skipped, see RFC for detail)
-			*/
-			struct dict_avp_data data = { 
-					263, 					/* Code */
-					#if AC_SESSION_ID != 263
-					#error "AC_SESSION_ID definition mismatch"
-					#endif
-					0, 					/* Vendor */
-					"Session-Id", 				/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , UTF8String_type, NULL);
-		}
-		
-		/* Authorization-Lifetime */
-		{
-			/*
-				The Authorization-Lifetime AVP (AVP Code 291) is of type Unsigned32
-				and contains the maximum number of seconds of service to be provided
-				to the user before the user is to be re-authenticated and/or re-
-				authorized.  Great care should be taken when the Authorization-
-				Lifetime value is determined, since a low, non-zero, value could
-				create significant Diameter traffic, which could congest both the
-				network and the agents.
-
-				A value of zero (0) means that immediate re-auth is necessary by the
-				access device.  This is typically used in cases where multiple
-				authentication methods are used, and a successful auth response with
-				this AVP set to zero is used to signal that the next authentication
-				method is to be immediately initiated.  The absence of this AVP, or a
-				value of all ones (meaning all bits in the 32 bit field are set to
-				one) means no re-auth is expected.
-
-				If both this AVP and the Session-Timeout AVP are present in a
-				message, the value of the latter MUST NOT be smaller than the
-				Authorization-Lifetime AVP.
-
-				An Authorization-Lifetime AVP MAY be present in re-authorization
-				messages, and contains the number of seconds the user is authorized
-				to receive service from the time the re-auth answer message is
-				received by the access device.
-
-				This AVP MAY be provided by the client as a hint of the maximum
-				lifetime that it is willing to accept.  However, the server MAY
-				return a value that is equal to, or smaller, than the one provided by
-				the client.
-			*/
-			struct dict_avp_data data = { 
-					291, 					/* Code */
-					0, 					/* Vendor */
-					"Authorization-Lifetime", 		/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Auth-Grace-Period */
-		{
-			/*
-				The Auth-Grace-Period AVP (AVP Code 276) is of type Unsigned32 and
-				contains the number of seconds the Diameter server will wait
-				following the expiration of the Authorization-Lifetime AVP before
-				cleaning up resources for the session.
-			*/
-			struct dict_avp_data data = { 
-					276, 					/* Code */
-					0, 					/* Vendor */
-					"Auth-Grace-Period", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Auth-Session-State */
-		{
-			/*
-				The Auth-Session-State AVP (AVP Code 277) is of type Enumerated and
-				specifies whether state is maintained for a particular session.  The
-				client MAY include this AVP in requests as a hint to the server, but
-				the value in the server's answer message is binding.  The following
-				values are supported:
-
-
-				STATE_MAINTAINED 0
-
-				This value is used to specify that session state is being
-				maintained, and the access device MUST issue a session termination
-				message when service to the user is terminated.  This is the
-				default value.
-
-
-				NO_STATE_MAINTAINED 1
-
-				This value is used to specify that no session termination messages
-				will be sent by the access device upon expiration of the
-				Authorization-Lifetime.
-			*/
-			struct dict_object 	* 	type;
-			struct dict_type_data	 	tdata = { AVP_TYPE_INTEGER32,	"Enumerated(Auth-Session-State)"	, NULL, NULL, NULL };
-			struct dict_enumval_data 	t_0 = { "STATE_MAINTAINED", 		{ .i32 = 0 }};
-			struct dict_enumval_data 	t_1 = { "NO_STATE_MAINTAINED", 		{ .i32 = 1 }};
-			struct dict_avp_data	 	data = { 
-					277, 					/* Code */
-					0, 					/* Vendor */
-					"Auth-Session-State", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_INTEGER32 			/* base type of data */
-					};
-			/* Create the Enumerated type, and then the AVP */
-			CHECK_dict_new( DICT_TYPE, &tdata , NULL, &type);
-			CHECK_dict_new( DICT_ENUMVAL, &t_0 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_1 , type, NULL);
-			CHECK_dict_new( DICT_AVP, &data , type, NULL);
-		}
-		
-		/* Re-Auth-Request-Type */
-		{
-			/*
-				The Re-Auth-Request-Type AVP (AVP Code 285) is of type Enumerated and
-				is included in application-specific auth answers to inform the client
-				of the action expected upon expiration of the Authorization-Lifetime.
-				If the answer message contains an Authorization-Lifetime AVP with a
-				positive value, the Re-Auth-Request-Type AVP MUST be present in an
-				answer message.  The following values are defined:
-
-
-				AUTHORIZE_ONLY 0
-
-				An authorization only re-auth is expected upon expiration of the
-				Authorization-Lifetime.  This is the default value if the AVP is
-				not present in answer messages that include the Authorization-
-				Lifetime.
-
-
-				AUTHORIZE_AUTHENTICATE 1
-
-				An authentication and authorization re-auth is expected upon
-				expiration of the Authorization-Lifetime.
-			*/
-			struct dict_object 	* 	type;
-			struct dict_type_data	 	tdata = { AVP_TYPE_INTEGER32,	"Enumerated(Re-Auth-Request-Type)"	, NULL, NULL, NULL };
-			struct dict_enumval_data 	t_0 = { "AUTHORIZE_ONLY", 		{ .i32 = 0 }};
-			struct dict_enumval_data 	t_1 = { "AUTHORIZE_AUTHENTICATE",	{ .i32 = 1 }};
-			struct dict_avp_data	 	data = { 
-					285, 					/* Code */
-					0, 					/* Vendor */
-					"Re-Auth-Request-Type",			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_INTEGER32 			/* base type of data */
-					};
-			/* Create the Enumerated type, and then the AVP */
-			CHECK_dict_new( DICT_TYPE, &tdata , NULL, &type);
-			CHECK_dict_new( DICT_ENUMVAL, &t_0 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_1 , type, NULL);
-			CHECK_dict_new( DICT_AVP, &data , type, NULL);
-		}
-		
-		/* Session-Timeout */
-		{
-			/*
-				The Session-Timeout AVP (AVP Code 27) [RFC2865] is of type Unsigned32
-				and contains the maximum number of seconds of service to be provided
-				to the user before termination of the session.  When both the
-				Session-Timeout and the Authorization-Lifetime AVPs are present in an
-				answer message, the former MUST be equal to or greater than the value
-				of the latter.
-
-				A session that terminates on an access device due to the expiration
-				of the Session-Timeout MUST cause an STR to be issued, unless both
-				the access device and the home server had previously agreed that no
-				session termination messages would be sent (see Section 8.11).
-
-				A Session-Timeout AVP MAY be present in a re-authorization answer
-				message, and contains the remaining number of seconds from the
-				beginning of the re-auth.
-
-				A value of zero, or the absence of this AVP, means that this session
-				has an unlimited number of seconds before termination.
-
-				This AVP MAY be provided by the client as a hint of the maximum
-				timeout that it is willing to accept.  However, the server MAY return
-				a value that is equal to, or smaller, than the one provided by the
-				client.
-			*/
-			struct dict_avp_data data = { 
-					27, 					/* Code */
-					0, 					/* Vendor */
-					"Session-Timeout", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* User-Name */
-		{
-			/*
-				The User-Name AVP (AVP Code 1) [RFC2865] is of type UTF8String, which
-				contains the User-Name, in a format consistent with the NAI
-				specification [RFC4282].
-			*/
-			struct dict_avp_data data = { 
-					1, 					/* Code */
-					0, 					/* Vendor */
-					"User-Name", 				/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , UTF8String_type, NULL);
-		}
-		
-		/* Termination-Cause */
-		{
-			/*
-				The Termination-Cause AVP (AVP Code 295) is of type Enumerated, and
-				is used to indicate the reason why a session was terminated on the
-				access device.  The following values are defined:
-
-
-				DIAMETER_LOGOUT 1
-
-				The user initiated a disconnect
-
-
-				DIAMETER_SERVICE_NOT_PROVIDED 2
-
-				This value is used when the user disconnected prior to the receipt
-				of the authorization answer message.
-
-
-				DIAMETER_BAD_ANSWER 3
-
-				This value indicates that the authorization answer received by the
-				access device was not processed successfully.
-
-
-				DIAMETER_ADMINISTRATIVE 4
-
-				The user was not granted access, or was disconnected, due to
-				administrative reasons, such as the receipt of a Abort-Session-
-				Request message.
-
-
-				DIAMETER_LINK_BROKEN 5
-
-				The communication to the user was abruptly disconnected.
-
-
-				DIAMETER_AUTH_EXPIRED 6
-
-				The user's access was terminated since its authorized session time
-				has expired.
-
-
-				DIAMETER_USER_MOVED 7
-
-				The user is receiving services from another access device.
-
-
-				DIAMETER_SESSION_TIMEOUT 8
-
-				The user's session has timed out, and service has been terminated.
-			*/
-			struct dict_object 	* 	type;
-			struct dict_type_data	 	tdata = { AVP_TYPE_INTEGER32,	"Enumerated(Termination-Cause)"	, NULL, NULL, NULL };
-			struct dict_enumval_data 	t_1 = { "DIAMETER_LOGOUT",			{ .i32 = 1 }};
-			struct dict_enumval_data 	t_2 = { "DIAMETER_SERVICE_NOT_PROVIDED", 	{ .i32 = 2 }};
-			struct dict_enumval_data 	t_3 = { "DIAMETER_BAD_ANSWER",			{ .i32 = 3 }};
-			struct dict_enumval_data 	t_4 = { "DIAMETER_ADMINISTRATIVE", 		{ .i32 = 4 }};
-			struct dict_enumval_data 	t_5 = { "DIAMETER_LINK_BROKEN",			{ .i32 = 5 }};
-			struct dict_enumval_data 	t_6 = { "DIAMETER_AUTH_EXPIRED", 		{ .i32 = 6 }};
-			struct dict_enumval_data 	t_7 = { "DIAMETER_USER_MOVED",			{ .i32 = 7 }};
-			struct dict_enumval_data 	t_8 = { "DIAMETER_SESSION_TIMEOUT", 		{ .i32 = 8 }};
-			struct dict_avp_data 	data = { 
-					295, 					/* Code */
-					0, 					/* Vendor */
-					"Termination-Cause",			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_INTEGER32 			/* base type of data */
-					};
-			/* Create the Enumerated type, and then the AVP */
-			CHECK_dict_new( DICT_TYPE, &tdata , NULL, &type);
-			CHECK_dict_new( DICT_ENUMVAL, &t_1 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_2 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_3 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_4 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_5 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_6 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_7 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_8 , type, NULL);
-			CHECK_dict_new( DICT_AVP, &data , type, NULL);
-		}
-		
-		/* Origin-State-Id */
-		{
-			/*
-				The Origin-State-Id AVP (AVP Code 278), of type Unsigned32, is a
-				monotonically increasing value that is advanced whenever a Diameter
-				entity restarts with loss of previous state, for example upon reboot.
-				Origin-State-Id MAY be included in any Diameter message, including
-				CER.
-
-				A Diameter entity issuing this AVP MUST create a higher value for
-				this AVP each time its state is reset.  A Diameter entity MAY set
-				Origin-State-Id to the time of startup, or it MAY use an incrementing
-				counter retained in non-volatile memory across restarts.
-
-				The Origin-State-Id, if present, MUST reflect the state of the entity
-				indicated by Origin-Host.  If a proxy modifies Origin-Host, it MUST
-				either remove Origin-State-Id or modify it appropriately as well.
-				Typically, Origin-State-Id is used by an access device that always
-				starts up with no active sessions; that is, any session active prior
-				to restart will have been lost.  By including Origin-State-Id in a
-				message, it allows other Diameter entities to infer that sessions
-				associated with a lower Origin-State-Id are no longer active.  If an
-				access device does not intend for such inferences to be made, it MUST
-				either not include Origin-State-Id in any message, or set its value
-				to 0.
-			*/
-			struct dict_avp_data data = { 
-					278, 					/* Code */
-					0, 					/* Vendor */
-					"Origin-State-Id", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Session-Binding */
-		{
-			/*
-				The Session-Binding AVP (AVP Code 270) is of type Unsigned32, and MAY
-				be present in application-specific authorization answer messages.  If
-				present, this AVP MAY inform the Diameter client that all future
-				application-specific re-auth messages for this session MUST be sent
-				to the same authorization server.  This AVP MAY also specify that a
-				Session-Termination-Request message for this session MUST be sent to
-				the same authorizing server.
-
-				This field is a bit mask, and the following bits have been defined:
-
-
-				RE_AUTH 1
-
-				When set, future re-auth messages for this session MUST NOT
-				include the Destination-Host AVP.  When cleared, the default
-				value, the Destination-Host AVP MUST be present in all re-auth
-				messages for this session.
-
-
-				STR 2
-
-				When set, the STR message for this session MUST NOT include the
-				Destination-Host AVP.  When cleared, the default value, the
-				Destination-Host AVP MUST be present in the STR message for this
-				session.
-
-
-				ACCOUNTING 4
-
-				When set, all accounting messages for this session MUST NOT
-				include the Destination-Host AVP.  When cleared, the default
-				value, the Destination-Host AVP, if known, MUST be present in all
-				accounting messages for this session.
-			*/
-			
-			/* Although the RFC does not specify an "Enumerated" type here, we go forward and create one.
-			 * This is the reason for the "*" in the type name
-			 * The actual values of the AVP will not always be defined here, but at least it can be used in some cases.
-			 *  ... maybe the code will be changed later to support bitfields AVP ...
-			 */
-			
-			struct dict_object 	* 	type;
-			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 }};
-			struct dict_avp_data 	data = { 
-					270, 					/* Code */
-					0, 					/* Vendor */
-					"Session-Binding", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			/* Create the Enumerated type, and then the AVP */
-			CHECK_dict_new( DICT_TYPE, &tdata , NULL, &type);
-			CHECK_dict_new( DICT_ENUMVAL, &t_1 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_2 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_4 , type, NULL);
-			CHECK_dict_new( DICT_AVP, &data , type, NULL);
-		}
-		
-		/* Session-Server-Failover */
-		{
-			/*
-				The Session-Server-Failover AVP (AVP Code 271) is of type Enumerated,
-				and MAY be present in application-specific authorization answer
-				messages that either do not include the Session-Binding AVP or
-				include the Session-Binding AVP with any of the bits set to a zero
-				value.  If present, this AVP MAY inform the Diameter client that if a
-				re-auth or STR message fails due to a delivery problem, the Diameter
-				client SHOULD issue a subsequent message without the Destination-Host
-				AVP.  When absent, the default value is REFUSE_SERVICE.
-
-				The following values are supported:
-
-
-				REFUSE_SERVICE 0
-
-				If either the re-auth or the STR message delivery fails, terminate
-				service with the user, and do not attempt any subsequent attempts.
-
-
-				TRY_AGAIN 1
-
-				If either the re-auth or the STR message delivery fails, resend
-				the failed message without the Destination-Host AVP present.
-
-
-				ALLOW_SERVICE 2
-
-				If re-auth message delivery fails, assume that re-authorization
-				succeeded.  If STR message delivery fails, terminate the session.
-
-
-				TRY_AGAIN_ALLOW_SERVICE 3
-
-				If either the re-auth or the STR message delivery fails, resend
-				the failed message without the Destination-Host AVP present.  If
-				the second delivery fails for re-auth, assume re-authorization
-				succeeded.  If the second delivery fails for STR, terminate the
-				session.
-			*/
-			struct dict_object  	* 	type;
-			struct dict_type_data	 	tdata = { AVP_TYPE_INTEGER32,	"Enumerated(Session-Server-Failover)"	, NULL, NULL, NULL };
-			struct dict_enumval_data 	t_0 = { "REFUSE_SERVICE", 		{ .i32 = 0 }};
-			struct dict_enumval_data 	t_1 = { "TRY_AGAIN",			{ .i32 = 1 }};
-			struct dict_enumval_data 	t_2 = { "ALLOW_SERVICE", 		{ .i32 = 2 }};
-			struct dict_enumval_data 	t_3 = { "TRY_AGAIN_ALLOW_SERVICE",	{ .i32 = 3 }};
-			struct dict_avp_data	 	data = { 
-					271, 					/* Code */
-					0, 					/* Vendor */
-					"Session-Server-Failover",		/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_INTEGER32 			/* base type of data */
-					};
-			/* Create the Enumerated type, and then the AVP */
-			CHECK_dict_new( DICT_TYPE, &tdata , NULL, &type);
-			CHECK_dict_new( DICT_ENUMVAL, &t_0 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_1 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_2 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_3 , type, NULL);
-			CHECK_dict_new( DICT_AVP, &data , type, NULL);
-		}
-		
-		/* Multi-Round-Time-Out */
-		{
-			/*
-				The Multi-Round-Time-Out AVP (AVP Code 272) is of type Unsigned32,
-				and SHOULD be present in application-specific authorization answer
-				messages whose Result-Code AVP is set to DIAMETER_MULTI_ROUND_AUTH.
-				This AVP contains the maximum number of seconds that the access
-				device MUST provide the user in responding to an authentication
-				request.
-			*/
-			struct dict_avp_data data = { 
-					272, 					/* Code */
-					0, 					/* Vendor */
-					"Multi-Round-Time-Out", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Class */
-		{
-			/*
-				The Class AVP (AVP Code 25) is of type OctetString and is used to by
-				Diameter servers to return state information to the access device.
-				When one or more Class AVPs are present in application-specific
-				authorization answer messages, they MUST be present in subsequent re-
-				authorization, session termination and accounting messages.  Class
-				AVPs found in a re-authorization answer message override the ones
-				found in any previous authorization answer message.  Diameter server
-				implementations SHOULD NOT return Class AVPs that require more than
-				4096 bytes of storage on the Diameter client.  A Diameter client that
-				receives Class AVPs whose size exceeds local available storage MUST
-				terminate the session.
-			*/
-			struct dict_avp_data data = { 
-					25, 					/* Code */
-					0, 					/* Vendor */
-					"Class", 				/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Event-Timestamp */
-		{
-			/*
-				The Event-Timestamp (AVP Code 55) is of type Time, and MAY be
-				included in an Accounting-Request and Accounting-Answer messages to
-				record the time that the reported event occurred, in seconds since
-				January 1, 1900 00:00 UTC.
-			*/
-			struct dict_avp_data data = { 
-					55, 					/* Code */
-					0, 					/* Vendor */
-					"Event-Timestamp", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , Time_type, NULL);
-		}
-
-				
-		/* Accounting-Record-Type */
-		{
-			/*
-				The Accounting-Record-Type AVP (AVP Code 480) is of type Enumerated
-				and contains the type of accounting record being sent.  The following
-				values are currently defined for the Accounting-Record-Type AVP:
-
-
-				EVENT_RECORD 1
-
-				An Accounting Event Record is used to indicate that a one-time
-				event has occurred (meaning that the start and end of the event
-				are simultaneous).  This record contains all information relevant
-				to the service, and is the only record of the service.
-
-
-				START_RECORD 2
-
-				An Accounting Start, Interim, and Stop Records are used to
-				indicate that a service of a measurable length has been given.  An
-				Accounting Start Record is used to initiate an accounting session,
-				and contains accounting information that is relevant to the
-				initiation of the session.
-
-
-				INTERIM_RECORD 3
-
-				An Interim Accounting Record contains cumulative accounting
-				information for an existing accounting session.  Interim
-				Accounting Records SHOULD be sent every time a re-authentication
-				or re-authorization occurs.  Further, additional interim record
-				triggers MAY be defined by application-specific Diameter
-				applications.  The selection of whether to use INTERIM_RECORD
-				records is done by the Acct-Interim-Interval AVP.
-
-
-				STOP_RECORD 4
-
-				An Accounting Stop Record is sent to terminate an accounting
-				session and contains cumulative accounting information relevant to
-				the existing session.
-			*/
-			struct dict_object 	* 	type;
-			struct dict_type_data	  	tdata = { AVP_TYPE_INTEGER32,	"Enumerated(Accounting-Record-Type)"	, NULL, NULL, NULL };
-			struct dict_enumval_data 	t_1 = { "EVENT_RECORD",			{ .i32 = 1 }};
-			struct dict_enumval_data 	t_2 = { "START_RECORD", 		{ .i32 = 2 }};
-			struct dict_enumval_data 	t_3 = { "INTERIM_RECORD",		{ .i32 = 3 }};
-			struct dict_enumval_data 	t_4 = { "STOP_RECORD", 			{ .i32 = 4 }};
-			struct dict_avp_data 	data = { 
-					480, 					/* Code */
-					0, 					/* Vendor */
-					"Accounting-Record-Type",		/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_INTEGER32 			/* base type of data */
-					};
-			/* Create the Enumerated type, and then the AVP */
-			CHECK_dict_new( DICT_TYPE, &tdata , NULL, &type);
-			CHECK_dict_new( DICT_ENUMVAL, &t_1 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_2 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_3 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_4 , type, NULL);
-			CHECK_dict_new( DICT_AVP, &data , type, NULL);
-		}
-		
-		/* Acct-Interim-Interval */
-		{
-			/*
-				The Acct-Interim-Interval AVP (AVP Code 85) is of type Unsigned32 and
-				is sent from the Diameter home authorization server to the Diameter
-				client.  The client uses information in this AVP to decide how and
-				when to produce accounting records.  With different values in this
-				AVP, service sessions can result in one, two, or two+N accounting
-				records, based on the needs of the home-organization.  The following
-				accounting record production behavior is directed by the inclusion of
-				this AVP:
-
-
-				1.  The omission of the Acct-Interim-Interval AVP or its inclusion
-				with Value field set to 0 means that EVENT_RECORD, START_RECORD,
-				and STOP_RECORD are produced, as appropriate for the service.
-
-
-				2.  The inclusion of the AVP with Value field set to a non-zero value
-				means that INTERIM_RECORD records MUST be produced between the
-				START_RECORD and STOP_RECORD records.  The Value field of this
-				AVP is the nominal interval between these records in seconds.
-
-				The Diameter node that originates the accounting information,
-				known as the client, MUST produce the first INTERIM_RECORD record
-				roughly at the time when this nominal interval has elapsed from
-				the START_RECORD, the next one again as the interval has elapsed
-				once more, and so on until the session ends and a STOP_RECORD
-				record is produced.
-
-				The client MUST ensure that the interim record production times
-				are randomized so that large accounting message storms are not
-				created either among records or around a common service start
-				time.
-			*/
-			struct dict_avp_data data = { 
-					85, 					/* Code */
-					0, 					/* Vendor */
-					"Acct-Interim-Interval", 		/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Accounting-Record-Number */
-		{
-			/*
-				The Accounting-Record-Number AVP (AVP Code 485) is of type Unsigned32
-				and identifies this record within one session.  As Session-Id AVPs
-				are globally unique, the combination of Session-Id and Accounting-
-				Record-Number AVPs is also globally unique, and can be used in
-				matching accounting records with confirmations.  An easy way to
-				produce unique numbers is to set the value to 0 for records of type
-				EVENT_RECORD and START_RECORD, and set the value to 1 for the first
-				INTERIM_RECORD, 2 for the second, and so on until the value for
-				STOP_RECORD is one more than for the last INTERIM_RECORD.
-			*/
-			struct dict_avp_data data = { 
-					485, 					/* Code */
-					0, 					/* Vendor */
-					"Accounting-Record-Number", 		/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED32 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Acct-Session-Id */
-		{
-			/*
-				The Acct-Session-Id AVP (AVP Code 44) is of type OctetString is only
-				used when RADIUS/Diameter translation occurs.  This AVP contains the
-				contents of the RADIUS Acct-Session-Id attribute.
-			*/
-			struct dict_avp_data data = { 
-					44, 					/* Code */
-					0, 					/* Vendor */
-					"Acct-Session-Id", 			/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Acct-Multi-Session-Id */
-		{
-			/*
-				The Acct-Multi-Session-Id AVP (AVP Code 50) is of type UTF8String,
-				following the format specified in Section 8.8.  The Acct-Multi-
-				Session-Id AVP is used to link together multiple related accounting
-				sessions, where each session would have a unique Session-Id, but the
-				same Acct-Multi-Session-Id AVP.  This AVP MAY be returned by the
-				Diameter server in an authorization answer, and MUST be used in all
-				accounting messages for the given session.
-			*/
-			struct dict_avp_data data = { 
-					50, 					/* Code */
-					0, 					/* Vendor */
-					"Acct-Multi-Session-Id", 		/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_OCTETSTRING 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , UTF8String_type, NULL);
-		}
-		
-		/* Accounting-Sub-Session-Id */
-		{
-			/*
-				The Accounting-Sub-Session-Id AVP (AVP Code 287) is of type
-				Unsigned64 and contains the accounting sub-session identifier.  The
-				combination of the Session-Id and this AVP MUST be unique per sub-
-				session, and the value of this AVP MUST be monotonically increased by
-				one for all new sub-sessions.  The absence of this AVP implies no
-				sub-sessions are in use, with the exception of an Accounting-Request
-				whose Accounting-Record-Type is set to STOP_RECORD.  A STOP_RECORD
-				message with no Accounting-Sub-Session-Id AVP present will signal the
-				termination of all sub-sessions for a given Session-Id.
-			*/
-			struct dict_avp_data data = { 
-					287, 					/* Code */
-					0, 					/* Vendor */
-					"Accounting-Sub-Session-Id", 		/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_UNSIGNED64 			/* base type of data */
-					};
-			CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
-		}
-		
-		/* Accounting-Realtime-Required */
-		{
-			/*
-				The Accounting-Realtime-Required AVP (AVP Code 483) is of type
-				Enumerated and is sent from the Diameter home authorization server to
-				the Diameter client or in the Accounting-Answer from the accounting
-				server.  The client uses information in this AVP to decide what to do
-				if the sending of accounting records to the accounting server has
-				been temporarily prevented due to, for instance, a network problem.
-
-
-				DELIVER_AND_GRANT 1
-
-				The AVP with Value field set to DELIVER_AND_GRANT means that the
-				service MUST only be granted as long as there is a connection to
-				an accounting server.  Note that the set of alternative accounting
-				servers are treated as one server in this sense.  Having to move
-				the accounting record stream to a backup server is not a reason to
-				discontinue the service to the user.
-
-
-				GRANT_AND_STORE 2
-
-				The AVP with Value field set to GRANT_AND_STORE means that service
-				SHOULD be granted if there is a connection, or as long as records
-				can still be stored as described in Section 9.4.
-
-				This is the default behavior if the AVP isn't included in the
-				reply from the authorization server.
-
-
-				GRANT_AND_LOSE 3
-
-				The AVP with Value field set to GRANT_AND_LOSE means that service
-				SHOULD be granted even if the records can not be delivered or
-				stored.
-			*/
-			struct dict_object  	* 	type;
-			struct dict_type_data	 	tdata = { AVP_TYPE_INTEGER32,	"Enumerated(Accounting-Realtime-Required)"	, NULL, NULL, NULL };
-			struct dict_enumval_data 	t_1 = { "DELIVER_AND_GRANT",		{ .i32 = 1 }};
-			struct dict_enumval_data 	t_2 = { "GRANT_AND_STORE", 		{ .i32 = 2 }};
-			struct dict_enumval_data 	t_3 = { "GRANT_AND_LOSE",		{ .i32 = 3 }};
-			struct dict_avp_data 		data = { 
-					483, 					/* Code */
-					0, 					/* Vendor */
-					"Accounting-Realtime-Required",		/* Name */
-					AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, 	/* Fixed flags */
-					AVP_FLAG_MANDATORY,			/* Fixed flag values */
-					AVP_TYPE_INTEGER32 			/* base type of data */
-					};
-			/* Create the Enumerated type, and then the AVP */
-			CHECK_dict_new( DICT_TYPE, &tdata , NULL, &type);
-			CHECK_dict_new( DICT_ENUMVAL, &t_1 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_2 , type, NULL);
-			CHECK_dict_new( DICT_ENUMVAL, &t_3 , type, NULL);
-			CHECK_dict_new( DICT_AVP, &data , type, NULL);
-		}
-		
-	}
-	
-	/* Commands section */
-	{
-		/* To avoid defining global variables for all the AVP that we use here, we do search the dictionary in each sub-block.
-		 * This is far from optimal, but the code is clearer like this, and the time it requires at execution is not noticeable.
-		 */
-		
-		/* Generic message syntax when the 'E' bit is set */
-		{
-			/*
-				The 'E' (Error Bit) in the Diameter header is set when the request
-				caused a protocol-related error (see Section 7.1.3).  A message with
-				the 'E' bit MUST NOT be sent as a response to an answer message.
-				Note that a message with the 'E' bit set is still subjected to the
-				processing rules defined in Section 6.2.  When set, the answer
-				message will not conform to the ABNF specification for the command,
-				and will instead conform to the following ABNF:
-
-				Message Format
-
-				<answer-message> ::= < Diameter Header: code, ERR [PXY] >
-                				0*1< Session-Id >
-                				   { Origin-Host }
-                				   { Origin-Realm }
-                				   { Result-Code }
-                				   [ Origin-State-Id ]
-                				   [ Error-Message ]
-                				   [ Error-Reporting-Host ]
-                				   [ Failed-AVP ]
-                				 * [ Proxy-Info ]
-                				 * [ AVP ]
-
-				Note that the code used in the header is the same than the one found
-				in the request message, but with the 'R' bit cleared and the 'E' bit
-				set.  The 'P' bit in the header is set to the same value as the one
-				found in the request message.
-			*/
-			struct dict_object * cmd_error;
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Session-Id", 			RULE_FIXED_HEAD,0, 1 }
-							,{  "Origin-Host",			RULE_REQUIRED, -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED, -1, 1 }
-							,{  "Result-Code",			RULE_REQUIRED, -1, 1 }
-							,{  "Origin-State-Id",			RULE_OPTIONAL, -1, 1 }
-							,{  "Error-Message",			RULE_OPTIONAL, -1, 1 }
-							,{  "Error-Reporting-Host",		RULE_OPTIONAL, -1, 1 }
-							,{  "Failed-AVP",			RULE_OPTIONAL, -1, 1 }
-							,{  "Proxy-Info",			RULE_OPTIONAL, -1,-1 }
-						};
-			CHECK_FCT( fd_dict_get_error_cmd(dict, &cmd_error) );
-			PARSE_loc_rules( rules, cmd_error );
-		}		
-		
-		/* Capabilities-Exchange-Request */
-		{
-			/*
-				The Capabilities-Exchange-Request (CER), indicated by the Command-
-				Code set to 257 and the Command Flags' 'R' bit set, is sent to
-				exchange local capabilities.  Upon detection of a transport failure,
-				this message MUST NOT be sent to an alternate peer.
-
-				When Diameter is run over SCTP [RFC2960], which allows for
-				connections to span multiple interfaces and multiple IP addresses,
-				the Capabilities-Exchange-Request message MUST contain one Host-IP-
-				Address AVP for each potential IP address that MAY be locally used
-				when transmitting Diameter messages.
-
-				Message Format
-
-				 <CER> ::= < Diameter Header: 257, REQ >
-        				   { Origin-Host }
-        				   { Origin-Realm }
-        				1* { Host-IP-Address }
-        				   { Vendor-Id }
-        				   { Product-Name }
-        				   [ Origin-State-Id ]
-        				 * [ Supported-Vendor-Id ]
-        				 * [ Auth-Application-Id ]
-        				 * [ Inband-Security-Id ]
-        				 * [ Acct-Application-Id ]
-        				 * [ Vendor-Specific-Application-Id ]
-        				   [ Firmware-Revision ]
-        				 * [ AVP ]
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					257, 					/* Code */
-					#if CC_CAPABILITIES_EXCHANGE != 257
-					#error "CC_CAPABILITIES_EXCHANGE definition mismatch"
-					#endif
-					"Capabilities-Exchange-Request", 	/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_RETRANSMIT | CMD_FLAG_ERROR, 	/* Fixed flags */
-					CMD_FLAG_REQUEST 			/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Origin-Host", 			RULE_REQUIRED, -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED, -1, 1 }
-							,{  "Host-IP-Address",			RULE_REQUIRED, -1,-1 }
-							,{  "Vendor-Id",			RULE_REQUIRED, -1, 1 }
-							,{  "Product-Name",			RULE_REQUIRED, -1, 1 }
-							,{  "Origin-State-Id",			RULE_OPTIONAL, -1, 1 }
-							,{  "Supported-Vendor-Id",		RULE_OPTIONAL, -1,-1 }
-							,{  "Auth-Application-Id",		RULE_OPTIONAL, -1,-1 }
-							,{  "Inband-Security-Id",		RULE_OPTIONAL, -1,-1 }
-							,{  "Acct-Application-Id",		RULE_OPTIONAL, -1,-1 }
-							,{  "Vendor-Specific-Application-Id",	RULE_OPTIONAL, -1,-1 }
-							,{  "Firmware-Revision",		RULE_OPTIONAL, -1, 1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-		
-		/* Capabilities-Exchange-Answer */
-		{
-			/*
-				The Capabilities-Exchange-Answer (CEA), indicated by the Command-Code
-				set to 257 and the Command Flags' 'R' bit cleared, is sent in
-				response to a CER message.
-
-				When Diameter is run over SCTP [RFC2960], which allows connections to
-				span multiple interfaces, hence, multiple IP addresses, the
-				Capabilities-Exchange-Answer message MUST contain one Host-IP-Address
-				AVP for each potential IP address that MAY be locally used when
-				transmitting Diameter messages.
-
-				Message Format
-
-				 <CEA> ::= < Diameter Header: 257 >
-        				   { Result-Code }
-        				   { Origin-Host }
-        				   { Origin-Realm }
-        				1* { Host-IP-Address }
-        				   { Vendor-Id }
-        				   { Product-Name }
-        				   [ Origin-State-Id ]
-        				   [ Error-Message ]
-        				   [ Failed-AVP ]
-        				 * [ Supported-Vendor-Id ]
-        				 * [ Auth-Application-Id ]
-        				 * [ Inband-Security-Id ]
-        				 * [ Acct-Application-Id ]
-        				 * [ Vendor-Specific-Application-Id ]
-        				   [ Firmware-Revision ]
-        				 * [ AVP ]
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					257, 					/* Code */
-					#if CC_CAPABILITIES_EXCHANGE != 257
-					#error "CC_CAPABILITIES_EXCHANGE definition mismatch"
-					#endif
-					"Capabilities-Exchange-Answer", 	/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_RETRANSMIT, 	/* Fixed flags */
-					0 					/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Result-Code", 			RULE_REQUIRED, -1, 1 }
-						 	,{  "Origin-Host", 			RULE_REQUIRED, -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED, -1, 1 }
-							,{  "Host-IP-Address",			RULE_REQUIRED, -1,-1 }
-							,{  "Vendor-Id",			RULE_REQUIRED, -1, 1 }
-							,{  "Product-Name",			RULE_REQUIRED, -1, 1 }
-							,{  "Origin-State-Id",			RULE_OPTIONAL, -1, 1 }
-							,{  "Error-Message",			RULE_OPTIONAL, -1, 1 }
-							,{  "Failed-AVP",			RULE_OPTIONAL, -1, 1 }
-							,{  "Supported-Vendor-Id",		RULE_OPTIONAL, -1,-1 }
-							,{  "Auth-Application-Id",		RULE_OPTIONAL, -1,-1 }
-							,{  "Inband-Security-Id",		RULE_OPTIONAL, -1,-1 }
-							,{  "Acct-Application-Id",		RULE_OPTIONAL, -1,-1 }
-							,{  "Vendor-Specific-Application-Id",	RULE_OPTIONAL, -1,-1 }
-							,{  "Firmware-Revision",		RULE_OPTIONAL, -1, 1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-		
-		/* Disconnect-Peer-Request */
-		{
-			/*
-				The Disconnect-Peer-Request (DPR), indicated by the Command-Code set
-				to 282 and the Command Flags' 'R' bit set, is sent to a peer to
-				inform its intentions to shutdown the transport connection.  Upon
-				detection of a transport failure, this message MUST NOT be sent to an
-				alternate peer.
-
-				Message Format
-
-				 <DPR>  ::= < Diameter Header: 282, REQ >
-        				    { Origin-Host }
-        				    { Origin-Realm }
-        				    { Disconnect-Cause }
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					282, 					/* Code */
-					#if CC_DISCONNECT_PEER != 282
-					#error "CC_DISCONNECT_PEER definition mismatch"
-					#endif
-					"Disconnect-Peer-Request", 		/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_RETRANSMIT | CMD_FLAG_ERROR, 	/* Fixed flags */
-					CMD_FLAG_REQUEST 			/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Origin-Host", 			RULE_REQUIRED, -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED, -1, 1 }
-							,{  "Disconnect-Cause",			RULE_REQUIRED, -1, 1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-		
-		/* Disconnect-Peer-Answer */
-		{
-			/*
-				The Disconnect-Peer-Answer (DPA), indicated by the Command-Code set
-				to 282 and the Command Flags' 'R' bit cleared, is sent as a response
-				to the Disconnect-Peer-Request message.  Upon receipt of this
-				message, the transport connection is shutdown.
-
-				Message Format
-
-				 <DPA>  ::= < Diameter Header: 282 >
-        				    { Result-Code }
-        				    { Origin-Host }
-        				    { Origin-Realm }
-        				    [ Error-Message ]
-        				    [ Failed-AVP ]
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					282, 					/* Code */
-					#if CC_DISCONNECT_PEER != 282
-					#error "CC_DISCONNECT_PEER definition mismatch"
-					#endif
-					"Disconnect-Peer-Answer", 		/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_RETRANSMIT, 	/* Fixed flags */
-					0 					/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Result-Code", 			RULE_REQUIRED, -1, 1 }
-						 	,{  "Origin-Host", 			RULE_REQUIRED, -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED, -1, 1 }
-							,{  "Error-Message",			RULE_OPTIONAL, -1, 1 }
-							,{  "Failed-AVP",			RULE_OPTIONAL, -1, 1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-
-		/* Device-Watchdog-Request */
-		{
-			/*
-				The Device-Watchdog-Request (DWR), indicated by the Command-Code set
-				to 280 and the Command Flags' 'R' bit set, is sent to a peer when no
-				traffic has been exchanged between two peers (see Section 5.5.3).
-				Upon detection of a transport failure, this message MUST NOT be sent
-				to an alternate peer.
-
-				Message Format
-
-				 <DWR>  ::= < Diameter Header: 280, REQ >
-        				    { Origin-Host }
-        				    { Origin-Realm }
-        				    [ Origin-State-Id ]
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					280, 					/* Code */
-					#if CC_DEVICE_WATCHDOG != 280
-					#error "CC_DEVICE_WATCHDOG definition mismatch"
-					#endif
-					"Device-Watchdog-Request", 		/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_RETRANSMIT | CMD_FLAG_ERROR, 	/* Fixed flags */
-					CMD_FLAG_REQUEST 			/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Origin-Host", 			RULE_REQUIRED, -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED, -1, 1 }
-							,{  "Origin-State-Id",			RULE_OPTIONAL, -1, 1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-		
-		/* Device-Watchdog-Answer */
-		{
-			/*
-				The Device-Watchdog-Answer (DWA), indicated by the Command-Code set
-				to 280 and the Command Flags' 'R' bit cleared, is sent as a response
-				to the Device-Watchdog-Request message.
-
-				Message Format
-
-				 <DWA>  ::= < Diameter Header: 280 >
-        				    { Result-Code }
-        				    { Origin-Host }
-        				    { Origin-Realm }
-        				    [ Error-Message ]
-        				    [ Failed-AVP ]
-        				    [ Origin-State-Id ]
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					280, 					/* Code */
-					#if CC_DEVICE_WATCHDOG != 280
-					#error "CC_DEVICE_WATCHDOG definition mismatch"
-					#endif
-					"Device-Watchdog-Answer", 		/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_RETRANSMIT, 	/* Fixed flags */
-					0 					/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Result-Code", 			RULE_REQUIRED, -1, 1 }
-						 	,{  "Origin-Host", 			RULE_REQUIRED, -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED, -1, 1 }
-							,{  "Error-Message",			RULE_OPTIONAL, -1, 1 }
-							,{  "Failed-AVP",			RULE_OPTIONAL, -1, 1 }
-							,{  "Origin-State-Id",			RULE_OPTIONAL, -1, 1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-		
-		/* Re-Auth-Request */
-		{
-			/*
-				The Re-Auth-Request (RAR), indicated by the Command-Code set to 258
-				and the message flags' 'R' bit set, may be sent by any server to the
-				access device that is providing session service, to request that the
-				user be re-authenticated and/or re-authorized.
-
-
-				Message Format
-
-				 <RAR>  ::= < Diameter Header: 258, REQ, PXY >
-        				    < Session-Id >
-        				    { Origin-Host }
-        				    { Origin-Realm }
-        				    { Destination-Realm }
-        				    { Destination-Host }
-        				    { Auth-Application-Id }
-        				    { Re-Auth-Request-Type }
-        				    [ User-Name ]
-        				    [ Origin-State-Id ]
-        				  * [ Proxy-Info ]
-        				  * [ Route-Record ]
-        				  * [ AVP ]
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					258, 					/* Code */
-					#if CC_RE_AUTH != 258
-					#error "CC_RE_AUTH definition mismatch"
-					#endif
-					"Re-Auth-Request", 			/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_ERROR,	/* Fixed flags */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE	/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Session-Id", 			RULE_FIXED_HEAD, -1, 1 }
-						 	,{  "Origin-Host", 			RULE_REQUIRED,   -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED,   -1, 1 }
-							,{  "Destination-Realm",		RULE_REQUIRED,   -1, 1 }
-						 	,{  "Destination-Host", 		RULE_REQUIRED,   -1, 1 }
-						 	,{  "Auth-Application-Id", 		RULE_REQUIRED,   -1, 1 }
-						 	,{  "Re-Auth-Request-Type", 		RULE_REQUIRED,   -1, 1 }
-							,{  "User-Name",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Origin-State-Id",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Proxy-Info",			RULE_OPTIONAL,   -1,-1 }
-							,{  "Route-Record",			RULE_OPTIONAL,   -1,-1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-		
-		/* Re-Auth-Answer */
-		{
-			/*
-				The Re-Auth-Answer (RAA), indicated by the Command-Code set to 258
-				and the message flags' 'R' bit clear, is sent in response to the RAR.
-				The Result-Code AVP MUST be present, and indicates the disposition of
-				the request.
-
-				A successful RAA message MUST be followed by an application-specific
-				authentication and/or authorization message.
-
-
-				Message Format
-
-				 <RAA>  ::= < Diameter Header: 258, PXY >
-        				    < Session-Id >
-        				    { Result-Code }
-        				    { Origin-Host }
-        				    { Origin-Realm }
-        				    [ User-Name ]
-        				    [ Origin-State-Id ]
-        				    [ Error-Message ]
-        				    [ Error-Reporting-Host ]
-        				    [ Failed-AVP ]
-        				  * [ Redirect-Host ]
-        				    [ Redirect-Host-Usage ]
-        				    [ Redirect-Max-Cache-Time ]
-        				  * [ Proxy-Info ]
-        				  * [ AVP ]
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					258, 					/* Code */
-					#if CC_RE_AUTH != 258
-					#error "CC_RE_AUTH definition mismatch"
-					#endif
-					"Re-Auth-Answer", 			/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE,	/* Fixed flags */
-							   CMD_FLAG_PROXIABLE	/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Session-Id", 			RULE_FIXED_HEAD, -1, 1 }
- 							,{  "Result-Code", 			RULE_REQUIRED,   -1, 1 }
-						 	,{  "Origin-Host", 			RULE_REQUIRED,   -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED,   -1, 1 }
-							,{  "User-Name",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Origin-State-Id",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Error-Message",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Error-Reporting-Host",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Failed-AVP",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Redirect-Host",			RULE_OPTIONAL,   -1,-1 }
-							,{  "Redirect-Host-Usage",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Redirect-Max-Cache-Time",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Proxy-Info",			RULE_OPTIONAL,   -1,-1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-		
-		/* Session-Termination-Request */
-		{
-			/*
-				The Session-Termination-Request (STR), indicated by the Command-Code
-				set to 275 and the Command Flags' 'R' bit set, is sent by the access
-				device to inform the Diameter Server that an authenticated and/or
-				authorized session is being terminated.
-
-
-        				   Message Format
-
-				 <STR> ::= < Diameter Header: 275, REQ, PXY >
-        				   < Session-Id >
-        				   { Origin-Host }
-        				   { Origin-Realm }
-        				   { Destination-Realm }
-        				   { Auth-Application-Id }
-        				   { Termination-Cause }
-        				   [ User-Name ]
-        				   [ Destination-Host ]
-        				 * [ Class ]
-        				   [ Origin-State-Id ]
-        				 * [ Proxy-Info ]
-        				 * [ Route-Record ]
-        				 * [ AVP ]
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					275, 					/* Code */
-					#if CC_SESSION_TERMINATION != 275
-					#error "CC_SESSION_TERMINATION definition mismatch"
-					#endif
-					"Session-Termination-Request", 		/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_ERROR,	/* Fixed flags */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE	/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Session-Id", 			RULE_FIXED_HEAD, -1, 1 }
-						 	,{  "Origin-Host", 			RULE_REQUIRED,   -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED,   -1, 1 }
-							,{  "Destination-Realm",		RULE_REQUIRED,   -1, 1 }
-						 	,{  "Auth-Application-Id", 		RULE_REQUIRED,   -1, 1 }
-						 	,{  "Termination-Cause", 		RULE_REQUIRED,   -1, 1 }
-							,{  "User-Name",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Destination-Host",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Class",				RULE_OPTIONAL,   -1,-1 }
-							,{  "Origin-State-Id",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Proxy-Info",			RULE_OPTIONAL,   -1,-1 }
-							,{  "Route-Record",			RULE_OPTIONAL,   -1,-1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-		
-		/* Session-Termination-Answer */
-		{
-			/*
-				The Session-Termination-Answer (STA), indicated by the Command-Code
-				set to 275 and the message flags' 'R' bit clear, is sent by the
-				Diameter Server to acknowledge the notification that the session has
-				been terminated.  The Result-Code AVP MUST be present, and MAY
-				contain an indication that an error occurred while servicing the STR.
-
-				Upon sending or receipt of the STA, the Diameter Server MUST release
-				all resources for the session indicated by the Session-Id AVP.  Any
-				intermediate server in the Proxy-Chain MAY also release any
-				resources, if necessary.
-
-        				    Message Format
-
-				 <STA>  ::= < Diameter Header: 275, PXY >
-        				    < Session-Id >
-        				    { Result-Code }
-        				    { Origin-Host }
-        				    { Origin-Realm }
-        				    [ User-Name ]
-        				  * [ Class ]
-        				    [ Error-Message ]
-        				    [ Error-Reporting-Host ]
-        				    [ Failed-AVP ]
-        				    [ Origin-State-Id ]
-        				  * [ Redirect-Host ]
-        				    [ Redirect-Host-Usage ]
-        				    [ Redirect-Max-Cache-Time ]
-        				  * [ Proxy-Info ]
-        				  * [ AVP ]
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					275, 					/* Code */
-					#if CC_SESSION_TERMINATION != 275
-					#error "CC_SESSION_TERMINATION definition mismatch"
-					#endif
-					"Session-Termination-Answer", 		/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE,	/* Fixed flags */
-							   CMD_FLAG_PROXIABLE	/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Session-Id", 			RULE_FIXED_HEAD, -1, 1 }
- 							,{  "Result-Code", 			RULE_REQUIRED,   -1, 1 }
-						 	,{  "Origin-Host", 			RULE_REQUIRED,   -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED,   -1, 1 }
-							,{  "User-Name",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Class",				RULE_OPTIONAL,   -1,-1 }
-							,{  "Error-Message",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Error-Reporting-Host",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Failed-AVP",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Origin-State-Id",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Redirect-Host",			RULE_OPTIONAL,   -1,-1 }
-							,{  "Redirect-Host-Usage",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Redirect-Max-Cache-Time",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Proxy-Info",			RULE_OPTIONAL,   -1,-1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-		
-		/* Abort-Session-Request */
-		{
-			/*
-				The Abort-Session-Request (ASR), indicated by the Command-Code set to
-				274 and the message flags' 'R' bit set, may be sent by any server to
-				the access device that is providing session service, to request that
-				the session identified by the Session-Id be stopped.
-
-
-        				    Message Format
-
-				 <ASR>  ::= < Diameter Header: 274, REQ, PXY >
-        				    < Session-Id >
-        				    { Origin-Host }
-        				    { Origin-Realm }
-        				    { Destination-Realm }
-        				    { Destination-Host }
-        				    { Auth-Application-Id }
-        				    [ User-Name ]
-        				    [ Origin-State-Id ]
-        				  * [ Proxy-Info ]
-        				  * [ Route-Record ]
-        				  * [ AVP ]
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					274, 					/* Code */
-					#if CC_ABORT_SESSION != 274
-					#error "CC_ABORT_SESSION definition mismatch"
-					#endif
-					"Abort-Session-Request", 		/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_ERROR,	/* Fixed flags */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE	/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Session-Id", 			RULE_FIXED_HEAD, -1, 1 }
-						 	,{  "Origin-Host", 			RULE_REQUIRED,   -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED,   -1, 1 }
-							,{  "Destination-Realm",		RULE_REQUIRED,   -1, 1 }
-							,{  "Destination-Host",			RULE_REQUIRED,   -1, 1 }
-						 	,{  "Auth-Application-Id", 		RULE_REQUIRED,   -1, 1 }
-							,{  "User-Name",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Origin-State-Id",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Proxy-Info",			RULE_OPTIONAL,   -1,-1 }
-							,{  "Route-Record",			RULE_OPTIONAL,   -1,-1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-		
-		/* Abort-Session-Answer */
-		{
-			/*
-				The Abort-Session-Answer (ASA), indicated by the Command-Code set to
-				274 and the message flags' 'R' bit clear, is sent in response to the
-				ASR.  The Result-Code AVP MUST be present, and indicates the
-				disposition of the request.
-
-				If the session identified by Session-Id in the ASR was successfully
-				terminated, Result-Code is set to DIAMETER_SUCCESS.  If the session
-				is not currently active, Result-Code is set to
-				DIAMETER_UNKNOWN_SESSION_ID.  If the access device does not stop the
-				session for any other reason, Result-Code is set to
-				DIAMETER_UNABLE_TO_COMPLY.
-
-        				    Message Format
-
-				 <ASA>  ::= < Diameter Header: 274, PXY >
-        				    < Session-Id >
-        				    { Result-Code }
-        				    { Origin-Host }
-        				    { Origin-Realm }
-        				    [ User-Name ]
-        				    [ Origin-State-Id ]
-        				    [ Error-Message ]
-        				    [ Error-Reporting-Host ]
-        				    [ Failed-AVP ]
-        				  * [ Redirect-Host ]
-        				    [ Redirect-Host-Usage ]
-        				    [ Redirect-Max-Cache-Time ]
-        				  * [ Proxy-Info ]
-        				  * [ AVP ]
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					274, 					/* Code */
-					#if CC_ABORT_SESSION != 274
-					#error "CC_ABORT_SESSION definition mismatch"
-					#endif
-					"Abort-Session-Answer", 		/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE,	/* Fixed flags */
-							   CMD_FLAG_PROXIABLE	/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Session-Id", 			RULE_FIXED_HEAD, -1, 1 }
- 							,{  "Result-Code", 			RULE_REQUIRED,   -1, 1 }
-						 	,{  "Origin-Host", 			RULE_REQUIRED,   -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED,   -1, 1 }
-							,{  "User-Name",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Origin-State-Id",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Error-Message",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Error-Reporting-Host",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Failed-AVP",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Redirect-Host",			RULE_OPTIONAL,   -1,-1 }
-							,{  "Redirect-Host-Usage",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Redirect-Max-Cache-Time",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Proxy-Info",			RULE_OPTIONAL,   -1,-1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-		
-		/* Accounting-Request */
-		{
-			/*
-				The Accounting-Request (ACR) command, indicated by the Command-Code
-				field set to 271 and the Command Flags' 'R' bit set, is sent by a
-				Diameter node, acting as a client, in order to exchange accounting
-				information with a peer.
-
-				One of Acct-Application-Id and Vendor-Specific-Application-Id AVPs
-				MUST be present.  If the Vendor-Specific-Application-Id grouped AVP
-				is present, it MUST include an Acct-Application-Id AVP.
-
-				The AVP listed below SHOULD include service specific accounting AVPs,
-				as described in Section 9.3.
-
-
-				Message Format
-
-				 <ACR> ::= < Diameter Header: 271, REQ, PXY >
-        				   < Session-Id >
-        				   { Origin-Host }
-        				   { Origin-Realm }
-        				   { Destination-Realm }
-        				   { Accounting-Record-Type }
-        				   { Accounting-Record-Number }
-        				   [ Acct-Application-Id ]
-        				   [ Vendor-Specific-Application-Id ]
-        				   [ User-Name ]
-        				   [ Destination-Host ]
-        				   [ Accounting-Sub-Session-Id ]
-        				   [ Acct-Session-Id ]
-        				   [ Acct-Multi-Session-Id ]
-        				   [ Acct-Interim-Interval ]
-        				   [ Accounting-Realtime-Required ]
-        				   [ Origin-State-Id ]
-        				   [ Event-Timestamp ]
-        				 * [ Proxy-Info ]
-        				 * [ Route-Record ]
-        				 * [ AVP ]
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					271, 					/* Code */
-					#if CC_ACCOUNTING != 271
-					#error "CC_ACCOUNTING definition mismatch"
-					#endif
-					"Accounting-Request", 			/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE | CMD_FLAG_ERROR,	/* Fixed flags */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE	/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Session-Id", 			RULE_FIXED_HEAD, -1, 1 }
-						 	,{  "Origin-Host", 			RULE_REQUIRED,   -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED,   -1, 1 }
-							,{  "Destination-Realm",		RULE_REQUIRED,   -1, 1 }
-							,{  "Accounting-Record-Type",		RULE_REQUIRED,   -1, 1 }
-							,{  "Accounting-Record-Number",		RULE_REQUIRED,   -1, 1 }
-							,{  "Acct-Application-Id",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Vendor-Specific-Application-Id",	RULE_OPTIONAL,   -1, 1 }
-							,{  "User-Name",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Destination-Host",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Accounting-Sub-Session-Id",	RULE_OPTIONAL,   -1, 1 }
-							,{  "Acct-Session-Id",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Acct-Multi-Session-Id",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Acct-Interim-Interval",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Accounting-Realtime-Required",	RULE_OPTIONAL,   -1, 1 }
-							,{  "Origin-State-Id",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Event-Timestamp",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Proxy-Info",			RULE_OPTIONAL,   -1,-1 }
-							,{  "Route-Record",			RULE_OPTIONAL,   -1,-1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-		
-		/* Accounting-Answer */
-		{
-			/*
-				The Accounting-Answer (ACA) command, indicated by the Command-Code
-				field set to 271 and the Command Flags' 'R' bit cleared, is used to
-				acknowledge an Accounting-Request command.  The Accounting-Answer
-				command contains the same Session-Id as the corresponding request.
-
-				Only the target Diameter Server, known as the home Diameter Server,
-				SHOULD respond with the Accounting-Answer command.
-
-				One of Acct-Application-Id and Vendor-Specific-Application-Id AVPs
-				MUST be present.  If the Vendor-Specific-Application-Id grouped AVP
-				is present, it MUST contain an Acct-Application-Id AVP.
-
-				The AVP listed below SHOULD include service specific accounting AVPs,
-				as described in Section 9.3.
-
-
-				Message Format
-
-				 <ACA> ::= < Diameter Header: 271, PXY >
-        				   < Session-Id >
-        				   { Result-Code }
-        				   { Origin-Host }
-        				   { Origin-Realm }
-        				   { Accounting-Record-Type }
-        				   { Accounting-Record-Number }
-        				   [ Acct-Application-Id ]
-        				   [ Vendor-Specific-Application-Id ]
-        				   [ User-Name ]
-        				   [ Accounting-Sub-Session-Id ]
-        				   [ Acct-Session-Id ]
-        				   [ Acct-Multi-Session-Id ]
-        				   [ Error-Message ]
-        				   [ Error-Reporting-Host ]
-        				   [ Failed-AVP ]
-        				   [ Acct-Interim-Interval ]
-        				   [ Accounting-Realtime-Required ]
-        				   [ Origin-State-Id ]
-        				   [ Event-Timestamp ]
-        				 * [ Proxy-Info ]
-        				 * [ AVP ]
-			*/
-			struct dict_object * cmd;
-			struct dict_cmd_data data = { 
-					271, 					/* Code */
-					#if CC_ACCOUNTING != 271
-					#error "CC_ACCOUNTING definition mismatch"
-					#endif
-					"Accounting-Answer", 			/* Name */
-					CMD_FLAG_REQUEST | CMD_FLAG_PROXIABLE,	/* Fixed flags */
-							   CMD_FLAG_PROXIABLE	/* Fixed flag values */
-					};
-			struct local_rules_definition rules[] = 
-						{ 	 {  "Session-Id", 			RULE_FIXED_HEAD, -1, 1 }
- 							,{  "Result-Code", 			RULE_REQUIRED,   -1, 1 }
-						 	,{  "Origin-Host", 			RULE_REQUIRED,   -1, 1 }
-							,{  "Origin-Realm",			RULE_REQUIRED,   -1, 1 }
-							,{  "Accounting-Record-Type",		RULE_REQUIRED,   -1, 1 }
-							,{  "Accounting-Record-Number",		RULE_REQUIRED,   -1, 1 }
-							,{  "Acct-Application-Id",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Vendor-Specific-Application-Id",	RULE_OPTIONAL,   -1, 1 }
-							,{  "User-Name",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Accounting-Sub-Session-Id",	RULE_OPTIONAL,   -1, 1 }
-							,{  "Acct-Session-Id",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Acct-Multi-Session-Id",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Error-Message",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Error-Reporting-Host",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Failed-AVP",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Acct-Interim-Interval",		RULE_OPTIONAL,   -1, 1 }
-							,{  "Accounting-Realtime-Required",	RULE_OPTIONAL,   -1, 1 }
-							,{  "Origin-State-Id",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Event-Timestamp",			RULE_OPTIONAL,   -1, 1 }
-							,{  "Proxy-Info",			RULE_OPTIONAL,   -1,-1 }
-						};
-			
-			CHECK_dict_new( DICT_COMMAND, &data , NULL, &cmd);
-			PARSE_loc_rules( rules, cmd );
-		}
-	}
-
-	return 0;
-}