char *name;
char *address;
int version;
+ int timeout;
+ int retries;
/* snmpv1/2 options */
char *community;
return 0;
} /* int csnmp_config_add_host_address */
+static int csnmp_config_add_host_timeout(host_definition_t *hd,
+ oconfig_item_t *ci) {
+ int timeout;
+
+ if (ci->values[0].type != OCONFIG_TYPE_NUMBER) {
+ WARNING("snmp plugin: `Timeout' must be a number");
+ return -1;
+ }
+
+ timeout = (int)ci->values[0].value.number;
+ if (timeout < 0) {
+ WARNING("snmp plugin: `Timeout' must not be negative");
+ return -1;
+ }
+
+ /* net-snmp library timeout is in microseconds */
+ hd->timeout = timeout * 1000000;
+
+ return 0;
+} /* int csnmp_config_add_host_timeout */
+
+static int csnmp_config_add_host_retries(host_definition_t *hd,
+ oconfig_item_t *ci) {
+ int retries;
+
+
+ if (ci->values[0].type != OCONFIG_TYPE_NUMBER) {
+ WARNING("snmp plugin: `Retries' must be a number");
+ return -1;
+ }
+
+ retries = (int)ci->values[0].value.number;
+ if (retries < 0) {
+ WARNING("snmp plugin: `Retries' must not be negative");
+ return -1;
+ }
+
+ hd->retries = retries;
+
+ return 0;
+} /* int csnmp_config_add_host_retries */
+
static int csnmp_config_add_host_collect(host_definition_t *host,
oconfig_item_t *ci) {
data_definition_t *data;
status = cf_util_get_string(option, &hd->community);
else if (strcasecmp("Version", option->key) == 0)
status = csnmp_config_add_host_version(hd, option);
+ else if (strcasecmp("Timeout", option->key) == 0)
+ status = csnmp_config_add_host_timeout(hd, option);
+ else if (strcasecmp("Retries", option->key) == 0)
+ status = csnmp_config_add_host_retries(hd, option);
else if (strcasecmp("Collect", option->key) == 0)
csnmp_config_add_host_collect(hd, option);
else if (strcasecmp("Interval", option->key) == 0)
sess.community_len = strlen(host->community);
}
+ /* Set timeout & retries */
+ sess.timeout = host->timeout;
+ sess.retries = host->retries;
+
/* snmp_sess_open will copy the `struct snmp_session *'. */
host->sess_handle = snmp_sess_open(&sess);
if (oid_list_todo_num == 0) {
/* The request is still empty - so we are finished */
DEBUG("snmp plugin: all variables have left their subtree");
+ snmp_free_pdu(req);
status = 0;
break;
}
res = NULL;
status = snmp_sess_synch_response(host->sess_handle, req, &res);
+
+ /* snmp_sess_synch_response always frees our req PDU */
+ req = NULL;
+
if ((status != STAT_SUCCESS) || (res == NULL)) {
char *errstr = NULL;
snmp_free_pdu(res);
res = NULL;
- /* snmp_synch_response already freed our PDU */
- req = NULL;
sfree(errstr);
csnmp_host_close_session(host);
snmp_free_pdu(res);
res = NULL;
- if (req != NULL)
- snmp_free_pdu(req);
- req = NULL;
if (status == 0)
csnmp_dispatch_table(host, data, instance_list_head, value_list_head);