diff options
author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-07 09:42:26 +0000 |
---|---|---|
committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-07 09:42:26 +0000 |
commit | 60d857085bec33f2b5f3550cde8d63bb743d1fd6 (patch) | |
tree | 11113c4c9a5a71528e32079c37fde141da6ca8fa /res/res_jabber.c | |
parent | 5198798e6935478655062071f2aff46dfc65b769 (diff) |
If you have a jabber client that uses TLS, refuse unload. Bad fix, but will prevent
crashes while we are trying to find a workaround.
Iksemel development seems to have stalled and we might have to stop using the
TCP/TLS connections in that library and use our own, which would scale better
from a poll/select perspective I guess. It would also make it easier to migrate
to OpenSSL and stop Asterisk from depending on both OpenSSL and GnuTLS.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@68027 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_jabber.c')
-rw-r--r-- | res/res_jabber.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c index b491f5c44..fe895db8b 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -55,6 +55,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define JABBER_CONFIG "jabber.conf" +#ifndef FALSE +#define FALSE 0 +#endif + +#ifndef TRUE +#define TRUE 1 +#endif + /*-- Forward declarations */ static int aji_highest_bit(int number); static void aji_buddy_destroy(struct aji_buddy *obj); @@ -2086,6 +2094,7 @@ static int aji_create_client(char *label, struct ast_variable *var, int debug) ast_copy_string(client->name, label, sizeof(client->name)); ast_copy_string(client->mid, "aaaaa", sizeof(client->mid)); + /* Set default values for the client object */ client->debug = debug; ast_copy_flags(client, &globalflags, AST_FLAGS_ALL); client->port = 5222; @@ -2407,10 +2416,29 @@ static int aji_reload() static int unload_module(void) { + int module_uses_tls = FALSE; + + /* Check if any client use TLS. If that's the case, we can't unload this + module due to a bug in the iksemel library that will cause a crash or + a deadlock. We're trying to find a way to handle this, but in the meantime + we will simply refuse to die... + */ + ASTOBJ_CONTAINER_TRAVERSE(&clients, 1, { + ASTOBJ_RDLOCK(iterator); + if (iterator->usetls) + module_uses_tls = TRUE; + ASTOBJ_UNLOCK(iterator); + }); + if (module_uses_tls) { + ast_log(LOG_ERROR, "Module can't be unloaded due to a bug in the Iksemel library when using TLS.\n"); + return 1; /* You need a forced unload to get rid of this module */ + } + ast_cli_unregister_multiple(aji_cli, sizeof(aji_cli) / sizeof(struct ast_cli_entry)); ast_unregister_application(app_ajisend); ast_unregister_application(app_ajistatus); ast_manager_unregister("JabberSend"); + ASTOBJ_CONTAINER_TRAVERSE(&clients, 1, { ASTOBJ_RDLOCK(iterator); if (option_debug > 2) |