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

diff --git a/main/netsock2.c b/main/netsock2.c
index 932ca57..99f7eac 100644 (file)
--- 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");
        }