Address reviewer's suggestions

diff --git a/src/snmp.c b/src/snmp.c
index 37ee86da06a5275c14e5c93530cb584454b48428..c74d76563166a5017f7730c722f2445d3159db2d 100644 (file)
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -455,7 +455,7 @@ 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) {
+  if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_NUMBER)) {
     WARNING("snmp plugin: `Timeout' must be a number");
     return -1;
   }
@@ -477,7 +477,7 @@ static int csnmp_config_add_host_retries(host_definition_t *hd,
   int retries;
 
 
-  if (ci->values[0].type != OCONFIG_TYPE_NUMBER) {
+  if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_NUMBER)) {
     WARNING("snmp plugin: `Retries' must be a number");
     return -1;
   }
@@ -641,6 +641,10 @@ static int csnmp_config_add_host(oconfig_item_t *ci) {
   hd->sess_handle = NULL;
   hd->interval = 0;
 
+  /* A negative value means that we have not set a timeout or retry value */
+  hd->timeout = -1;
+  hd->retries = -1;
+
   for (int i = 0; i < ci->children_num; i++) {
     oconfig_item_t *option = ci->children + i;
     status = 0;
@@ -851,9 +855,13 @@ static void csnmp_host_open_session(host_definition_t *host) {
     sess.community_len = strlen(host->community);
   }
 
-  /* Set timeout & retries */
-  sess.timeout = host->timeout;
-  sess.retries = host->retries;
+  /* Set timeout & retries, if they have been changed from the default */
+  if (host->timeout >= 0) {
+    sess.timeout = host->timeout;
+  }
+  if (host->retries >= 0) {
+    sess.retries = host->retries;
+  }
 
   /* snmp_sess_open will copy the `struct snmp_session *'. */
   host->sess_handle = snmp_sess_open(&sess);