[asterisk-commits] russell: trunk r67875 - in /trunk: ./ res/res_snmp.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Jun  6 17:09:58 2007
New Revision: 67875

URL: http://svn.digium.com/view/asterisk?view=rev&rev=67875
Log:
Merged revisions 67872 via svnmerge from 
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)

........

Modified:
    trunk/   (props changed)
    trunk/res/res_snmp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_snmp.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_snmp.c?view=diff&rev=67875&r1=67874&r2=67875
==============================================================================
--- trunk/res/res_snmp.c (original)
+++ trunk/res/res_snmp.c Wed Jun  6 17:09:58 2007
@@ -112,25 +112,7 @@
 	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,
 		);