It is no longer required for each module that deals with a channel to call ast_module_user_hangup_all in it's unload function. The loader will automatically perform this action for it.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75183 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp 2007-07-16 13:35:20 +00:00
parent 8d1e53958c
commit 96a646734f
74 changed files with 46 additions and 357 deletions

View File

@ -1572,14 +1572,7 @@ static int adsi_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
ast_module_user_hangup_all();
res = ast_unregister_application(app);
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -823,13 +823,7 @@ static int load_config(void)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -383,7 +383,6 @@ static void load_config(void)
static int unload_module(void)
{
ast_module_user_hangup_all();
return ast_unregister_application(app);
}

View File

@ -223,14 +223,7 @@ static int auth_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
ast_module_user_hangup_all();
res = ast_unregister_application(app);
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -61,13 +61,7 @@ static int nocdr_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(nocdr_app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(nocdr_app);
}
static int load_module(void)

View File

@ -157,13 +157,7 @@ static int chanavail_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res = 0;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -122,13 +122,7 @@ static int asyncgoto_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -799,8 +799,6 @@ static int unload_module(void)
res |= ast_unregister_application(app_chan);
res |= ast_unregister_application(app_ext);
ast_module_user_hangup_all();
return res;
}

View File

@ -1946,8 +1946,6 @@ static int unload_module(void)
res = ast_unregister_application(app);
res |= ast_unregister_application(rapp);
ast_module_user_hangup_all();
if ((con = ast_context_find("app_dial_gosub_virtual_context"))) {
ast_context_remove_extension2(con, "s", 1, NULL);
}

View File

@ -388,13 +388,7 @@ reorder:
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -165,13 +165,7 @@ static int dumpchan_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -87,13 +87,7 @@ end:
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -207,8 +207,6 @@ static int unload_module(void)
res |= ast_unregister_application(app_tryexec);
res |= ast_unregister_application(app_execif);
ast_module_user_hangup_all();
return res;
}

View File

@ -578,13 +578,7 @@ static int app_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -536,13 +536,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -111,13 +111,7 @@ static int flash_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -1052,8 +1052,6 @@ static int unload_module(void)
{
struct call_followme *f;
ast_module_user_hangup_all();
ast_unregister_application(app);
/* Free Memory. Yeah! I'm free! */

View File

@ -97,13 +97,7 @@ static int forkcdr_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -131,13 +131,7 @@ static int cpeid_exec(struct ast_channel *chan, void *idata)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -208,13 +208,7 @@ static int ices_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -99,13 +99,7 @@ static int sendimage_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -115,13 +115,7 @@ static int skel_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -536,8 +536,6 @@ static int unload_module(void)
res |= ast_unregister_application(app);
res |= ast_unregister_application(exclusive_app);
ast_module_user_hangup_all();
return res;
}

View File

@ -4972,8 +4972,6 @@ static int unload_module(void)
ast_devstate_prov_del("Meetme");
ast_devstate_prov_del("SLA");
ast_module_user_hangup_all();
sla_destroy();

View File

@ -140,13 +140,7 @@ static int milliwatt_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -3130,9 +3130,6 @@ static int unload_module(void)
timezone_destroy_list(); /* Destroy list of timezones */
vmaccounts_destroy_list(); /* Destroy list of voicemail accounts */
ast_module_user_hangup_all();
return res;
}

View File

@ -450,8 +450,6 @@ static int unload_module(void)
res = ast_unregister_application(stop_app);
res |= ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
}

View File

@ -161,13 +161,7 @@ static int morsecode_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app_morsecode);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app_morsecode);
}
static int load_module(void)

View File

@ -238,13 +238,7 @@ static int mp3_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -220,13 +220,7 @@ static int NBScat_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -2049,8 +2049,6 @@ static int unload_module(void)
ast_cli_unregister_multiple(cli_osp, sizeof(cli_osp) / sizeof(struct ast_cli_entry));
osp_unload();
ast_module_user_hangup_all();
return res;
}

