Merged revisions 67872 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 6 Jun 2007 22:09:58 +0000 (22:09 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 6 Jun 2007 22:09:58 +0000 (22:09 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r67872 | russell | 2007-06-06 17:08:02 -0500 (Wed, 06 Jun 2007) | 6 lines

Disable reload functionality in res_snmp.  It is not possible to initialize the
snmp library more than once without completely unloading the module and loading
it again.
(issue #9571, reported by hristo, additional helpful debug information from festr,
 patch from me)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67875 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_snmp.c

index b4a9e0f..a0be455 100644 (file)
@@ -112,25 +112,7 @@ static int unload_module(void)
        return ((thread != AST_PTHREADT_NULL) ? pthread_join(thread, NULL) : 0);
 }
 
-static int reload(void)
-{
-       ast_verbose(VERBOSE_PREFIX_1 "Reloading [Sub]Agent Module\n");
-
-       res_snmp_dont_stop = 0;
-       if (thread != AST_PTHREADT_NULL)
-               pthread_join(thread, NULL);
-       thread = AST_PTHREADT_NULL;
-       load_config();
-
-       res_snmp_dont_stop = 1;
-       if (res_snmp_enabled)
-               return ast_pthread_create_background(&thread, NULL, agent_thread, NULL);
-       else
-               return 0;
-}
-
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "SNMP [Sub]Agent for Asterisk",
                .load = load_module,
                .unload = unload_module,
-               .reload = reload,
                );