Index: extensions/app_radgw/rgw_clients.c
===================================================================
--- extensions/app_radgw/rgw_clients.c	(revision 1107)
+++ extensions/app_radgw/rgw_clients.c	(revision 1119)
@@ -976,7 +976,6 @@
 		char sa_buf[sSA_DUMP_STRLEN];
 		client = (struct rgw_client *)ref;
-		/* TODO: use a fct param instead of hardcoded FD_LOG_DEBUG */
-		TODO("Replace with appropriate code");
-/*		TRACE_sSA(FD_LOG_DEBUG, NONE, 	 "  - ", client->sa, NI_NUMERICHOST | NI_NUMERICSERV, (client->type == RGW_CLI_NAS) ? "" : " [PROXY]" ); */
+		fd_sa_sdump_numeric(sa_buf, client->sa);
+		LOG_D("  - %s%s", sa_buf, (client->type == RGW_CLI_NAS) ? "" : " [PROXY]" );
 	}
 }
Index: extensions/app_radgw/rgwx_acct.c
===================================================================
--- extensions/app_radgw/rgwx_acct.c	(revision 1105)
+++ extensions/app_radgw/rgwx_acct.c	(revision 1119)
@@ -1220,6 +1220,9 @@
 out:
 	if (answer && *answer) {
-		TRACE_DEBUG(INFO, "Received the following problematic STA message, discarding anyway...");
-		fd_msg_dump_walk( INFO, *answer );
+		char * buf = NULL; size_t buflen;
+		CHECK_MALLOC_DO( fd_msg_dump_treeview(&buf, &buflen, NULL, *answer, NULL, 0, 1), );
+		TRACE_DEBUG(INFO, "Received the following problematic STA message, discarding anyway: %s", buf ?: "<error>");
+		free(buf);
+		
 		fd_msg_free(*answer);
 		*answer = NULL;
Index: extensions/app_radgw/rgwx_auth.c
===================================================================
--- extensions/app_radgw/rgwx_auth.c	(revision 1088)
+++ extensions/app_radgw/rgwx_auth.c	(revision 1119)
@@ -126,5 +126,5 @@
 
 struct sess_state {
-	char req_auth[16];
+	uint8_t req_auth[16];
 };
 
Index: extensions/app_radgw/rgwx_debug.c
===================================================================
--- extensions/app_radgw/rgwx_debug.c	(revision 996)
+++ extensions/app_radgw/rgwx_debug.c	(revision 1119)
@@ -95,6 +95,8 @@
 		fd_log_debug(" Diameter message: NULL pointer");
 	} else {
-		fd_log_debug(" Diameter message (%p) DUMP:", *diam_fw);
-		fd_msg_dump_walk(0, *diam_fw);
+		char * buf = NULL; size_t buflen;
+		CHECK_MALLOC( fd_msg_dump_treeview(&buf, &buflen, NULL, *diam_fw, NULL, 0, 1) );
+		fd_log_debug(" Diameter message (%p) DUMP: %s", *diam_fw, buf);
+		free(buf);
 	}
 	
@@ -114,6 +116,8 @@
 		fd_log_debug(" Diameter message: NULL pointer");
 	} else {
-		fd_log_debug(" Diameter message (%p) DUMP:", *diam_ans);
-		fd_msg_dump_walk(0, *diam_ans);
+		char * buf = NULL; size_t buflen;
+		CHECK_MALLOC( fd_msg_dump_treeview(&buf, &buflen, NULL, *diam_ans, NULL, 0, 1) );
+		fd_log_debug(" Diameter message (%p) DUMP: %s", *diam_ans, buf);
+		free(buf);
 	}
 	
Index: extensions/app_radgw/rgwx_echodrop.c
===================================================================
--- extensions/app_radgw/rgwx_echodrop.c	(revision 1088)
+++ extensions/app_radgw/rgwx_echodrop.c	(revision 1119)
@@ -62,4 +62,5 @@
 		CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL);
 	}
+	return *buf;
 }
 
Index: extensions/app_radgw/rgwx_sip.c
===================================================================
--- extensions/app_radgw/rgwx_sip.c	(revision 1088)
+++ extensions/app_radgw/rgwx_sip.c	(revision 1119)
@@ -723,5 +723,4 @@
 	struct avp_hdr *ahdr;
 	//char buf[254]; /* to store some attributes values (with final '\0') */
-	unsigned char * req_sip = NULL;
 	struct session * sess;
 	os0_t sid = NULL;
Index: extensions/app_sip/locationinfo.c
===================================================================
--- extensions/app_sip/locationinfo.c	(revision 639)
+++ extensions/app_sip/locationinfo.c	(revision 1119)
@@ -201,8 +201,4 @@
 	CHECK_FCT( fd_msg_rescode_set( ans, result, NULL, NULL, 1 ) );
 	
-	//DEBUG
-	fd_msg_dump_walk(INFO,qry);
-	fd_msg_dump_walk(INFO,ans);
-	
 	CHECK_FCT( fd_msg_send( msg, NULL, NULL ));
 	
Index: extensions/dbg_interactive/dbg_interactive.i
===================================================================
--- extensions/dbg_interactive/dbg_interactive.i	(revision 1021)
+++ extensions/dbg_interactive/dbg_interactive.i	(revision 1119)
@@ -152,4 +152,15 @@
 /* Forward declaration for the peers module */
 static void fd_add_cb(struct peer_info *peer, void *data);