View File

@ -195,13 +195,7 @@ static int page_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app_page);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app_page);
}
static int load_module(void)

View File

@ -242,13 +242,7 @@ static int parkandannounce_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -462,8 +462,6 @@ static int unload_module(void)
ast_cli_unregister_multiple(cli_playback, sizeof(cli_playback) / sizeof(struct ast_cli_entry));
ast_module_user_hangup_all();
if (say_cfg)
ast_config_destroy(say_cfg);

View File

@ -206,18 +206,12 @@ static int privacy_exec (struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application (app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application (app);
}
static int load_module(void)
{
return ast_register_application (app, privacy_exec, synopsis, descrip);
return ast_register_application(app, privacy_exec, synopsis, descrip);
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Require phone number to be entered, if no CallerID sent");

View File

@ -4784,8 +4784,6 @@ static int unload_module(void)
ast_context_remove_extension2(con, "s", 1, NULL);
}
ast_module_user_hangup_all();
clear_and_free_interfaces();
return res;

View File

@ -218,13 +218,7 @@ static int read_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -103,13 +103,7 @@ static int readfile_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app_readfile);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app_readfile);
}
static int load_module(void)

View File

@ -375,13 +375,7 @@ static int record_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -7437,7 +7437,6 @@ static int unload_module(void)
{
int i;
ast_module_user_hangup_all();
for (i = 0; i < nrpts; i++) {
if (!strcmp(rpt_vars[i].name, rpt_vars[i].p.nodes))
continue;

View File

@ -107,8 +107,6 @@ static int unload_module(void)
res = ast_unregister_application(app_sayunixtime);
res |= ast_unregister_application(app_datetime);
ast_module_user_hangup_all();
return res;
}

View File

@ -125,8 +125,6 @@ static int unload_module(void)
res = ast_unregister_application(app);
res |= ast_manager_unregister("PlayDTMF");
ast_module_user_hangup_all();
return res;
}

View File

@ -104,13 +104,7 @@ static int sendtext_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -92,9 +92,7 @@ static int setcallerid_pres_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res = ast_unregister_application(app2);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app2);
}
static int load_module(void)

View File

@ -1929,13 +1929,7 @@ done:
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -104,13 +104,7 @@ static int softhangup_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -823,8 +823,6 @@ static int unload_module(void)
res |= ast_custom_function_unregister(&speech_engine_function);
res |= ast_custom_function_unregister(&speech_results_type_function);
ast_module_user_hangup_all();
return res;
}

View File

@ -421,8 +421,6 @@ static int unload_module(void)
ast_unregister_application(app_gosub);
ast_custom_function_unregister(&local_function);
ast_module_user_hangup_all();
return 0;
}

View File

@ -123,8 +123,6 @@ static int unload_module(void)
res = ast_unregister_application(app);
res |= ast_unregister_application(app2);
ast_module_user_hangup_all();
return res;
}

View File

@ -211,13 +211,7 @@ static int background_detect_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -465,8 +465,6 @@ static int unload_module(void)
res = ast_unregister_application(testc_app);
res |= ast_unregister_application(tests_app);
ast_module_user_hangup_all();
return res;
}

View File

@ -131,13 +131,7 @@ static int transfer_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -145,13 +145,7 @@ out:
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -92,13 +92,7 @@ static int userevent_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -150,8 +150,6 @@ static int unload_module(void)
res = ast_unregister_application(app_verbose);
res |= ast_unregister_application(app_log);
ast_module_user_hangup_all();
return res;
}

View File

@ -8501,8 +8501,6 @@ static int unload_module(void)
res |= ast_manager_unregister("VoicemailUsersList");
ast_cli_unregister_multiple(cli_voicemail, sizeof(cli_voicemail) / sizeof(struct ast_cli_entry));
ast_uninstall_vm_functions();
ast_module_user_hangup_all();
if (poll_thread != AST_PTHREADT_NULL)
stop_poll_thread();

View File

