mirror of https://github.com/asterisk/asterisk
------------------------------------------------------------------------ r365395 | qwell | 2012-05-04 16:17:08 -0500 (Fri, 04 May 2012) | 7 lines Add support for folders in MixMonitor 'm' option. Backport manager actions. The manager actions are needed, so MixMonitor can be executed on existing channels. (issue DPMA-68) ------------------------------------------------------------------------ r364761 | qwell | 2012-05-01 12:25:14 -0500 (Tue, 01 May 2012) | 6 lines Remove folder_dir from voicemail snapshots API. It was both unused (except in tests, where it was fudged) and unnecessary. (closes issue AST-842) ------------------------------------------------------------------------ r367161 | mmichelson | 2012-05-21 14:05:52 -0500 (Mon, 21 May 2012) | 21 lines Add "send to voicemail" Digium phone functionality to Asterisk. This change accommodates two methods by which calls can be directed to a user's voicemail. * Incoming calls can be redirected to any user's voicemail. * Established calls can be blind transferred to any user's voicemail. Digium phones indicate the desire to direct a call to voicemail by using a Diversion header with a reason parameter of "send_to_vm". This patch adds the "send_to_vm" reason as a valid redirecting reason. In addition, chan_sip.c has been modified to update redirecting information on the transferred channel by reading a Diversion header on a REFER request. (closes issue AST-871) Reported by Malcolm Davenport Review: https://reviewboard.asterisk.org/r/1925 ------------------------------------------------------------------------ r368790 | mjordan | 2012-06-12 08:44:36 -0500 (Tue, 12 Jun 2012) | 18 lines Fix deadlock in SIP transfers that involve a REFER request In r367163, "send to voicemail" functionality was added to the SIP channel driver. This required updating the party redirecting information for the channel based on the headers provided in the REFER request. When the redirecting party information is updated on the channel, a call to ast_indicate_data occurs. Because handle_request_refer still had the sip_pvt locked, a deadlock could occur between the pbx_thread and the do_monitor thread servicing the REFER request. This patch preserves the proper locking order between the channel and the sip_pvt by ensuring that the sip_pvt is unlocked prior to updating the party redirecting information on the channel. (closes issue AST-903) Reported by: Matt Jordan patches: jira_ast_903_trunk.patch by rmudgett (license 5621) ------------------------------------------------------------------------ r368962 | qwell | 2012-06-14 13:38:48 -0500 (Thu, 14 Jun 2012) | 11 lines Remove global symbol requirement from app_voicemail. This uses the existing "function installation" stuff that already existed for other functions, like getting message counts. (closes issue AST-807) (issue AST-901) (issue AST-908) Review: https://reviewboard.asterisk.org/r/1965/ ------------------------------------------------------------------------ r368964 | qwell | 2012-06-14 14:03:24 -0500 (Thu, 14 Jun 2012) | 8 lines These functions that were moved need to be static. Also wrap test functions in a #ifdef. (issue AST-807) (issue AST-901) (issue AST-908) ------------------------------------------------------------------------ r368998 | qwell | 2012-06-15 10:31:43 -0500 (Fri, 15 Jun 2012) | 6 lines Remove some symbol exports that got missed in the removal of global symbols. (issue AST-807) (issue AST-901) (issue AST-908) ------------------------------------------------------------------------ r369024 | qwell | 2012-06-15 11:29:40 -0500 (Fri, 15 Jun 2012) | 2 lines Fix voicemail API tests by using the correct argument order for create/destroy. ------------------------------------------------------------------------ git-svn-id: https://origsvn.digium.com/svn/asterisk/certified/branches/1.8.11@369839 65c4cc65-6c06-0410-ace0-fbb531ad65f3certified/1.8.11
Jason Parker
13 years ago
parent
ac20e0c611
commit
05d05e68f5
@ -1,214 +0,0 @@
|
||||
/*
|
||||
* Asterisk -- An open source telephony toolkit.
|
||||
*
|
||||
* Copyright (C) 2011, Digium, Inc.
|
||||
*
|
||||
* David Vossel <dvossel@digium.com>
|
||||
*
|
||||
* See http://www.asterisk.org for more information about
|
||||
* the Asterisk project. Please do not directly contact
|
||||
* any of the maintainers of this project for assistance;
|
||||
* the project provides a web site, mailing lists and IRC
|
||||
* channels for your use.
|
||||
*
|
||||
* This program is free software, distributed under the terms of
|
||||
* the GNU General Public License Version 2. See the LICENSE file
|
||||
* at the top of the source tree.
|
||||
*/
|
||||
|
||||
/*! \file
|
||||
* \brief Voice Mail API
|
||||
* \author David Vossel <dvossel@digium.com>
|
||||
*/
|
||||
|
||||
#ifndef _ASTERISK_VM_H
|
||||
#define _ASTERISK_VM_H
|
||||
|
||||
#include "asterisk/stringfields.h"
|
||||
#include "asterisk/linkedlists.h"
|
||||
|
||||
#define AST_VM_FOLDER_NUMBER 12
|
||||
|
||||
enum ast_vm_snapshot_sort_val {
|
||||
AST_VM_SNAPSHOT_SORT_BY_ID = 0,
|
||||
AST_VM_SNAPSHOT_SORT_BY_TIME,
|
||||
};
|
||||
|
||||
struct ast_vm_msg_snapshot {
|
||||
AST_DECLARE_STRING_FIELDS(
|
||||
AST_STRING_FIELD(msg_id);
|
||||
AST_STRING_FIELD(callerid);
|
||||
AST_STRING_FIELD(callerchan);
|
||||
AST_STRING_FIELD(exten);
|
||||
AST_STRING_FIELD(origdate);
|
||||
AST_STRING_FIELD(origtime);
|
||||
AST_STRING_FIELD(duration);
|
||||
AST_STRING_FIELD(folder_name);
|
||||
AST_STRING_FIELD(folder_dir);
|
||||
AST_STRING_FIELD(flag);
|
||||
);
|
||||
unsigned int msg_number;
|
||||
|
||||
AST_LIST_ENTRY(ast_vm_msg_snapshot) msg;
|
||||
};
|
||||
|
||||
struct ast_vm_mailbox_snapshot {
|
||||
int total_msg_num;
|
||||
AST_LIST_HEAD_NOLOCK(, ast_vm_msg_snapshot) snapshots[AST_VM_FOLDER_NUMBER];
|
||||
};
|
||||
|
||||
/*
|
||||
* \brief Create a snapshot of a mailbox which contains information about every msg.
|
||||
*
|
||||
* \param mailbox, the mailbox to look for
|
||||
* \param context, the context to look for the mailbox in
|
||||
* \param folder, OPTIONAL. When not NULL only msgs from the specified folder will be included.
|
||||
* \param desending, list the msgs in descending order rather than ascending order.
|
||||
* \param combine_INBOX_and_OLD, When this argument is set, The OLD folder will be represented
|
||||
* in the INBOX folder of the snapshot. This allows the snapshot to represent the
|
||||
* OLD and INBOX messages in sorted order merged together.
|
||||
*
|
||||
* \retval snapshot on success
|
||||
* \retval NULL on failure
|
||||
*/
|
||||
struct ast_vm_mailbox_snapshot *ast_vm_mailbox_snapshot_create(const char *mailbox,
|
||||
const char *context,
|
||||
const char *folder,
|
||||
int descending,
|
||||
enum ast_vm_snapshot_sort_val sort_val,
|
||||
int combine_INBOX_and_OLD);
|
||||
|
||||
/*
|
||||
* \brief destroy a snapshot
|
||||
*
|
||||
* \param mailbox_snapshot The snapshot to destroy.
|
||||
* \retval NULL
|
||||
*/
|
||||
struct ast_vm_mailbox_snapshot *ast_vm_mailbox_snapshot_destroy(struct ast_vm_mailbox_snapshot *mailbox_snapshot);
|
||||
|
||||
/*!
|
||||
* \brief Move messages from one folder to another
|
||||
*
|
||||
* \param mailbox The mailbox to which the folders belong
|
||||
* \param context The voicemail context for the mailbox
|
||||
* \param num_msgs The number of messages to move
|
||||
* \param oldfolder The folder from where messages should be moved
|
||||
* \param old_msg_nums The message IDs of the messages to move
|
||||
* \param newfolder The folder to which messages should be moved
|
||||
* \param new_msg_ids[out] An array of message IDs for the messages as they are in the
|
||||
* new folder. This array must be num_msgs sized.
|
||||
*
|
||||
* \retval -1 Failure
|
||||
* \retval 0 Success
|
||||
*/
|
||||
int ast_vm_msg_move(const char *mailbox,
|
||||
const char *context,
|
||||
size_t num_msgs,
|
||||
const char *oldfolder,
|
||||
int *old_msg_ids,
|
||||
const char *newfolder,
|
||||
int *new_msg_ids);
|
||||
|
||||
/*!
|
||||
* \brief Remove/delete messages from a mailbox folder.
|
||||
*
|
||||
* \param mailbox The mailbox from which to delete messages
|
||||
* \param context The voicemail context for the mailbox
|
||||
* \param num_msgs The number of messages to delete
|
||||
* \param folder The folder from which to remove messages
|
||||
* \param msgs The message IDs of the messages to delete
|
||||
*
|
||||
* \retval -1 Failure
|
||||
* \retval 0 Success
|
||||
*/
|
||||
int ast_vm_msg_remove(const char *mailbox,
|
||||
const char *context,
|
||||
size_t num_msgs,
|
||||
const char *folder,
|
||||
int *msgs);
|
||||
|
||||
/*!
|
||||
* \brief forward a message from one mailbox to another.
|
||||
*
|
||||
* \brief from_mailbox The original mailbox the message is being forwarded from
|
||||
* \brief from_context The voicemail context of the from_mailbox
|
||||
* \brief from_folder The folder from which the message is being forwarded
|
||||
* \brief to_mailbox The mailbox to forward the message to
|
||||
* \brief to_context The voicemail context of the to_mailbox
|
||||
* \brief to_folder The folder to which the message is being forwarded
|
||||
* \brief num_msgs The number of messages being forwarded
|
||||
* \brief msg_ids The message IDs of the messages in from_mailbox to forward
|
||||
* \brief delete_old If non-zero, the forwarded messages are also deleted from from_mailbox.
|
||||
* Otherwise, the messages will remain in the from_mailbox.
|
||||
*
|
||||
* \retval -1 Failure
|
||||
* \retval 0 Success
|
||||
*/
|
||||
int ast_vm_msg_forward(const char *from_mailbox,
|
||||
const char *from_context,
|
||||
const char *from_folder,
|
||||
const char *to_mailbox,
|
||||
const char *to_context,
|
||||
const char *to_folder,
|
||||
size_t num_msgs,
|
||||
int *msg_ids,
|
||||
int delete_old);
|
||||
|
||||
/*!
|
||||
* \brief Voicemail playback callback function definition
|
||||
*
|
||||
* \param channel to play the file back on.
|
||||
* \param location of file on disk
|
||||
* \param duration of file in seconds. This will be zero if msg is very short or
|
||||
* has an unknown duration.
|
||||
*/
|
||||
typedef void (ast_vm_msg_play_cb)(struct ast_channel *chan, const char *playfile, int duration);
|
||||
|
||||
/*!
|
||||
* \brief Play a voicemail msg back on a channel.
|
||||
*
|
||||
* \param mailbox msg is in.
|
||||
* \param context of mailbox.
|
||||
* \param voicemail folder to look in.
|
||||
* \param message number in the voicemailbox to playback to the channel.
|
||||
*
|
||||
* \retval 0 success
|
||||
* \retval -1 failure
|
||||
*/
|
||||
int ast_vm_msg_play(struct ast_channel *chan,
|
||||
const char *mailbox,
|
||||
const char *context,
|
||||
const char *folder,
|
||||
const char *msg_num,
|
||||
ast_vm_msg_play_cb cb);
|
||||
|
||||
/*!
|
||||
* \brief Get the name of a folder given its numeric index
|
||||
*
|
||||
* \param index The integer value of the mailbox.
|
||||
* \retval "" Invalid index provided
|
||||
* \retval other The name of the mailbox
|
||||
*/
|
||||
const char *ast_vm_index_to_foldername(unsigned int index);
|
||||
|
||||
#ifdef TEST_FRAMEWORK
|
||||
/*!
|
||||
* \brief Add a user to the voicemail system for test purposes
|
||||
* \param context The context of the mailbox
|
||||
* \param mailbox The mailbox for the user
|
||||
* \retval 0 success
|
||||
* \retval other failure
|
||||
*/
|
||||
int ast_vm_test_create_user(const char *context, const char *mailbox);
|
||||
|
||||
/*!
|
||||
* \brief Dispose of a user. This should be used to destroy a user that was
|
||||
* previously created using ast_vm_test_create_user
|
||||
* \param context The context of the mailbox
|
||||
* \param mailbox The mailbox for the user to destroy
|
||||
*/
|
||||
int ast_vm_test_destroy_user(const char *context, const char *mailbox);
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
Loading…
Reference in new issue