[asterisk-commits] murf: branch murf/bug11210 r99819 - /team/murf/bug11210/channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: murf
Date: Tue Jan 22 23:57:21 2008
New Revision: 99819

URL: http://svn.digium.com/view/asterisk?view=rev&rev=99819
Log:
Remove the noisy ast_log debugs so they don't flood the console when we get audio going on an iax call.

Modified:
    team/murf/bug11210/channels/chan_iax2.c

Change Statistics:
 0 files changed

Modified: team/murf/bug11210/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/channels/chan_iax2.c?view=diff&rev=99819&r1=99818&r2=99819
==============================================================================
--- team/murf/bug11210/channels/chan_iax2.c (original)
+++ team/murf/bug11210/channels/chan_iax2.c Tue Jan 22 23:57:21 2008
@@ -728,7 +728,7 @@
 of elements in 1 & 2 should track the number of open calls... If you want speed, 
 be prepared to pay the price... luckily, this is really not a huge price to 
 pay... (famous last words)... */
-
+#ifdef INC_SHOW_FINDCALLS
 static void show_findcall1(void)
 {
 	struct ao2_iterator i;
@@ -776,6 +776,7 @@
 		ao2_ref(pvt, -1);
 	}
 }
+#endif
 
 static AST_LIST_HEAD_STATIC(firmwares, iax_firmware);
 
@@ -975,6 +976,8 @@
  * defined as MIN_REUSE_TIME, with a default of 60 seconds.
  */
 static struct timeval lastused[IAX_MAX_CALLS];
+
+#ifdef INC_SHOW_FINDCALLS
 static void show_iaxs(void)
 {
 	int x;
@@ -989,6 +992,7 @@
 		ast_mutex_unlock(&iaxsl[x]);
 	}
 }
+#endif
 
 static void iax2_destroy_byptr(void *p2);
 static void iax2_destroy(int callno);
@@ -1758,9 +1762,9 @@
 	if (tmp_pvt_ptr == NULL) {
 		tmp_pvt_ptr = new_iax(NULL, "huh"); /* do this ONCE, and we can use it ever after that for hash lookups */
 	}
+#ifdef OLD_CODE
 	ast_log(LOG_NOTICE,"find_callno called: callno=%d, dcallno=%d, sin=%s/%d, new=%d, sockfd=%d\n",
 			callno, dcallno, ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port), new, sockfd);
-#ifdef OLD_CODE
 	if (new <= NEW_ALLOW) {
 		for (x=1;(res < 1) && (x<maxnontrunkcall);x++) {
 			ast_mutex_lock(&iaxsl[x]);
@@ -1789,9 +1793,9 @@
 		tmp_pvt_ptr->addr.sin_port = sin->sin_port;
 		tmp_pvt_ptr->peercallno = callno;
 		respvt = ao2_t_find(findcall1, tmp_pvt_ptr, OBJ_POINTER, "Find the pvt in the findcall1 table\n");
-		show_iaxs();
-		ast_log(LOG_NOTICE,"first lookup returns %p\n", respvt);
-		show_findcall1();
+		/* show_iaxs();
+		   ast_log(LOG_NOTICE,"first lookup returns %p\n", respvt);
+		   show_findcall1();*/
 		
 		/* keep looking ! */
 		if (respvt)
@@ -1800,8 +1804,8 @@
 			tmp_pvt_ptr->callno = dcallno;
 			tmp_pvt_ptr->peercallno = 0;
 			respvt = ao2_t_find(findcall2, tmp_pvt_ptr, OBJ_POINTER, "Find the pvt in the findcall1 table\n");
-			ast_log(LOG_NOTICE,"second lookup returns %p\n", respvt);
-			show_findcall2();
+			/* ast_log(LOG_NOTICE,"second lookup returns %p\n", respvt);
+			   show_findcall2(); */
 			if (respvt)
 				res = respvt->callno;
 		}
@@ -1810,8 +1814,8 @@
 			tmp_pvt_ptr->transfer.sin_addr.s_addr = sin->sin_addr.s_addr;
 			tmp_pvt_ptr->transfer.sin_port = sin->sin_port;
 			respvt = ao2_t_find(findcall3, tmp_pvt_ptr, OBJ_POINTER, "Find the pvt in the findcall1 table\n");
-			ast_log(LOG_NOTICE,"third lookup returns %p\n", respvt);
-			show_findcall3();
+			/* ast_log(LOG_NOTICE,"third lookup returns %p\n", respvt);
+			   show_findcall3(); */
 			if (respvt)
 				res = respvt->callno;
 		}
@@ -1819,8 +1823,8 @@
 			tmp_pvt_ptr->transfercallno = dcallno;
 			/* transfer should still be in place from the previous test setup */
 			respvt = ao2_t_find(findcall4, tmp_pvt_ptr, OBJ_POINTER, "Find the pvt in the findcall1 table\n");
-			ast_log(LOG_NOTICE,"fourth lookup returns %p\n", respvt);
-			show_findcall4();
+			/* ast_log(LOG_NOTICE,"fourth lookup returns %p\n", respvt);
+			   show_findcall4(); */
 			if (respvt)
 				res = respvt->callno;
 		}
@@ -1850,7 +1854,7 @@
 		iaxs[x] = new_iax(sin, host);
 		update_max_nontrunk();
 		if (iaxs[x]) {
-			ast_log(LOG_NOTICE,"Creating new pvt structure: callid = %d. reason: not found.\n", x);
+			/* ast_log(LOG_NOTICE,"Creating new pvt structure: callid = %d. reason: not found.\n", x); */
 			
 			if (iaxdebug)
 				ast_debug(1, "Creating new call structure %d\n", x);
@@ -8071,7 +8075,6 @@
 	}
 
 	if (!fr->callno) {
-		ast_log(LOG_NOTICE,"Calling find_callno\n");
 		fr->callno = find_callno(ntohs(mh->callno) & ~IAX_FLAG_FULL, dcallno, &sin, new, fd);
 	}