[asterisk-commits] twilson: trunk r280226 - in /trunk: ./ res/res_rtp_asterisk.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jul 28 14:37:48 CDT 2010
Author: twilson
Date: Wed Jul 28 14:37:45 2010
New Revision: 280226
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280226
Log:
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
........
Modified:
trunk/ (props changed)
trunk/res/res_rtp_asterisk.c
Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Wed Jul 28 14:37:45 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279636-279815,279817,279850,279887,279916,279949,279953,280023,280058,280090,280161,280195
+/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279636-279815,279817,279850,279887,279916,279949,279953,280023,280058,280090,280161,280195,280225
Modified: trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=280226&r1=280225&r2=280226
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Wed Jul 28 14:37:45 2010
@@ -301,7 +301,7 @@
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 @@
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)
More information about the asterisk-commits
mailing list