diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rwxr-xr-x | contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py | 2 | ||||
| -rw-r--r-- | include/asterisk/acl.h | 11 | ||||
| -rw-r--r-- | main/acl.c | 6 | ||||
| -rw-r--r-- | res/res_pjsip/config_transport.c | 7 | ||||
| -rw-r--r-- | res/res_pjsip/pjsip_configuration.c | 10 |
6 files changed, 18 insertions, 22 deletions
@@ -103,6 +103,10 @@ Core * Exposed sorcery-based configuration files like pjsip.conf to dialplans via the new AST_SORCERY diaplan function. +res_pjsip +------------------ + * transport and endpoint ToS options (tos, tos_audio, and tos_video) may now + be set as the named set of ToS values (cs0-cs7, af11-af43, ef). ------------------------------------------------------------------------------ --- Functionality changes from Asterisk 12.0.0 to Asterisk 12.1.0 ------------ diff --git a/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py b/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py index 51e8fa9ca..2c89bc2b8 100755 --- a/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py +++ b/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py @@ -8,7 +8,7 @@ Create Date: 2014-03-05 12:16:56.618630 # revision identifiers, used by Alembic. revision = '4c573e7135bd' -down_revision = '21e526ad3040' +down_revision = '28887f25a46f' from alembic import op from alembic import context diff --git a/include/asterisk/acl.h b/include/asterisk/acl.h index 502e7f447..d1773b6b1 100644 --- a/include/asterisk/acl.h +++ b/include/asterisk/acl.h @@ -358,17 +358,6 @@ int ast_str2tos(const char *value, unsigned int *tos); const char *ast_tos2str(unsigned int tos); /*! - * \brief Convert a TOS value into its string representation - * and create a dynamically allocated copy - * - * \param tos The TOS value to look up - * \param buf pointer to character pointer where string will be duplicated to - * - * \note The string allocated at buf must be free'd - */ -void ast_tos2str_buf(unsigned int tos, char **buf); - -/*! * \brief Retrieve a named ACL * * \details diff --git a/main/acl.c b/main/acl.c index a55e87458..c341125fd 100644 --- a/main/acl.c +++ b/main/acl.c @@ -894,12 +894,6 @@ const char *ast_tos2str(unsigned int tos) return "unknown"; } -void ast_tos2str_buf(unsigned int tos, char **buf) -{ - const char *tos_string = ast_tos2str(tos); - *buf = ast_strdup(tos_string); -} - int ast_get_ip(struct ast_sockaddr *addr, const char *hostname) { return ast_get_ip_or_srv(addr, hostname, NULL); diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c index 1559ab77c..5fbede2bd 100644 --- a/res/res_pjsip/config_transport.c +++ b/res/res_pjsip/config_transport.c @@ -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", diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c index b2a86c3c8..1f289ade9 100644 --- a/res/res_pjsip/pjsip_configuration.c +++ b/res/res_pjsip/pjsip_configuration.c @@ -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; } |