From 0ded269bfa19714da3de4b67858b0b463ecf2430 Mon Sep 17 00:00:00 2001 From: Matt Jordan Date: Tue, 14 Mar 2017 09:59:48 -0500 Subject: funcs/func_devstate: Remove new line in Device field of during module load During module loading of func_devstate, Asterisk emits the current device state of all Custom device states currently stored in the AstDB. This was erroneously including a new line character ('\n') to the end of the device state, causing two new lines to be emitted in DeviceStateChange AMI events. Note that this only happened for those device state changes that occurred during startup. Regular device state changes for Custom device states are handled elsewhere, and did not have the newline. ASTERISK-26643 #close Reported by: Roman Bedros Tested by: Matt Jordan patches: ami_devstate.diff uploaded by Roman Bedros (License 6842) Change-Id: I1f4c02fc79c448d43bf725f5039c83d9611d7d93 --- funcs/func_devstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'funcs') diff --git a/funcs/func_devstate.c b/funcs/func_devstate.c index 965c7c794..5789e2b0b 100644 --- a/funcs/func_devstate.c +++ b/funcs/func_devstate.c @@ -339,7 +339,7 @@ static int load_module(void) if (dev_name <= (const char *) 1) continue; ast_devstate_changed(ast_devstate_val(db_entry->data), - AST_DEVSTATE_CACHABLE, "Custom:%s\n", dev_name); + AST_DEVSTATE_CACHABLE, "Custom:%s", dev_name); } ast_db_freetree(db_tree); db_tree = NULL; -- cgit v1.2.3