kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 03:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 351504

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.8.2@351518 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2012-01-19 21:21:15 +00:00
parent 73990e5960
commit ac7c47e33c
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.version
View File

@@ -1 +1 @@
1.8.8.1 1.8.8.2

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2012-01-19 Asterisk Development Team <asteriskteam@digium.com>
* Asterisk 1.8.8.2 Released.
* AST-2012-001
2011-12-30 Asterisk Development Team <asteriskteam@digium.com> 2011-12-30 Asterisk Development Team <asteriskteam@digium.com>
* Asterisk 1.8.8.1 Released. * Asterisk 1.8.8.1 Released.

6
channels/chan_sip.c
View File

@@ -28977,6 +28977,12 @@ static int setup_srtp(struct sip_srtp **srtp)
static int process_crypto(struct sip_pvt *p, struct ast_rtp_instance *rtp, struct sip_srtp **srtp, const char *a) static int process_crypto(struct sip_pvt *p, struct ast_rtp_instance *rtp, struct sip_srtp **srtp, const char *a)
{ {
/* If no RTP instance exists for this media stream don't bother processing the crypto line */
if (!rtp) {
ast_debug(3, "Received offer with crypto line for media stream that is not enabled\n");
return FALSE;
}
if (strncasecmp(a, "crypto:", 7)) { if (strncasecmp(a, "crypto:", 7)) {
return FALSE; return FALSE;
} }