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

PJSIP: TOS values should be represented as decimals in sorcery objects

Browse Source 
(closes issue ASTERISK-23235)
Reported by: George Joseph
Review: https://reviewboard.asterisk.org/r/3324/
........

Merged revisions 410574 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410575 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2014-03-14 16:42:54 +00:00
parent c1e9d2f177
commit ff63012c4e
6 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/res_pjsip/config_transport.c
View File

@@ -502,7 +502,10 @@ static int transport_tos_handler(const struct aco_option *opt, struct ast_variab
static int tos_to_str(const void *obj, const intptr_t *args, char **buf)
{
const struct ast_sip_transport *transport = obj;
ast_tos2str_buf(transport->tos, buf);
if (ast_asprintf(buf, "%d", transport->tos) == -1) {
return -1;
}
return 0;
}
@@ -574,7 +577,7 @@ static int cli_print_body(void *obj, void *arg, int flags)
pj_sockaddr_print(&transport->host, hoststr, sizeof(hoststr), 3);
ast_str_append(&context->output_buffer, 0, "%*s: %-21s %6s %5x %5x %s\n",
ast_str_append(&context->output_buffer, 0, "%*s: %-21s %6s %5d %5d %s\n",
CLI_INDENT_TO_SPACES(context->indent_level), "Transport",
ast_sorcery_object_get_id(transport),
ARRAY_IN_BOUNDS(transport->type, transport_types) ? transport_types[transport->type] : "Unknown",

10
res/res_pjsip/pjsip_configuration.c
View File

@@ -786,14 +786,20 @@ static int tos_handler(const struct aco_option *opt,
static int tos_audio_to_str(const void *obj, const intptr_t *args, char **buf)
{
const struct ast_sip_endpoint *endpoint = obj;
ast_tos2str_buf(endpoint->media.tos_audio, buf);
if (ast_asprintf(buf, "%d", endpoint->media.tos_audio) == -1) {
return -1;
}
return 0;
}
static int tos_video_to_str(const void *obj, const intptr_t *args, char **buf)
{
const struct ast_sip_endpoint *endpoint = obj;
ast_tos2str_buf(endpoint->media.tos_video, buf);
if (ast_asprintf(buf, "%d", endpoint->media.tos_video) == -1) {
return -1;
}
return 0;
}