+
+/* This one gives problems when included from the header file */
+void fd_log_va( int, const char *, va_list);
+void fd_log_deprecated( int level, const char *format, ... ) MARK_DEPRECATED
+{ 
+	va_list ap;
+	va_start(ap, format);
+	fd_log_va(level, format, ap);
+	va_end(ap);
+}
+
 %}
 
Index: extensions/dbg_interactive/endpoints.i
===================================================================
--- extensions/dbg_interactive/endpoints.i	(revision 1088)
+++ extensions/dbg_interactive/endpoints.i	(revision 1113)
@@ -128,5 +128,5 @@
 		char * buf = NULL;
 		size_t len;
-		printf("%s", fd_ep_dump_one(&buf, &len, NULL, $self));
+		printf("%s", fd_ep_dump_one(&buf, &len, NULL, 1, $self));
 		free(buf);
 	}
Index: extensions/dbg_monitor/dbg_monitor.c
===================================================================
--- extensions/dbg_monitor/dbg_monitor.c	(revision 1088)
+++ extensions/dbg_monitor/dbg_monitor.c	(revision 1113)
@@ -126,5 +126,5 @@
 		
 		TRACE_DEBUG(INFO, "[dbg_monitor] Dumping servers information");
-		TRACE_DEBUG(INFO, "%s", fd_servers_dump(&buf, &len, NULL));
+		TRACE_DEBUG(INFO, "%s", fd_servers_dump(&buf, &len, NULL, 1));
 		
 		sleep(1);
Index: extensions/dbg_rt/dbg_rt.c
===================================================================
--- extensions/dbg_rt/dbg_rt.c	(revision 974)
+++ extensions/dbg_rt/dbg_rt.c	(revision 1119)
@@ -46,10 +46,13 @@
 static int dbgrt_fwd_cb(void * cbdata, struct msg ** msg)
 {
+	char * buf = NULL; size_t buflen;
 	TRACE_ENTRY("%p %p", cbdata, msg);
 	
-	fd_log_debug("[dbg_rt] FWD routing message: %p", msg ? *msg : NULL);
-	if (msg)
-		fd_msg_dump_walk(INFO, *msg);
-	
+	LOG_D("[dbg_rt] FWD routing message: %p", msg ? *msg : NULL);
+	if (msg) {
+		CHECK_MALLOC( fd_msg_dump_treeview(&buf, &buflen, NULL, *msg, NULL, 0, 1) );
+		LOG_D("%s", buf);
+	}
+	free(buf);
 	return 0;
 }
@@ -59,14 +62,16 @@
 {
 	struct fd_list * li;
+	char * buf = NULL; size_t buflen;
 	
 	TRACE_ENTRY("%p %p %p", cbdata, msg, candidates);
 	
-	fd_log_debug("[dbg_rt] OUT routing message: %p", msg);
-	fd_msg_dump_walk(INFO, msg);
-	fd_log_debug("[dbg_rt] Current list of candidates (%p): (score - id)", msg);
+	LOG_D("[dbg_rt] OUT routing message: %p", msg);
+	CHECK_MALLOC( fd_msg_dump_treeview(&buf, &buflen, NULL, msg, NULL, 0, 1) );
+	LOG_D("%s", buf);
+	LOG_D("[dbg_rt] Current list of candidates (%p): (score - id)", msg);
 	
 	for (li = candidates->next; li != candidates; li = li->next) {
 		struct rtd_candidate *c = (struct rtd_candidate *) li;
-		fd_log_debug("[dbg_rt]   %d -\t%s", c->score, c->diamid);
+		LOG_D("[dbg_rt]   %d -\t%s", c->score, c->diamid);
 	}
 	
Index: extensions/test_sip/locationinfo.c
===================================================================
--- extensions/test_sip/locationinfo.c	(revision 924)
+++ extensions/test_sip/locationinfo.c	(revision 1119)
@@ -111,5 +111,4 @@
 	}
 	
-	fd_msg_dump_walk(INFO,message);
 	CHECK_FCT( fd_msg_send( &message, NULL, NULL ));
 	
Index: extensions/test_sip/locationinfosl.c
===================================================================
--- extensions/test_sip/locationinfosl.c	(revision 924)
+++ extensions/test_sip/locationinfosl.c	(revision 1119)
@@ -113,5 +113,4 @@
 	}
 	
-	fd_msg_dump_walk(INFO,message);
 	CHECK_FCT( fd_msg_send( &message, NULL, NULL ));
 	
Index: extensions/test_sip/serverassignment.c
===================================================================
--- extensions/test_sip/serverassignment.c	(revision 924)
+++ extensions/test_sip/serverassignment.c	(revision 1119)
@@ -154,5 +154,4 @@
 	}
 	
-	fd_msg_dump_walk(INFO,message);
 	CHECK_FCT( fd_msg_send( &message, NULL, NULL ));
 	
Index: extensions/test_sip/userauthorization.c
===================================================================
--- extensions/test_sip/userauthorization.c	(revision 924)
+++ extensions/test_sip/userauthorization.c	(revision 1119)
@@ -145,5 +145,4 @@
 	}
 	
-	fd_msg_dump_walk(INFO,message);
 	CHECK_FCT( fd_msg_send( &message, NULL, NULL ));
 	
