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

rtp_engine.h: No sense allowing payload types larger than RFC allows.

Browse Source 
* Tweaked add_static_payload() to not use magic numbers.

Change-Id: I1719ff0f6d3ce537a91572501eae5bcd912a420b
This commit is contained in:
Richard Mudgett
2015-07-27 19:10:11 -05:00
parent bc1eae55cb
commit e2d5d4db35
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/asterisk/rtp_engine.h
View File

@@ -78,14 +78,13 @@ extern "C" {
#include "asterisk/stasis.h"
#include "asterisk/vector.h"
/* Maximum number of payloads supported */
#if defined(LOW_MEMORY)
/*! Maximum number of payload types RTP can support. */
#define AST_RTP_MAX_PT 128
#else
#define AST_RTP_MAX_PT 196
#endif
/* Maximum number of generations */
/*! First dynamic RTP payload type */
#define AST_RTP_PT_FIRST_DYNAMIC 96
/*! Maximum number of generations */
#define AST_RED_MAX_GENERATION 5
/*!

8
main/rtp_engine.c
View File

@@ -1740,23 +1740,25 @@ static void set_next_mime_type(struct ast_format *format, int rtp_code, const ch
static void add_static_payload(int map, struct ast_format *format, int rtp_code)
{
int x;
ast_assert(map < ARRAY_LEN(static_RTP_PT));
ast_rwlock_wrlock(&static_RTP_PT_lock);
if (map < 0) {
/* find next available dynamic payload slot */
for (x = 96; x < 127; x++) {
for (x = AST_RTP_PT_FIRST_DYNAMIC; x < AST_RTP_MAX_PT; ++x) {
if (!static_RTP_PT[x].asterisk_format && !static_RTP_PT[x].rtp_code) {
map = x;
break;
}
}
}
if (map < 0) {
ast_log(LOG_WARNING, "No Dynamic RTP mapping available for format %s\n",
ast_format_get_name(format));
ast_rwlock_unlock(&static_RTP_PT_lock);
return;
}
}
if (format) {
static_RTP_PT[map].asterisk_format = 1;