@ -120,13 +120,7 @@ static int waitforring_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -187,13 +187,7 @@ static int waitforsilence_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -315,8 +315,6 @@ static int unload_module(void)
res |= ast_unregister_application(exit_app);
res |= ast_unregister_application(continue_app);
ast_module_user_hangup_all();
return res;
}

View File

@ -105,13 +105,7 @@ static int zapateller_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -300,13 +300,7 @@ out:
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -241,13 +241,7 @@ static int zapras_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -363,13 +363,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
static int unload_module(void)
{
int res;
res = ast_unregister_application(app);
ast_module_user_hangup_all();
return res;
return ast_unregister_application(app);
}
static int load_module(void)

View File

@ -75,9 +75,7 @@ static struct ast_custom_function blacklist_function = {
static int unload_module(void)
{
int res = ast_custom_function_unregister(&blacklist_function);
ast_module_user_hangup_all();
return res;
return ast_custom_function_unregister(&blacklist_function);
}
static int load_module(void)

View File

@ -187,8 +187,6 @@ static int unload_module(void)
res = ast_custom_function_unregister(&acf_curl);
ast_module_user_hangup_all();
curl_global_cleanup();
return res;

View File

@ -306,8 +306,6 @@ static int unload_module(void)
res |= ast_custom_function_unregister(&acf_cut);
res |= ast_custom_function_unregister(&acf_sort);
ast_module_user_hangup_all();
return res;
}

View File

@ -392,8 +392,6 @@ static int unload_module(void)
res |= ast_custom_function_unregister(&enum_function);
res |= ast_custom_function_unregister(&txtcidname_function);
ast_module_user_hangup_all();
return res;
}

View File

@ -148,18 +148,12 @@ struct ast_custom_function realtime_function = {
static int unload_module(void)
{
int res = ast_custom_function_unregister(&realtime_function);
ast_module_user_hangup_all();
return res;
return ast_custom_function_unregister(&realtime_function);
}
static int load_module(void)
{
int res = ast_custom_function_register(&realtime_function);
return res;
return ast_custom_function_register(&realtime_function);
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Read/Write values from a RealTime repository");

View File

@ -90,10 +90,7 @@ struct ast_custom_function acf_vmcount = {
static int unload_module(void)
{
int res = ast_custom_function_unregister(&acf_vmcount);
ast_module_user_hangup_all();
return res;
return ast_custom_function_unregister(&acf_vmcount);
}
static int load_module(void)

View File

@ -2138,7 +2138,6 @@ static struct ast_cli_entry cli_agi[] = {
static int unload_module(void)
{
ast_module_user_hangup_all();
ast_cli_unregister_multiple(cli_agi, sizeof(cli_agi) / sizeof(struct ast_cli_entry));
ast_unregister_application(eapp);
ast_unregister_application(deadapp);

View File

@ -575,7 +575,6 @@ static struct ast_config_engine odbc_engine = {
static int unload_module (void)
{
ast_module_user_hangup_all();
ast_config_engine_deregister(&odbc_engine);
if (option_verbose)
ast_verbose("res_config_odbc unloaded.\n");

View File

@ -573,8 +573,6 @@ static int unload_module(void)
ast_verbose("Postgresql RealTime unloaded.\n");
}
ast_module_user_hangup_all();
/* Unlock so something else can destroy the lock. */
ast_mutex_unlock(&pgsql_lock);

View File

@ -3051,8 +3051,6 @@ static int load_module(void)
static int unload_module(void)
{
ast_module_user_hangup_all();
ast_manager_unregister("ParkedCalls");
ast_manager_unregister("Bridge");
ast_manager_unregister("Park");

View File

@ -114,7 +114,6 @@ static struct ast_cli_entry cli_realtime[] = {
static int unload_module(void)
{
ast_cli_unregister_multiple(cli_realtime, sizeof(cli_realtime) / sizeof(struct ast_cli_entry));
ast_module_user_hangup_all();
return 0;
}