diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-04-28 04:53:20 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-04-28 04:53:20 +0000 |
commit | f491267c88534490d170977cdccca05d7dd85562 (patch) | |
tree | 71e79312f467e73cf5cd3efc211ac7b4b66bb5a7 /channels | |
parent | ff2ca49cd0d44cc7f14a54ceea4029c44cda52ee (diff) |
Merged revisions 114708 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114708 | tilghman | 2008-04-27 23:47:39 -0500 (Sun, 27 Apr 2008) | 5 lines
When modules are embedded, they take on a different name, without the ".so"
extension. Specifically check for this name, when we're checking if a module
is loaded.
(Closes issue #12534)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_gtalk.c | 9 | ||||
-rw-r--r-- | channels/chan_jingle.c | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index ad7034644..c633fbb7e 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -1964,8 +1964,13 @@ static int load_module(void) char *jabber_loaded = ast_module_helper("", "res_jabber.so", 0, 0, 0, 0); free(jabber_loaded); if (!jabber_loaded) { - ast_log(LOG_ERROR, "chan_gtalk.so depends upon res_jabber.so\n"); - return AST_MODULE_LOAD_DECLINE; + /* If embedded, check for a different module name */ + jabber_loaded = ast_module_helper("", "res_jabber", 0, 0, 0, 0); + free(jabber_loaded); + if (!jabber_loaded) { + ast_log(LOG_ERROR, "chan_gtalk.so depends upon res_jabber.so\n"); + return AST_MODULE_LOAD_DECLINE; + } } ASTOBJ_CONTAINER_INIT(>alk_list); diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 39aa46c0c..290352cec 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -1793,8 +1793,13 @@ static int load_module(void) char *jabber_loaded = ast_module_helper("", "res_jabber.so", 0, 0, 0, 0); free(jabber_loaded); if (!jabber_loaded) { - ast_log(LOG_ERROR, "chan_jingle.so depends upon res_jabber.so\n"); - return AST_MODULE_LOAD_DECLINE; + /* Dependency module has a different name, if embedded */ + jabber_loaded = ast_module_helper("", "res_jabber", 0, 0, 0, 0); + free(jabber_loaded); + if (!jabber_loaded) { + ast_log(LOG_ERROR, "chan_jingle.so depends upon res_jabber.so\n"); + return AST_MODULE_LOAD_DECLINE; + } } ASTOBJ_CONTAINER_INIT(&jingle_list); |