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

Merge experimental codec preferences for IAX2 (bug #2971)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4727 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-09 10:32:53 +00:00
parent 88979c2a4a
commit 4038178ccb
6 changed files with 244 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
channels/iax2-parser.c
View File

@@ -80,6 +80,25 @@ static void dump_string(char *output, int maxlen, void *value, int len)
output[maxlen] = '\0';
}
static void dump_prefs(char *output, int maxlen, void *value, int len)
{
struct ast_codec_pref pref;
int total_len = 0;
maxlen--;
total_len = maxlen;
if (maxlen > len)
maxlen = len;
strncpy(output,value, maxlen);
output[maxlen] = '\0';
ast_codec_pref_convert(&pref, output, total_len, 0);
memset(output,0,total_len);
ast_codec_pref_string(&pref, output, total_len);
}
static void dump_int(char *output, int maxlen, void *value, int len)
{
if (len == (int)sizeof(unsigned int))
@@ -208,6 +227,7 @@ static struct iax2_ie {
{ IAX_IE_CAUSECODE, "CAUSE CODE", dump_byte },
{ IAX_IE_ENCRYPTION, "ENCRYPTION", dump_short },
{ IAX_IE_ENCKEY, "ENCRYPTION KEY" },
{ IAX_IE_CODEC_PREFS, "CODEC_PREFS", dump_prefs },
};
static struct iax2_ie prov_ies[] = {
@@ -564,6 +584,9 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen)
case IAX_IE_PASSWORD:
ies->password = data + 2;
break;
case IAX_IE_CODEC_PREFS:
ies->codec_prefs = data + 2;
break;
case IAX_IE_CAPABILITY:
if (len != (int)sizeof(unsigned int)) {
snprintf(tmp, (int)sizeof(tmp), "Expecting capability to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len);