From 5f92aed2ba51c65e035a65bbbdba3ed1d268b893 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Fri, 9 Jul 2010 16:39:16 +0000
Subject: [PATCH] Return logic of sip_debug_test_addr() to its original
functionality.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@275104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d9a97fcfa4..ad6e00ab2c 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2881,7 +2881,24 @@ static int find_sip_method(const char *msg)
/*! \brief See if we pass debug IP filter */
static inline int sip_debug_test_addr(const struct ast_sockaddr *addr)
{
- return sipdebug && !ast_sockaddr_isnull(addr) && !ast_sockaddr_cmp_addr(&debugaddr, addr);
+ /* Can't debug if sipdebug is not enabled */
+ if (!sipdebug) {
+ return 0;
+ }
+
+ /* A null debug_addr means we'll debug any address */
+ if (ast_sockaddr_isnull(&debugaddr)) {
+ return 1;
+ }
+
+ /* If no port was specified for a debug address, just compare the
+ * addresses, otherwise compare the address and port
+ */
+ if (ast_sockaddr_port(&debugaddr)) {
+ return !ast_sockaddr_cmp(&debugaddr, addr);
+ } else {
+ return !ast_sockaddr_cmp_addr(&debugaddr, addr);
+ }
}
/*! \brief The real destination address for a write */
--
GitLab