Make GetVar respect ActionID (bug #2404/2405)

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

diff --git a/manager.c b/manager.c
index cc921f9bf471232131cb7b00131c09cee874dd40..0ce2bc0d78500c292dd520c369b9b816108c65ed 100755 (executable)
--- a/manager.c
+++ b/manager.c
@@ -608,6 +608,7 @@ static int action_getvar(struct mansession *s, struct message *m)
         struct ast_channel *c = NULL;
         char *name = astman_get_header(m, "Channel");
         char *varname = astman_get_header(m, "Variable");
+       char *id = astman_get_header(m,"ActionID");
        char *varval;
 
        if (!strlen(name)) {
@@ -637,6 +638,8 @@ static int action_getvar(struct mansession *s, struct message *m)
        ast_mutex_unlock(&c->lock);
        ast_cli(s->fd, "Response: Success\r\n"
                "%s: %s\r\n" ,varname,varval);
+       if (id && !ast_strlen_zero(id))
+               ast_cli(s->fd, "ActionID: %s\r\n",id);
        ast_cli(s->fd, "\r\n");
 
        return 0;