From 83bc9d366d7e8eb78d6935baaab482c34f2c2658 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Fri, 5 Jun 2015 11:43:35 -0500 Subject: pjsip_resolver.c: Fix debug code to only execute at acceptable debug level. Change-Id: I1716c93d6e097ad28128ecb9e806aac7a4180c8a --- res/res_pjsip/pjsip_resolver.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'res') diff --git a/res/res_pjsip/pjsip_resolver.c b/res/res_pjsip/pjsip_resolver.c index e4cc51af1..4573e4ce1 100644 --- a/res/res_pjsip/pjsip_resolver.c +++ b/res/res_pjsip/pjsip_resolver.c @@ -155,10 +155,9 @@ static int sip_resolve_add(struct sip_resolve *resolve, const char *name, int rr if (!resolve->queries) { resolve->queries = ast_dns_query_set_create(); - } - - if (!resolve->queries) { - return -1; + if (!resolve->queries) { + return -1; + } } if (!port) { @@ -186,15 +185,18 @@ static int sip_resolve_add(struct sip_resolve *resolve, const char *name, int rr static int sip_resolve_invoke_user_callback(void *data) { struct sip_resolve *resolve = data; - int idx; - for (idx = 0; idx < resolve->addresses.count; ++idx) { + if (DEBUG_ATLEAST(2)) { /* This includes space for the IP address, [, ], :, and the port */ char addr[PJ_INET6_ADDRSTRLEN + 10]; + int idx; - ast_debug(2, "[%p] Address '%d' is %s with transport '%s'\n", - resolve, idx, pj_sockaddr_print(&resolve->addresses.entry[idx].addr, addr, sizeof(addr), 3), - pjsip_transport_get_type_name(resolve->addresses.entry[idx].type)); + for (idx = 0; idx < resolve->addresses.count; ++idx) { + pj_sockaddr_print(&resolve->addresses.entry[idx].addr, addr, sizeof(addr), 3); + ast_log(LOG_DEBUG, "[%p] Address '%d' is %s with transport '%s'\n", + resolve, idx, addr, + pjsip_transport_get_type_name(resolve->addresses.entry[idx].type)); + } } ast_debug(2, "[%p] Invoking user callback with '%d' addresses\n", resolve, resolve->addresses.count); -- cgit v1.2.3