add 'systemname' option to prefix channel unique IDs with (issue #5825)

convert chan->uniqueid to a stringfield from a fixed-size buffer


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10088 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 4 insertions, 1 deletions

diff --git a/channel.c b/channel.c
index 98590d0b8..7495e88b6 100644
--- a/channel.c
+++ b/channel.c
@@ -670,7 +670,10 @@ struct ast_channel *ast_channel_alloc(int needqueue)
 	tmp->fin = global_fin;
 	tmp->fout = global_fout;
 	ast_mutex_lock(&uniquelock);
-	snprintf(tmp->uniqueid, sizeof(tmp->uniqueid), "%li.%d", (long) time(NULL), uniqueint++);
+	if (ast_strlen_zero(ast_config_AST_SYSTEM_NAME))
+		ast_string_field_build(tmp, uniqueid, "%li.%d", (long) time(NULL), uniqueint++);
+	else
+		ast_string_field_build(tmp, uniqueid, "%s-%li.%d", ast_config_AST_SYSTEM_NAME, (long) time(NULL), uniqueint++);
 	ast_mutex_unlock(&uniquelock);
 	headp = &tmp->varshead;
 	ast_mutex_init(&tmp->lock);