Merged revisions 46937 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46937 | kpfleming | 2006-11-02 10:45:32 -0600 (Thu, 02 Nov 2006) | 2 lines

don't send INVITE when we have determined that we can't offer any audio formats due to lack of trancoding support (or incorrect configuration)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46938 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index eca85c4f32a77ad13ae06dcf8e17fc4145ed7462..f8b3a189689ea1ffd1c41c5eeb0a34681413325b 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6096,6 +6096,12 @@ static int add_sdp(struct sip_request *resp, struct sip_pvt *p)
        /* Ok, let's start working with codec selection here */
        capability = ast_translate_available_formats(p->jointcapability, p->prefcodec);
 
+       /* If there are no audio formats left to offer, punt */
+       if (!(capability & AST_FORMAT_AUDIO_MASK)) {
+               ast_log(LOG_WARNING, "No audio format found to offer.\n");
+               return -1;
+       }
+
        if (option_debug > 1) {
                char codecbuf[BUFSIZ];
                ast_log(LOG_DEBUG, "** Our capability: %s Video flag: %s\n", ast_getformatname_multiple(codecbuf, sizeof(codecbuf), capability), ast_test_flag(&p->flags[0], SIP_NOVIDEO) ? "True" : "False");