From 757ad05187dd996c47c47b556f7753e74ea1c0d0 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 19 Aug 2010 14:46:08 +0000 Subject: [PATCH] Merged revisions 282826 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r282826 | tilghman | 2010-08-19 09:44:51 -0500 (Thu, 19 Aug 2010) | 2 lines Only output debugging if the debug level is on. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282827 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/netsock2.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/main/netsock2.c b/main/netsock2.c index 932ca57c22..99f7eac89d 100644 --- a/main/netsock2.c +++ b/main/netsock2.c @@ -343,7 +343,9 @@ uint16_t _ast_sockaddr_port(const struct ast_sockaddr *addr, const char *file, i addr->len == sizeof(struct sockaddr_in6)) { return ntohs(((struct sockaddr_in6 *)&addr->ss)->sin6_port); } - ast_log(__LOG_DEBUG, file, line, func, "Not an IPv4 nor IPv6 address, cannot get port.\n"); + if (option_debug >= 1) { + ast_log(__LOG_DEBUG, file, line, func, "Not an IPv4 nor IPv6 address, cannot get port.\n"); + } return 0; } @@ -355,7 +357,7 @@ void _ast_sockaddr_set_port(struct ast_sockaddr *addr, uint16_t port, const char } else if (addr->ss.ss_family == AF_INET6 && addr->len == sizeof(struct sockaddr_in6)) { ((struct sockaddr_in6 *)&addr->ss)->sin6_port = htons(port); - } else { + } else if (option_debug >= 1) { ast_log(__LOG_DEBUG, file, line, func, "Not an IPv4 nor IPv6 address, cannot set port.\n"); } @@ -485,7 +487,7 @@ int _ast_sockaddr_to_sin(const struct ast_sockaddr *addr, return 0; } - if (addr->ss.ss_family != AF_INET) { + if (addr->ss.ss_family != AF_INET && option_debug >= 1) { ast_log(__LOG_DEBUG, file, line, func, "Address family is not AF_INET\n"); } @@ -498,7 +500,7 @@ void _ast_sockaddr_from_sin(struct ast_sockaddr *addr, const struct sockaddr_in { memcpy(&addr->ss, sin, sizeof(*sin)); - if (addr->ss.ss_family != AF_INET) { + if (addr->ss.ss_family != AF_INET && option_debug >= 1) { ast_log(__LOG_DEBUG, file, line, func, "Address family is not AF_INET\n"); }