dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Add pickup event to AMI. Also, fix AMI documentation. 

(closes issue #16431)
 Reported by: syspert
 Patches: 
       20100112__issue16431.diff.txt uploaded by tilghman (license 14)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@240421 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
tilghman 2010-01-15 21:04:34 +00:00
parent 36ba567f70
commit 602a8e74b2
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_directed_pickup.c
View File

@ -40,6 +40,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/lock.h"
#include "asterisk/app.h"
#include "asterisk/features.h"
#include "asterisk/manager.h"
#include "asterisk/callerid.h"
#include "asterisk/cel.h"
@ -94,6 +95,7 @@ static int pickup_do(struct ast_channel *chan, struct ast_channel *target)
{
int res = 0;
struct ast_party_connected_line connected_caller;
struct ast_channel *chans[2] = { chan, target };
ast_debug(1, "Call pickup on '%s' by '%s'\n", target->name, chan->name);
ast_cel_report_event(target, AST_CEL_PICKUP, NULL, NULL, chan);
@ -128,6 +130,10 @@ static int pickup_do(struct ast_channel *chan, struct ast_channel *target)
return -1;
}
/* If you want UniqueIDs, set channelvars in manager.conf to CHANNEL(uniqueid) */
ast_manager_event_multichan(EVENT_FLAG_CALL, "Pickup", 2, chans,
"Channel: %s\r\nTargetChannel: %s\r\n", chan->name, target->name);
return res;
}

4
include/asterisk/manager.h
View File

@ -207,10 +207,10 @@ int astman_verify_session_writepermissions(uint32_t ident, int perm);
__ast_manager_event_multichan(category, event, nchans, chans, __FILE__, __LINE__, __PRETTY_FUNCTION__, contents , ## __VA_ARGS__);
/*! External routines may send asterisk manager events this way
* \param chan1 First channel related to this event (or NULL if none are relevant)
* \param chan2 Second channel related to this event (or NULL if none are relevant)
* \param category Event category, matches manager authorization
* \param event Event name
* \param chancount Number of channels in chans parameter
* \param chans A pointer to an array of channels involved in the event
* \param contents Format string describing event
* \since 1.8
*/

8
main/features.c
View File

@ -4734,7 +4734,7 @@ static int find_channel_by_group(void *obj, void *arg, void *data, int flags)
*/
int ast_pickup_call(struct ast_channel *chan)
{
struct ast_channel *cur;
struct ast_channel *cur, *chans[2] = { chan, };
struct ast_party_connected_line connected_caller;
int res;
const char *chan_name;
@ -4748,6 +4748,8 @@ int ast_pickup_call(struct ast_channel *chan)
return -1;
}
chans[1] = cur;
ast_channel_lock_both(cur, chan);
cur_name = ast_strdupa(cur->name);
@ -4784,6 +4786,10 @@ int ast_pickup_call(struct ast_channel *chan)
ast_stream_and_wait(cur, pickupsound, "");
}
/* If you want UniqueIDs, set channelvars in manager.conf to CHANNEL(uniqueid) */
ast_manager_event_multichan(EVENT_FLAG_CALL, "Pickup", 2, chans,
"Channel: %s\r\nTargetChannel: %s\r\n", chan->name, cur->name);
cur = ast_channel_unref(cur);
return res;