summaryrefslogtreecommitdiff
path: root/res/res_snmp.c
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2006-03-25 23:50:09 +0000
committerMark Spencer <markster@digium.com>2006-03-25 23:50:09 +0000
commit9164eac21a1cce9c9f205e7a5a939346de55bf5f (patch)
treead20048993b3cb7000c2f24edc0e013205b48924 /res/res_snmp.c
parentb0ac62573a6282a0114d2b23e5a6f04e472fb051 (diff)
Add micro-http server and abstract manager interface, make snmp not die
on reload. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@14953 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_snmp.c')
-rw-r--r--res/res_snmp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/res/res_snmp.c b/res/res_snmp.c
index e62e6fb05..871a74da6 100644
--- a/res/res_snmp.c
+++ b/res/res_snmp.c
@@ -31,7 +31,7 @@ int res_snmp_agentx_subagent;
int res_snmp_dont_stop;
int res_snmp_enabled;
-static pthread_t thread;
+static pthread_t thread = AST_PTHREADT_NULL;
static int load_config(void)
{
@@ -111,8 +111,9 @@ int reload(void)
ast_verbose(VERBOSE_PREFIX_1 "Reloading [Sub]Agent Module\n");
res_snmp_dont_stop = 0;
- pthread_join(thread, NULL);
-
+ if (thread != AST_PTHREADT_NULL)
+ pthread_join(thread, NULL);
+ thread = AST_PTHREADT_NULL;
load_config();
res_snmp_dont_stop = 1;