From: Jeff Peeler Date: Wed, 2 Dec 2009 22:03:50 +0000 (+0000) Subject: Merged revisions 232582 via svnmerge from X-Git-Tag: 1.6.0.20-rc1~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5b53e2bb42712e81264c89a76fc9dedbf2144ec;p=thirdparty%2Fasterisk.git Merged revisions 232582 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r232582 | jpeeler | 2009-12-02 16:02:43 -0600 (Wed, 02 Dec 2009) | 14 lines Merged revisions 232581 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r232581 | jpeeler | 2009-12-02 15:57:42 -0600 (Wed, 02 Dec 2009) | 7 lines Send ack (response/message) after receiving manager action userevent (closes issue #16264) Reported by: dimas Patches: event-ack.patch uploaded by dimas (license 88) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@232583 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/manager.c b/main/manager.c index e5db428a95..7cbfcbc52a 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2474,6 +2474,7 @@ static int action_userevent(struct mansession *s, const struct message *m) } } + astman_send_ack(s, m, "Event Sent"); manager_event(EVENT_FLAG_USER, "UserEvent", "UserEvent: %s\r\n%s", event, body->str); return 0; }