diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-22 00:59:17 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-22 00:59:17 +0000 |
| commit | a2d9462f4a8cb5e6bfa20c6fe7eb5d46969797f8 (patch) | |
| tree | 833cccdcb9de06a502de4c2c8c4c5e770964f63d /channels/chan_sip.c | |
| parent | ecb2102037809d08837064ff1720f2de2979bbf1 (diff) | |
Merged revisions 56011 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r56011 | russell | 2007-02-21 18:57:36 -0600 (Wed, 21 Feb 2007) | 11 lines
Merged revisions 56010 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r56010 | russell | 2007-02-21 18:53:25 -0600 (Wed, 21 Feb 2007) | 3 lines
If we receive a frame that is not in any of the negotiated formats, then drop
it. (potentially issue #8781 and SPD-12)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@56012 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 4eba133f5..5a3625329 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4424,6 +4424,13 @@ static struct ast_frame *sip_rtp_read(struct ast_channel *ast, struct sip_pvt *p /* We already hold the channel lock */ if (f->frametype == AST_FRAME_VOICE) { if (f->subclass != (p->owner->nativeformats & AST_FORMAT_AUDIO_MASK)) { + if (!(f->subclass & p->jointcapability)) { + if (option_debug) { + ast_log(LOG_DEBUG, "Bogus frame of format '%s' received from '%s'!\n", + ast_getformatname(f->subclass), p->owner->name); + } + return &ast_null_frame; + } if (option_debug) ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass); p->owner->nativeformats = (p->owner->nativeformats & (AST_FORMAT_VIDEO_MASK | AST_FORMAT_TEXT_MASK)) | f->subclass; |