bug #8076 check option_debug before printing to debug channel.

patch provided in bugnote, with minor changes.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44253 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 23 insertions, 14 deletions

diff --git a/main/udptl.c b/main/udptl.c
index 72f316f7e..1e0e518cc 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -664,13 +664,15 @@ struct ast_frame *ast_udptl_read(struct ast_udptl *udptl)
 		if ((udptl->them.sin_addr.s_addr != sin.sin_addr.s_addr) ||
 			(udptl->them.sin_port != sin.sin_port)) {
 			memcpy(&udptl->them, &sin, sizeof(udptl->them));
-			ast_log(LOG_DEBUG, "UDPTL NAT: Using address %s:%d\n", ast_inet_ntoa(udptl->them.sin_addr), ntohs(udptl->them.sin_port));
+			if (option_debug)
+				ast_log(LOG_DEBUG, "UDPTL NAT: Using address %s:%d\n", ast_inet_ntoa(udptl->them.sin_addr), ntohs(udptl->them.sin_port));
 		}
 	}
 
 	if (udptl_debug_test_addr(&sin)) {
-		ast_verbose("Got UDPTL packet from %s:%d (type %d, seq %d, len %d)\n",
-			ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), 0, seqno, res);
+		if (option_verbose)
+			ast_verbose("Got UDPTL packet from %s:%d (type %d, seq %d, len %d)\n",
+				ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), 0, seqno, res);
 	}
 #if 0
 	printf("Got UDPTL packet from %s:%d (seq %d, len = %d)\n", ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), seqno, res);
@@ -1035,7 +1037,8 @@ int ast_udptl_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags,
 		if ((c0->tech_pvt != pvt0) ||
 			(c1->tech_pvt != pvt1) ||
 			(c0->masq || c0->masqr || c1->masq || c1->masqr)) {
-				ast_log(LOG_DEBUG, "Oooh, something is weird, backing out\n");
+				if (option_debug)
+					ast_log(LOG_DEBUG, "Oooh, something is weird, backing out\n");
 				/* Tell it to try again later */
 				return -3;
 		}
@@ -1043,22 +1046,27 @@ int ast_udptl_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags,
 		ast_udptl_get_peer(p1, &t1);
 		ast_udptl_get_peer(p0, &t0);
 		if (inaddrcmp(&t1, &ac1)) {
-			ast_log(LOG_DEBUG, "Oooh, '%s' changed end address to %s:%d\n", 
-				c1->name, ast_inet_ntoa(t1.sin_addr), ntohs(t1.sin_port));
-			ast_log(LOG_DEBUG, "Oooh, '%s' was %s:%d\n", 
-				c1->name, ast_inet_ntoa(ac1.sin_addr), ntohs(ac1.sin_port));
+			if (option_debug) {
+				ast_log(LOG_DEBUG, "Oooh, '%s' changed end address to %s:%d\n", 
+					c1->name, ast_inet_ntoa(t1.sin_addr), ntohs(t1.sin_port));
+				ast_log(LOG_DEBUG, "Oooh, '%s' was %s:%d\n", 
+					c1->name, ast_inet_ntoa(ac1.sin_addr), ntohs(ac1.sin_port));
+			}
 			memcpy(&ac1, &t1, sizeof(ac1));
 		}
 		if (inaddrcmp(&t0, &ac0)) {
-			ast_log(LOG_DEBUG, "Oooh, '%s' changed end address to %s:%d\n", 
-				c0->name, ast_inet_ntoa(t0.sin_addr), ntohs(t0.sin_port));
-			ast_log(LOG_DEBUG, "Oooh, '%s' was %s:%d\n", 
-				c0->name, ast_inet_ntoa(ac0.sin_addr), ntohs(ac0.sin_port));
+			if (option_debug) {
+				ast_log(LOG_DEBUG, "Oooh, '%s' changed end address to %s:%d\n", 
+					c0->name, ast_inet_ntoa(t0.sin_addr), ntohs(t0.sin_port));
+				ast_log(LOG_DEBUG, "Oooh, '%s' was %s:%d\n", 
+					c0->name, ast_inet_ntoa(ac0.sin_addr), ntohs(ac0.sin_port));
+			}
 			memcpy(&ac0, &t0, sizeof(ac0));
 		}
 		who = ast_waitfor_n(cs, 2, &to);
 		if (!who) {
-			ast_log(LOG_DEBUG, "Ooh, empty read...\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG, "Ooh, empty read...\n");
 			/* check for hangup / whentohangup */
 			if (ast_check_hangup(c0) || ast_check_hangup(c1))
 				break;
@@ -1068,7 +1076,8 @@ int ast_udptl_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags,
 		if (!f) {
 			*fo = f;
 			*rc = who;
-			ast_log(LOG_DEBUG, "Oooh, got a %s\n", f ? "digit" : "hangup");
+			if (option_debug)
+				ast_log(LOG_DEBUG, "Oooh, got a %s\n", f ? "digit" : "hangup");
 			/* That's all we needed */
 			return 0;
 		} else {