From d600998f7e3d8ece1fca5f390675d6c0c61ca4e3 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 5 Oct 2004 02:13:00 +0000 Subject: [PATCH] make SIP_CODEC behave as it suggests (bug #2566) Correction: The last commit for cdr_odbc.c was actually bug #2569. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@3913 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 4bca746552..6443b7d5a3 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1851,7 +1851,11 @@ static int sip_answer(struct ast_channel *ast) fmt=ast_getformatbyname(codec); if (fmt) { ast_log(LOG_NOTICE, "Changing codec to '%s' for this call because of ${SIP_CODEC) variable\n",codec); - p->jointcapability=fmt; + if (p->jointcapability & fmt) { + p->jointcapability &= fmt; + p->capability &= fmt; + } else + ast_log(LOG_NOTICE, "Ignoring ${SIP_CODEC} variable because it is not shared by both ends.\n"); } else ast_log(LOG_NOTICE, "Ignoring ${SIP_CODEC} variable because of unrecognized/not configured codec (check allow/disallow in sip.conf): %s\n",codec); }