mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-03 19:16:46 +00:00
revert yesterday's temporary fix for issue #6052
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@9953 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
13
rtp.c
13
rtp.c
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Asterisk -- An open source telephony toolkit.
|
* Asterisk -- An open source telephony toolkit.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1999 - 2006, Digium, Inc.
|
* Copyright (C) 1999 - 2005, Digium, Inc.
|
||||||
*
|
*
|
||||||
* Mark Spencer <markster@digium.com>
|
* Mark Spencer <markster@digium.com>
|
||||||
*
|
*
|
||||||
@@ -807,6 +807,17 @@ int ast_rtp_lookup_code(struct ast_rtp* rtp, const int isAstFormat, const int co
|
|||||||
return rtp->rtp_lookup_code_cache_result;
|
return rtp->rtp_lookup_code_cache_result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Check the dynamic list first */
|
||||||
|
for (pt = 0; pt < MAX_RTP_PT; ++pt) {
|
||||||
|
if (rtp->current_RTP_PT[pt].code == code && rtp->current_RTP_PT[pt].isAstFormat == isAstFormat) {
|
||||||
|
rtp->rtp_lookup_code_cache_isAstFormat = isAstFormat;
|
||||||
|
rtp->rtp_lookup_code_cache_code = code;
|
||||||
|
rtp->rtp_lookup_code_cache_result = pt;
|
||||||
|
return pt;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Then the static list */
|
||||||
for (pt = 0; pt < MAX_RTP_PT; ++pt) {
|
for (pt = 0; pt < MAX_RTP_PT; ++pt) {
|
||||||
if (static_RTP_PT[pt].code == code && static_RTP_PT[pt].isAstFormat == isAstFormat) {
|
if (static_RTP_PT[pt].code == code && static_RTP_PT[pt].isAstFormat == isAstFormat) {
|
||||||
rtp->rtp_lookup_code_cache_isAstFormat = isAstFormat;
|
rtp->rtp_lookup_code_cache_isAstFormat = isAstFormat;
|
||||||
|
Reference in New Issue
Block a user