# HG changeset patch
# User Sebastien Decugis <sdecugis@freediameter.net>
# Date 1371115814 -28800
# Node ID 8c4dd4b693c696c4acb25b5e28d55a31ae8abceb
# Parent  823829bf1037e15900ae22bdc0e0b4e140e6adb6
Some cleanups in the traces

diff -r 823829bf1037 -r 8c4dd4b693c6 extensions/test_app/test_app.c
--- a/extensions/test_app/test_app.c	Tue Jun 11 17:53:35 2013 +0800
+++ b/extensions/test_app/test_app.c	Thu Jun 13 17:30:14 2013 +0800
@@ -179,7 +179,7 @@
 	
 	if (ta_conf->mode & MODE_BENCH) {
 		/* Register an empty hook to disable the default handling */
-		CHECK_FCT( fd_hook_register( (1<<HOOK_LAST) - 1, 
+		CHECK_FCT( fd_hook_register( HOOK_MASK( HOOK_DATA_RECEIVED, HOOK_MESSAGE_RECEIVED, HOOK_MESSAGE_LOCAL, HOOK_MESSAGE_SENT, HOOK_MESSAGE_FAILOVER, HOOK_MESSAGE_ROUTING_FORWARD, HOOK_MESSAGE_ROUTING_LOCAL ), 
 					ta_hook_cb, NULL, NULL, &hookhdl) );
 		
 	}
diff -r 823829bf1037 -r 8c4dd4b693c6 libfdcore/cnxctx.c
--- a/libfdcore/cnxctx.c	Tue Jun 11 17:53:35 2013 +0800
+++ b/libfdcore/cnxctx.c	Thu Jun 13 17:30:14 2013 +0800
@@ -292,11 +292,13 @@
 	
 	fd_sa_sdump_numeric(sa_buf, sa);
 	
+	LOG_D("Connecting to TCP %s...", sa_buf);
+	
 	/* Create the socket and connect, which can take some time and/or fail */
 	{
 		int ret = fd_tcp_client( &sock, sa, addrlen );
 		if (ret != 0) {
-			LOG_A("TCP connection to %s failed: %s", sa_buf, strerror(ret));
+			LOG_D("TCP connection to %s failed: %s", sa_buf, strerror(ret));
 			return NULL;
 		}
 	}
@@ -347,10 +349,12 @@
 	
 	fd_sa_sdump_numeric(sa_buf, &((struct fd_endpoint *)(list->next))->sa);
 	
+	LOG_D("Connecting to SCTP %s:%hu...", sa_buf, port);
+	
 	{
 		int ret = fd_sctp_client( &sock, no_ip6, port, list );
 		if (ret != 0) {
-			LOG_A("SCTP connection to [%s,...] failed: %s", sa_buf, strerror(ret));
+			LOG_D("SCTP connection to [%s,...] failed: %s", sa_buf, strerror(ret));
 			return NULL;
 		}
 	}
diff -r 823829bf1037 -r 8c4dd4b693c6 libfdcore/p_cnx.c
--- a/libfdcore/p_cnx.c	Tue Jun 11 17:53:35 2013 +0800
+++ b/libfdcore/p_cnx.c	Thu Jun 13 17:30:14 2013 +0800
@@ -77,6 +77,7 @@
 	
 	uint16_t	port_no; /* network order */
 	int		dotls_immediate;
+	int count = 0;
 	
 	TRACE_ENTRY("%p", peer);
 	 
@@ -183,6 +184,7 @@
 			} else {
 				fd_list_insert_before(&peer->p_connparams, &new->chain);
 			}
+			count++;
 		}
 	}
 	
@@ -205,9 +207,12 @@
 		} else {
 			fd_list_insert_after(&peer->p_connparams, &new->chain); /* very first position */
 		}
+		count++;
 	}
 #endif /* DISABLE_SCTP */
 	
+	LOG_D("Prepared %d sets of connection parameters to peer %s", count, peer->p_hdr.info.pi_diamid);
+	
 	return 0;
 }
 
diff -r 823829bf1037 -r 8c4dd4b693c6 libfdcore/p_psm.c
--- a/libfdcore/p_psm.c	Tue Jun 11 17:53:35 2013 +0800
+++ b/libfdcore/p_psm.c	Thu Jun 13 17:30:14 2013 +0800
@@ -813,7 +813,6 @@
 				break;
 				
 			case STATE_WAITCNXACK:
-				LOG_D("%s: Connection attempt failed", peer->p_hdr.info.pi_diamid);
 				/* Go back to CLOSE */
 				fd_psm_next_timeout(peer, 1, peer->p_hdr.info.config.pic_tctimer ?: fd_g_config->cnf_timer_tc);
 				goto psm_reset;
diff -r 823829bf1037 -r 8c4dd4b693c6 libfdcore/sctp.c
--- a/libfdcore/sctp.c	Tue Jun 11 17:53:35 2013 +0800
+++ b/libfdcore/sctp.c	Thu Jun 13 17:30:14 2013 +0800
@@ -935,18 +935,9 @@
 	pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
 	
 	if (ret < 0) {
-		int lvl;
-		switch (ret = errno) {
-			case ECONNREFUSED:
-			
-				/* "Normal" errors */
-				lvl = FULL;
-				break;
-			default:
-				lvl = INFO;
-		}
+		ret = errno;
 		/* Some errors are expected, we log at different level */
-		TRACE_DEBUG( lvl, "sctp_connectx returned an error: %s", strerror(ret));
+		LOG_A("sctp_connectx returned an error: %s", strerror(ret));
 		goto out;
 	}
 	
diff -r 823829bf1037 -r 8c4dd4b693c6 libfdcore/tcp.c
--- a/libfdcore/tcp.c	Tue Jun 11 17:53:35 2013 +0800
+++ b/libfdcore/tcp.c	Thu Jun 13 17:30:14 2013 +0800
@@ -123,7 +123,6 @@
 {
 	int ret = 0;
 	int s;
-	char * buf = NULL; size_t len = 0;
 	
 	TRACE_ENTRY("%p %p %d", sock, sa, salen);
 	CHECK_PARAMS( sock && (*sock <= 0) && sa && salen );
@@ -137,27 +136,14 @@
 	/* Cleanup if we are cancelled */
 	pthread_cleanup_push(fd_cleanup_socket, &s);
 	
-	LOG_D( "Attempting TCP connection to %s...", fd_sa_dump(&buf, &len, NULL, sa, NI_NUMERICHOST | NI_NUMERICSERV)?:"<error>" );
-	free(buf);
-	
 	/* Try connecting to the remote address */
 	ret = connect(s, sa, salen);
 	
 	pthread_cleanup_pop(0);
 	
 	if (ret < 0) {
-		int lvl;
-		switch (ret = errno) {
-			case ECONNREFUSED:
-			
-				/* "Normal" errors */
-				lvl = FULL;
-				break;
-			default:
-				lvl = INFO;
-		}
-		/* Some errors are expected, we log at different level */
-		TRACE_DEBUG( lvl, "connect returned an error: %s", strerror(ret));
+		ret = errno;
+		LOG_A( "connect returned an error: %s", strerror(ret));
 		CHECK_SYS_DO( close(s), /* continue */ );
 		*sock = -1;
 		return ret;