]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
funcs/func_devstate: Remove new line in Device field of during module load
authorMatt Jordan <mjordan@digium.com>
Tue, 14 Mar 2017 14:59:48 +0000 (09:59 -0500)
committerMatt Jordan <mjordan@digium.com>
Tue, 14 Mar 2017 14:59:48 +0000 (09:59 -0500)
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

index 88a5c5c7168163fcdee6f807cac04de0307274c5..21759bc337ae1442d8f62881f38c062feb3b4aec 100644 (file)
@@ -341,7 +341,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;