diff options
| author | David Vossel <dvossel@digium.com> | 2011-04-18 13:42:51 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2011-04-18 13:42:51 +0000 |
| commit | 4b4549106bd1c6d699468c5d9863ffde7ba590d1 (patch) | |
| tree | 2922b8393827d1cd34fd1ddb703fb8d26cb49c50 /include/asterisk/rtp_engine.h | |
| parent | 6b01eb3324f8ffcaba3c9c4cc30c8c5de60bd413 (diff) | |
Merged revisions 314017 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r314017 | dvossel | 2011-04-18 08:41:06 -0500 (Mon, 18 Apr 2011) | 17 lines
sip codec negotiation of dynamic rtp payloads error fix
This patch fixes how chan_sip handles dynamic rtp payload types
it does not understand. At the moment if a dynamic payload's mime
type does not match one we understand, the payload does not get
removed from our payload table. As a result of this, the payload
is set to whatever dynamic codec we use internally for that payload
number on outgoing INVITES. This is incorrect.
This patch fixes this by properly checking the rtpmap set function's
return code to make sure it was found. The function can return both
-1 and -2 depending on the source of the mismatch. We were just
checking -1 explicitly.
Review: https://reviewboard.asterisk.org/r/1169/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@314018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/rtp_engine.h')
| -rw-r--r-- | include/asterisk/rtp_engine.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asterisk/rtp_engine.h b/include/asterisk/rtp_engine.h index 4c5753e84..f8bf74931 100644 --- a/include/asterisk/rtp_engine.h +++ b/include/asterisk/rtp_engine.h @@ -968,7 +968,8 @@ void ast_rtp_codecs_payloads_set_m_type(struct ast_rtp_codecs *codecs, struct as * \param options Optional options that may change the behavior of this specific payload * * \retval 0 success - * \retval -1 failure + * \retval -1 failure, invalid payload numbe + * \retval -2 failure, unknown mimetype * * Example usage: * |