@ -426,64 +426,53 @@ int ast_app_run_sub(struct ast_channel *autoservice_chan, struct ast_channel *su
return res ;
return res ;
} }
static ast_has_voicemail_fn * ast_has_voicemail_func = NULL ; /*! \brief The container for the voicemail provider */
static ast_inboxcount_fn * ast_inboxcount_func = NULL ; static AO2_GLOBAL_OBJ_STATIC ( vm_provider ) ;
static ast_inboxcount2_fn * ast_inboxcount2_func = NULL ;
static ast_sayname_fn * ast_sayname_func = NULL ; /*! Voicemail not registered warning */
static ast_messagecount_fn * ast_messagecount_func = NULL ; static int vm_warnings ;
static ast_copy_recording_to_vm_fn * ast_copy_recording_to_vm_func = NULL ;
static ast_vm_index_to_foldername_fn * ast_vm_index_to_foldername_func = NULL ; int __ast_vm_register ( const struct ast_vm_functions * vm_table , struct ast_module * module )
static ast_vm_mailbox_snapshot_create_fn * ast_vm_mailbox_snapshot_create_func = NULL ; {
static ast_vm_mailbox_snapshot_destroy_fn * ast_vm_mailbox_snapshot_destroy_func = NULL ; RAII_VAR ( struct ast_vm_functions * , table , NULL , ao2_cleanup ) ;
static ast_vm_msg_move_fn * ast_vm_msg_move_func = NULL ;
static ast_vm_msg_remove_fn * ast_vm_msg_remove_func = NULL ; if ( ! vm_table - > module_name ) {
static ast_vm_msg_forward_fn * ast_vm_msg_forward_func = NULL ; ast_log ( LOG_ERROR , " Voicemail provider missing required information. \n " ) ;
static ast_vm_msg_play_fn * ast_vm_msg_play_func = NULL ; return - 1 ;
}
void ast_install_vm_functions ( ast_has_voicemail_fn * has_voicemail_func , if ( vm_table - > module_version ! = VM_MODULE_VERSION ) {
ast_inboxcount_fn * inboxcount_func ,
ast_log ( LOG_ERROR , " Voicemail provider '%s' has incorrect version \n " ,
ast_inboxcount2_fn * inboxcount2_func ,
vm_table - > module_name ) ;
ast_messagecount_fn * messagecount_func ,
return - 1 ;
ast_sayname_fn * sayname_func ,
}
ast_copy_recording_to_vm_fn * copy_recording_to_vm_func ,
ast_vm_index_to_foldername_fn * vm_index_to_foldername_func ,
table = ao2_global_obj_ref ( vm_provider ) ;
ast_vm_mailbox_snapshot_create_fn * vm_mailbox_snapshot_create_func ,
if ( table ) {
ast_vm_mailbox_snapshot_destroy_fn * vm_mailbox_snapshot_destroy_func ,
ast_log ( LOG_WARNING , " Voicemail provider already registered by %s. \n " ,
ast_vm_msg_move_fn * vm_msg_move_func ,
table - > module_name ) ;
ast_vm_msg_remove_fn * vm_msg_remove_func ,
return - 1 ;
ast_vm_msg_forward_fn * vm_msg_forward_func ,
}
ast_vm_msg_play_fn * vm_msg_play_func )
{ table = ao2_alloc_options ( sizeof ( * table ) , NULL , AO2_ALLOC_OPT_LOCK_NOLOCK ) ;
ast_has_voicemail_func = has_voicemail_func ;
if ( ! table ) {
ast_inboxcount_func = inboxcount_func ;
return - 1 ;
ast_inboxcount2_func = inboxcount2_func ;
}
ast_messagecount_func = messagecount_func ;
* table = * vm_table ;
ast_sayname_func = sayname_func ;
table - > module = module ;
ast_copy_recording_to_vm_func = copy_recording_to_vm_func ;
ast_vm_index_to_foldername_func = vm_index_to_foldername_func ;
ao2_global_obj_replace_unref ( vm_provider , table ) ;
ast_vm_mailbox_snapshot_create_func = vm_mailbox_snapshot_create_func ;
return 0 ;
ast_vm_mailbox_snapshot_destroy_func = vm_mailbox_snapshot_destroy_func ;
}
ast_vm_msg_move_func = vm_msg_move_func ;
ast_vm_msg_remove_func = vm_msg_remove_func ;
void ast_vm_unregister ( const char * module_name )
ast_vm_msg_forward_func = vm_msg_forward_func ;
{
ast_vm_msg_play_func = vm_msg_play_func ;
struct ast_vm_functions * table ;
}
table = ao2_global_obj_ref ( vm_provider ) ;
void ast_uninstall_vm_functions ( void ) if ( table & & ! strcmp ( table - > module_name , module_name ) ) {
{ ao2_global_obj_release ( vm_provider ) ;
ast_has_voicemail_func = NULL ;
}
ast_inboxcount_func = NULL ;
ao2_cleanup ( table ) ;
ast_inboxcount2_func = NULL ;
ast_messagecount_func = NULL ;
ast_sayname_func = NULL ;
ast_copy_recording_to_vm_func = NULL ;
ast_vm_index_to_foldername_func = NULL ;
ast_vm_mailbox_snapshot_create_func = NULL ;
ast_vm_mailbox_snapshot_destroy_func = NULL ;
ast_vm_msg_move_func = NULL ;
ast_vm_msg_remove_func = NULL ;
ast_vm_msg_forward_func = NULL ;
ast_vm_msg_play_func = NULL ;
} }
# ifdef TEST_FRAMEWORK # ifdef TEST_FRAMEWORK
@ -504,17 +493,32 @@ void ast_uninstall_vm_test_functions(void)
} }
# endif # endif
int ast_app_has_voicemail ( const char * mailbox , const char * folder ) static void vm_warn_no_provider ( void )
{ {
static int warned = 0 ;
if ( vm_warnings + + % 10 = = 0 ) {
if ( ast_has_voicemail_func ) {
ast_verb ( 3 , " No voicemail provider registered. \n " ) ;
return ast_has_voicemail_func ( mailbox , folder ) ;
}
}
}
if ( warned + + % 10 = = 0 ) {
# define VM_API_CALL(res, api_call, api_parms) \
ast_verb ( 3 , " Message check requested for mailbox %s/folder %s but voicemail not loaded. \n " , mailbox , folder ? folder : " INBOX " ) ;
do { \
}
struct ast_vm_functions * table = ao2_global_obj_ref ( vm_provider ) ; \
return 0 ;
if ( ! table ) { \
vm_warn_no_provider ( ) ; \
} else if ( table - > api_call ) { \
ast_module_ref ( table - > module ) ; \
( res ) = table - > api_call api_parms ; \
ast_module_unref ( table - > module ) ; \
} \
ao2_cleanup ( table ) ; \
} while ( 0 )
int ast_app_has_voicemail ( const char * mailboxes , const char * folder )
{
int res = 0 ;
VM_API_CALL ( res , has_voicemail , ( mailboxes , folder ) ) ;
return res ;
} }
/*!
/*!
@ -525,44 +529,31 @@ int ast_app_has_voicemail(const char *mailbox, const char *folder)
*/
*/
int ast_app_copy_recording_to_vm ( struct ast_vm_recording_data * vm_rec_data ) int ast_app_copy_recording_to_vm ( struct ast_vm_recording_data * vm_rec_data )
{ {
static int warned = 0 ;
int res = - 1 ;
if ( ast_copy_recording_to_vm_func ) {
return ast_copy_recording_to_vm_func ( vm_rec_data ) ;
}
if ( warned + + % 10 = = 0 ) {
ast_verb ( 3 , " copy recording to voicemail called to copy %s.%s to %s@%s, but voicemail not loaded. \n " ,
vm_rec_data - > recording_file , vm_rec_data - > recording_ext ,
vm_rec_data - > mailbox , vm_rec_data - > context ) ;
}
return - 1 ;
VM_API_CALL ( res , copy_recording_to_vm , ( vm_rec_data ) ) ;
return res ;
} }
int ast_app_inboxcount ( const char * mailbox , int * newmsgs , int * oldmsgs ) int ast_app_inboxcount ( const char * mailboxes , int * newmsgs , int * oldmsgs )
{ {
static int warned = 0 ;
int res = 0 ;
if ( newmsgs ) {
if ( newmsgs ) {
* newmsgs = 0 ;
* newmsgs = 0 ;
}
}
if ( oldmsgs ) {
if ( oldmsgs ) {
* oldmsgs = 0 ;
* oldmsgs = 0 ;
}
}
if ( ast_inboxcount_func ) {
return ast_inboxcount_func ( mailbox , newmsgs , oldmsgs ) ;
}
if ( warned + + % 10 = = 0 ) {
VM_API_CALL ( res , inboxcount , ( mailboxes , newmsgs , oldmsgs ) ) ;
ast_verb ( 3 , " Message count requested for mailbox %s but voicemail not loaded. \n " , mailbox ) ;
return res ;
}
return 0 ;
} }
int ast_app_inboxcount2 ( const char * mailbox , int * urgentmsgs , int * newmsgs , int * oldmsgs ) int ast_app_inboxcount2 ( const char * mailboxes , int * urgentmsgs , int * newmsgs , int * oldmsgs )
{ {
static int warned = 0 ;
int res = 0 ;
if ( newmsgs ) {
if ( newmsgs ) {
* newmsgs = 0 ;
* newmsgs = 0 ;
}
}
@ -572,46 +563,33 @@ int ast_app_inboxcount2(const char *mailbox, int *urgentmsgs, int *newmsgs, int
if ( urgentmsgs ) {
if ( urgentmsgs ) {
* urgentmsgs = 0 ;
* urgentmsgs = 0 ;
}
}
if ( ast_inboxcount2_func ) {
return ast_inboxcount2_func ( mailbox , urgentmsgs , newmsgs , oldmsgs ) ;
}
if ( warned + + % 10 = = 0 ) {
VM_API_CALL ( res , inboxcount2 , ( mailboxes , urgentmsgs , newmsgs , oldmsgs ) ) ;
ast_verb ( 3 , " Message count requested for mailbox %s but voicemail not loaded. \n " , mailbox ) ;
return res ;
}
return 0 ;
} }
int ast_app_sayname ( struct ast_channel * chan , const char * mailbox , const char * context ) int ast_app_sayname ( struct ast_channel * chan , const char * mailbox , const char * context )
{ {
if ( ast_sayname_func ) {
int res = - 1 ;
return ast_sayname_func ( chan , mailbox , context ) ;
}
VM_API_CALL ( res , sayname , ( chan , mailbox , context ) ) ;
return - 1 ;
return res ;
} }
int ast_app_messagecount ( const char * context , const char * mailbox , const char * folder ) int ast_app_messagecount ( const char * context , const char * mailbox , const char * folder )
{ {
static int warned = 0 ;
int res = 0 ;
if ( ast_messagecount_func ) {
return ast_messagecount_func ( context , mailbox , folder ) ;
}
if ( ! warned ) {
warned + + ;
ast_verb ( 3 , " Message count requested for mailbox %s@%s/%s but voicemail not loaded. \n " , mailbox , context , folder ) ;
}
return 0 ;
VM_API_CALL ( res , messagecount , ( context , mailbox , folder ) ) ;
return res ;
} }
const char * ast_vm_index_to_foldername ( int id ) const char * ast_vm_index_to_foldername ( int id )
{ {
if ( ast_vm_index_to_foldername_func ) {
const char * res = NULL ;
return ast_vm_index_to_foldername_func ( id ) ;
}
VM_API_CALL ( res , index_to_foldername , ( id ) ) ;
return NULL ;
return res ;
} }
struct ast_vm_mailbox_snapshot * ast_vm_mailbox_snapshot_create ( const char * mailbox , struct ast_vm_mailbox_snapshot * ast_vm_mailbox_snapshot_create ( const char * mailbox ,
@ -621,18 +599,19 @@ struct ast_vm_mailbox_snapshot *ast_vm_mailbox_snapshot_create(const char *mailb
enum ast_vm_snapshot_sort_val sort_val ,
enum ast_vm_snapshot_sort_val sort_val ,
int combine_INBOX_and_OLD )
int combine_INBOX_and_OLD )
{ {
if ( ast_vm_mailbox_snapshot_create_func ) {
struct ast_vm_mailbox_snapshot * res = NULL ;
return ast_vm_mailbox_snapshot_create_func ( mailbox , context , folder , descending , sort_val , combine_INBOX_and_OLD ) ;
}
VM_API_CALL ( res , mailbox_snapshot_create , ( mailbox , context , folder , descending ,
return NULL ;
sort_val , combine_INBOX_and_OLD ) ) ;
return res ;
} }
struct ast_vm_mailbox_snapshot * ast_vm_mailbox_snapshot_destroy ( struct ast_vm_mailbox_snapshot * mailbox_snapshot ) struct ast_vm_mailbox_snapshot * ast_vm_mailbox_snapshot_destroy ( struct ast_vm_mailbox_snapshot * mailbox_snapshot )
{ {
if ( ast_vm_mailbox_snapshot_destroy_func ) {
struct ast_vm_mailbox_snapshot * res = NULL ;
return ast_vm_mailbox_snapshot_destroy_func ( mailbox_snapshot ) ;
}
VM_API_CALL ( res , mailbox_snapshot_destroy , ( mailbox_snapshot ) ) ;
return NULL ;
return res ;
} }
int ast_vm_msg_move ( const char * mailbox , int ast_vm_msg_move ( const char * mailbox ,
@ -642,10 +621,11 @@ int ast_vm_msg_move(const char *mailbox,
const char * old_msg_ids [ ] ,
const char * old_msg_ids [ ] ,
const char * newfolder )
const char * newfolder )
{ {
if ( ast_vm_msg_move_func ) {
int res = 0 ;
return ast_vm_msg_move_func ( mailbox , context , num_msgs , oldfolder , old_msg_ids , newfolder ) ;
}
VM_API_CALL ( res , msg_move , ( mailbox , context , num_msgs , oldfolder , old_msg_ids ,
return 0 ;
newfolder ) ) ;
return res ;
} }
int ast_vm_msg_remove ( const char * mailbox , int ast_vm_msg_remove ( const char * mailbox ,
@ -654,10 +634,10 @@ int ast_vm_msg_remove(const char *mailbox,
const char * folder ,
const char * folder ,
const char * msgs [ ] )
const char * msgs [ ] )
{ {
if ( ast_vm_msg_remove_func ) {
int res = 0 ;
return ast_vm_msg_remove_func ( mailbox , context , num_msgs , folder , msgs ) ;
}
VM_API_CALL ( res , msg_remove , ( mailbox , context , num_msgs , folder , msgs ) ) ;
return 0 ;
return res ;
} }
int ast_vm_msg_forward ( const char * from_mailbox , int ast_vm_msg_forward ( const char * from_mailbox ,
@ -670,10 +650,11 @@ int ast_vm_msg_forward(const char *from_mailbox,
const char * msg_ids [ ] ,
const char * msg_ids [ ] ,
int delete_old )
int delete_old )
{ {
if ( ast_vm_msg_forward_func ) {
int res = 0 ;
return ast_vm_msg_forward_func ( from_mailbox , from_context , from_folder , to_mailbox , to_context , to_folder , num_msgs , msg_ids , delete_old ) ;
}
VM_API_CALL ( res , msg_forward , ( from_mailbox , from_context , from_folder , to_mailbox ,
return 0 ;
to_context , to_folder , num_msgs , msg_ids , delete_old ) ) ;
return res ;
} }
int ast_vm_msg_play ( struct ast_channel * chan , int ast_vm_msg_play ( struct ast_channel * chan ,
@ -683,10 +664,10 @@ int ast_vm_msg_play(struct ast_channel *chan,
const char * msg_num ,
const char * msg_num ,
ast_vm_msg_play_cb * cb )
ast_vm_msg_play_cb * cb )
{ {
if ( ast_vm_msg_play_func ) {
int res = 0 ;
return ast_vm_msg_play_func ( chan , mailbox , context , folder , msg_num , cb ) ;
}
VM_API_CALL ( res , msg_play , ( chan , mailbox , context , folder , msg_num , cb ) ) ;
return 0 ;
return res ;
} }
# ifdef TEST_FRAMEWORK # ifdef TEST_FRAMEWORK
Richard Mudgett
12 years ago