From: Terry Wilson Date: Wed, 28 Jul 2010 19:37:45 +0000 (+0000) Subject: Merged revisions 280225 via svnmerge from X-Git-Tag: 11.0.0-beta1~2529 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d4a91f0621ec2a00933c19abf41d197691d2851;p=thirdparty%2Fasterisk.git Merged revisions 280225 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r280225 | twilson | 2010-07-28 12:34:42 -0700 (Wed, 28 Jul 2010) | 3 lines Do rtp/rtcp debugging when it is turned on w/o filtering ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280226 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 09c5e6ba44..396aed5339 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -301,7 +301,7 @@ static inline int rtp_debug_test_addr(struct ast_sockaddr *addr) return 0; } - return ast_sockaddr_cmp(&rtpdebugaddr, addr) == 0; + return ast_sockaddr_isnull(&rtpdebugaddr) ? 1 : ast_sockaddr_cmp(&rtpdebugaddr, addr) == 0; } static inline int rtcp_debug_test_addr(struct ast_sockaddr *addr) @@ -310,7 +310,7 @@ static inline int rtcp_debug_test_addr(struct ast_sockaddr *addr) return 0; } - return ast_sockaddr_cmp(&rtcpdebugaddr, addr) == 0; + return ast_sockaddr_isnull(&rtcpdebugaddr) ? 1 : ast_sockaddr_cmp(&rtcpdebugaddr, addr) == 0; } static int __rtp_recvfrom(struct ast_rtp_instance *instance, void *buf, size_t size, int flags, struct ast_sockaddr *sa, int rtcp)