--- a/waaad/message.c	Fri Jul 11 18:27:35 2008 +0900
+++ b/waaad/message.c	Fri Jul 11 18:28:19 2008 +0900
@@ -822,6 +822,16 @@
 	return 0;
 }
 
+/* Resolve dictionary objects for instances, from their data.
+ * When the model is found, the data is interpreted from the avp_source buffer and copied to avp_storage.
+ * When the model is not found, the raw data is copied and saved.
+ * Therefore, after this function has been called, the source buffer can be freed.
+ */
+int msg_parse_dict ( msg_t * msg )
+{
+	TRACE_DEBUG (FULL, "@@@ %s: not implemented yet.", __FUNCTION__ );
+	return ENOTSUP;
+}
 
 
 /***************************************************************************************************************/
@@ -1409,6 +1419,7 @@
 		TRACE_DEBUG(FULL, "Invalid parameter. EINVAL");
 		return EINVAL;
 	}
+	
 	/* Update the length. This also checks that all AVP have their values set */
 	ret = msg_update_length(msg);
 	if (ret != 0) {
@@ -1416,7 +1427,7 @@
 		return ret;
 	}
 	
-	
+#warning "to do..."
 	
 	/* To define if a message is routable, we rely on the "PXY" command flag yet. */
 	if (is_routable) {
@@ -1436,13 +1447,6 @@
 
 
 
-int msg_parse_dict ( msg_t * msg )
-{
-	TRACE_DEBUG (FULL, "@@@ %s: not implemented yet.", __FUNCTION__ );
-	return ENOTSUP;
-}
-
-
 
 
 int msg_avp_getrawdata ( msg_avp_t *avp, char **data )

--- a/waaad/tests/testmesg.c	Fri Jul 11 18:27:35 2008 +0900
+++ b/waaad/tests/testmesg.c	Fri Jul 11 18:28:19 2008 +0900
@@ -552,6 +552,12 @@
 	
 		}
 		
+		/* Test the msg_parse_dict function */
+		{
+			
+			CHECK( 0, msg_parse_dict( msg ) );
+		}
+		
 		/* Now test the msg_parse_rule function */
 		{
 			dict_object_t * rule;