From: Mark Michelson Date: Wed, 5 May 2010 18:28:05 +0000 (+0000) Subject: Prevent unnecessary warnings when getting rtpsource or rtpdest. X-Git-Tag: 11.0.0-beta1~3076 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6ea125e7c1937154148c972cbe1c42f498a77df;p=thirdparty%2Fasterisk.git Prevent unnecessary warnings when getting rtpsource or rtpdest. If a recognized media type was present, but the media type was not enabled for the channel, then a warning would be emitted. For instance, attempting to get CHANNEL(rtpsource,video) on a call with no video would cause a warning message to appear. With this change, the warning will only appear if the stream argument is not recognized as being a media type that can be specified. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@261313 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/sip/dialplan_functions.c b/channels/sip/dialplan_functions.c index 509eacf314..bbc846fe92 100644 --- a/channels/sip/dialplan_functions.c +++ b/channels/sip/dialplan_functions.c @@ -91,8 +91,9 @@ int sip_acf_channel_read(struct ast_channel *chan, const char *funcname, char *p else return -1; + /* Return 0 to suppress a console warning message */ if (!stream) { - return -1; + return 0; } ast_rtp_instance_get_remote_address(stream, &sin); @@ -113,8 +114,9 @@ int sip_acf_channel_read(struct ast_channel *chan, const char *funcname, char *p else return -1; + /* Return 0 to suppress a console warning message */ if (!stream) { - return -1; + return 0; } ast_rtp_instance_get_local_address(stream, &sin);