Add a warning when trying to activate bulktransferts on an SNMP v1 host -- fix formating

[collectd.git] / src / snmp.c

diff --git a/src/snmp.c b/src/snmp.c
index 322e0a3..8ff4009 100644 (file)
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -764,7 +764,7 @@ static int csnmp_config_add_host(oconfig_item_t *ci) {
   /* These mean that we have not set a timeout or retry value */
   hd->timeout = 0;
   hd->retries = -1;
-  hd->build_size = 0;
+  hd->bulk_size = 0;
 
   for (int i = 0; i < ci->children_num; i++) {
     oconfig_item_t *option = ci->children + i;
@@ -821,6 +821,11 @@ static int csnmp_config_add_host(oconfig_item_t *ci) {
       status = -1;
       break;
     }
+    if (hd->bulk_size > 0 && hd->version < 2) {
+      WARNING("snmp plugin: Bulk transferts is only available for snmp v2 and "
+              "later, host '%s' is configured as version '%d'",
+              hd->name, hd->version);
+    }
     if (hd->version == 3) {
       if (hd->username == NULL) {
         WARNING("snmp plugin: `Username' not given for host `%s'", hd->name);
@@ -1577,7 +1582,7 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
   csnmp_oid_type_t oid_list_todo[oid_list_len];
 
   int status;
-  size_t i,j;
+  size_t i, j;
 
   /* `value_list_head' and `value_cells_tail' implement a linked list for each
    * value. `instance_cells_head' and `instance_cells_tail' implement a linked
@@ -1593,8 +1598,8 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
   csnmp_cell_value_t **value_cells_head;
   csnmp_cell_value_t **value_cells_tail;
 
-  DEBUG("snmp plugin: csnmp_read_table (host = %s, data = %s (%ld))", host->name,
-        data->name, data->values_len);
+  DEBUG("snmp plugin: csnmp_read_table (host = %s, data = %s)", host->name,
+        data->name);
 
   if (host->sess_handle == NULL) {
     DEBUG("snmp plugin: csnmp_read_table: host->sess_handle == NULL");
@@ -1696,10 +1701,10 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
     }
 
     if (req->command == SNMP_MSG_GETBULK) {
-        /* In bulk mode the host will send 'max_repetitions' values per
-           requested variable, so we need to split it per number of variable
-           to stay 'in budget' */
-        req->max_repetitions = floor(host->bulk_size/oid_list_todo_num);
+      /* In bulk mode the host will send 'max_repetitions' values per
+         requested variable, so we need to split it per number of variable
+         to stay 'in budget' */
+      req->max_repetitions = floor(host->bulk_size / oid_list_todo_num);
     }
 
     res = NULL;
@@ -1783,7 +1788,8 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
       }
       /* Calculate value index from todo list */
       while ((i < oid_list_len) && !oid_list_todo[i]) {
-        i++; j++;
+        i++;
+        j++;
       }
       if (i >= oid_list_len) {
         break;