2001-09-13
2001-09-13 13:15:19 by Honza Petrous <hop@unibase.cz>
-
79b7c393bbf2becb2bfeb197c67a02a669229c0b
(15 lines)
(+10/-5)
[
Show
| Annotate
]
Branch: 5.2
Fixed some inconsistence in handling start/stop traps.
Synchronized OID numbering with recent MIB db changes.
Rev: server/base_server/configuration.pike:1.488
Rev: server/base_server/roxen.pike:1.739
Rev: server/base_server/snmpagent.pike:1.18
6:
// Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.
// ABS and suicide systems contributed freely by Francesco Chemolli
- constant cvs_version="$Id: roxen.pike,v 1.738 2001/09/12 15:57:33 grubba Exp $";
+ constant cvs_version="$Id: roxen.pike,v 1.739 2001/09/13 13:15:19 hop Exp $";
// The argument cache. Used by the image cache.
ArgCache argcache;
438:
}
if (_recurse++) return;
+ catch(stop_all_configurations());
+
#ifdef SNMP_AGENT
- if(objectp(snmpagent))
+ if(objectp(snmpagent)) {
+ snmpagent->stop_trap();
snmpagent->disable();
-
+ }
#endif
- catch(stop_all_configurations());
-
+
call_out(really_low_shutdown, 0.1, exit_code);
}
4043: Inside #if defined(SNMP_AGENT)
snmpagent = SNMPagent();
snmpagent->enable();
report_debug("\benabled.\n");
- snmpagent->coldstart_trap();
+ snmpagent->start_trap();
} else
report_debug("\bdisabled.\n");
4149: Inside #if defined(SNMP_AGENT)
report_notice("SNMPagent enabling ...\n");
snmpagent = SNMPagent();
snmpagent->enable();
+ snmpagent->start_trap();
}
if (!value && objectp(snmpagent)) {
report_notice("SNMPagent disabling ...\n");
-
+ snmpagent->stop_trap();
snmpagent->disable();
snmpagent = 0;
}