[svn-commits] jrose: trunk r410575 - in /trunk: ./ contrib/ast-db-manage/config/versions/ i...

[SVN commits to the Digium repositories]

Author: jrose
Date: Fri Mar 14 11:42:54 2014
New Revision: 410575

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=410575
Log:
PJSIP: TOS values should be represented as decimals in sorcery objects

(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

Modified:
    trunk/   (props changed)
    trunk/CHANGES
    trunk/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py
    trunk/include/asterisk/acl.h
    trunk/main/acl.c
    trunk/res/res_pjsip/config_transport.c
    trunk/res/res_pjsip/pjsip_configuration.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=410575&r1=410574&r2=410575
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Fri Mar 14 11:42:54 2014
@@ -103,6 +103,10 @@
  * 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 ------------

Modified: trunk/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py?view=diff&rev=410575&r1=410574&r2=410575
==============================================================================
--- trunk/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py (original)
+++ trunk/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py Fri Mar 14 11:42:54 2014
@@ -8,7 +8,7 @@
 
 # revision identifiers, used by Alembic.
 revision = '4c573e7135bd'
-down_revision = '21e526ad3040'
+down_revision = '28887f25a46f'
 
 from alembic import op
 from alembic import context

Modified: trunk/include/asterisk/acl.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/acl.h?view=diff&rev=410575&r1=410574&r2=410575
==============================================================================
--- trunk/include/asterisk/acl.h (original)
+++ trunk/include/asterisk/acl.h Fri Mar 14 11:42:54 2014
@@ -358,17 +358,6 @@
 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

Modified: trunk/main/acl.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/acl.c?view=diff&rev=410575&r1=410574&r2=410575
==============================================================================
--- trunk/main/acl.c (original)
+++ trunk/main/acl.c Fri Mar 14 11:42:54 2014
@@ -894,12 +894,6 @@
 	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);

Modified: trunk/res/res_pjsip/config_transport.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip/config_transport.c?view=diff&rev=410575&r1=410574&r2=410575
==============================================================================
--- trunk/res/res_pjsip/config_transport.c (original)
+++ trunk/res/res_pjsip/config_transport.c Fri Mar 14 11:42:54 2014
@@ -502,7 +502,10 @@
 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 @@
 
 	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",

Modified: trunk/res/res_pjsip/pjsip_configuration.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip/pjsip_configuration.c?view=diff&rev=410575&r1=410574&r2=410575
==============================================================================
--- trunk/res/res_pjsip/pjsip_configuration.c (original)
+++ trunk/res/res_pjsip/pjsip_configuration.c Fri Mar 14 11:42:54 2014
@@ -786,14 +786,20 @@
 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;
 }