kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-19 09:55:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Issue #6576 - SIP_CODEC not used for early media (reported by gpapadop73)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@12477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2006-03-09 17:00:36 +00:00
parent 3388661f38
commit 8545a6d4c0
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+26 -15
View File
@@ -2483,12 +2483,34 @@ static int sip_hangup(struct ast_channel *ast)
return 0;
}
/*! \brief Try setting codec suggested by the SIP_CODEC channel variable */
static void try_suggested_sip_codec(struct sip_pvt *p)
{
int fmt;
char *codec;
codec = pbx_builtin_getvar_helper(p->owner, "SIP_CODEC");
if (!codec)
return;
fmt = ast_getformatbyname(codec);
if (fmt) {
ast_log(LOG_NOTICE, "Changing codec to '%s' for this call because of ${SIP_CODEC) variable\n",codec);
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);
return;
}
/*! \brief sip_answer: Answer SIP call , send 200 OK on Invite
* Part of PBX interface */
static int sip_answer(struct ast_channel *ast)
{
int res = 0,fmt;
char *codec;
int res = 0;
struct sip_pvt *p = ast->tech_pvt;
ast_mutex_lock(&p->lock);
@@ -2496,19 +2518,7 @@ static int sip_answer(struct ast_channel *ast)
#ifdef OSP_SUPPORT
time(&p->ospstart);
#endif
codec=pbx_builtin_getvar_helper(p->owner,"SIP_CODEC");
if (codec) {
fmt=ast_getformatbyname(codec);
if (fmt) {
ast_log(LOG_NOTICE, "Changing codec to '%s' for this call because of ${SIP_CODEC) variable\n",codec);
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);
}
try_suggested_sip_codec(p);
ast_setstate(ast, AST_STATE_UP);
if (option_debug)
@@ -4514,6 +4524,7 @@ static int transmit_response_with_sdp(struct sip_pvt *p, char *msg, struct sip_r
respprep(&resp, p, msg, req);
if (p->rtp) {
ast_rtp_offered_from_local(p->rtp, 0);
try_suggested_sip_codec(p);
add_sdp(&resp, p);
} else {
ast_log(LOG_ERROR, "Can't add SDP to response, since we have no RTP session allocated. Call-ID %s\n", p->callid);