diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-06-07 17:14:40 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-06-07 17:14:40 +0000 |
| commit | 6279bf10c4ce14d75310618994075cbad7c37bc4 (patch) | |
| tree | 5d358e8107834a0240a01606d0aa98126c62b9b8 /res | |
| parent | a8b0a415fcedbba37b39e1a313be109cf4a0fcef (diff) | |
Avoid unloading res_smdi twice.
(closes issue #17237)
Reported by: pabelanger
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@268653 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_smdi.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/res/res_smdi.c b/res/res_smdi.c index fcd715515..fe99cc9ea 100644 --- a/res/res_smdi.c +++ b/res/res_smdi.c @@ -152,6 +152,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") ***/ static const char config_file[] = "smdi.conf"; +static int smdi_loaded; /*! \brief SMDI message desk message queue. */ struct ast_smdi_md_queue { @@ -1394,6 +1395,7 @@ static int _unload_module(int fromload); static int load_module(void) { int res; + smdi_loaded = 1; /* initialize our containers */ memset(&smdi_ifaces, 0, sizeof(smdi_ifaces)); @@ -1421,6 +1423,10 @@ static int load_module(void) static int _unload_module(int fromload) { + if (!smdi_loaded) { + return 0; + } + /* this destructor stops any running smdi_read threads */ ASTOBJ_CONTAINER_DESTROYALL(&smdi_ifaces, ast_smdi_interface_destroy); ASTOBJ_CONTAINER_DESTROY(&smdi_ifaces); @@ -1441,6 +1447,7 @@ static int _unload_module(int fromload) ast_custom_function_unregister(&smdi_msg_function); } + smdi_loaded = 0; return 0; } |