X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsnmp.c;h=1ac65c8e4565352e73d4ea4daaaebfa0ea667915;hb=da9559cff40c0c7e1f0a7b309487eb133cb2b0a8;hp=8faccbe9548088a404eaabe97370027ac12aa5c2;hpb=1eef4102557312f19400b8655f054c4fdb7311e4;p=collectd.git

diff --git a/src/snmp.c b/src/snmp.c
index 8faccbe9..1ac65c8e 100644
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -1327,8 +1327,6 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
 
   status = 0;
   while (status == 0) {
-    int oid_list_todo_num;
-
     req = snmp_pdu_create(SNMP_MSG_GETNEXT);
     if (req == NULL) {
       ERROR("snmp plugin: snmp_pdu_create failed.");
@@ -1336,24 +1334,33 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
       break;
     }
 
-    oid_list_todo_num = 0;
+    size_t oid_list_todo_num = 0;
+    size_t var_idx[oid_list_len];
+    memset(var_idx, 0, sizeof(var_idx));
+
     for (i = 0; i < oid_list_len; i++) {
       /* Do not rerequest already finished OIDs */
       if (!oid_list_todo[i])
         continue;
-      oid_list_todo_num++;
       snmp_add_null_var(req, oid_list[i].oid, oid_list[i].oid_len);
+      var_idx[oid_list_todo_num] = i;
+      oid_list_todo_num++;
     }
 
     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;
 
@@ -1367,8 +1374,6 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
         snmp_free_pdu(res);
       res = NULL;
 
-      /* snmp_synch_response already freed our PDU */
-      req = NULL;
       sfree(errstr);
       csnmp_host_close_session(host);
 
@@ -1410,20 +1415,9 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
       NOTICE("snmp plugin: host %s; data %s: OID `%s` failed: %s", host->name,
              data->name, oid_buffer, snmp_errstring(res->errstat));
 
-      /* Calculate value index from todo list and skip OID found */
-      i = 0;
-      size_t j = 1;
-      for (;;) {
-        while ((i < oid_list_len) && !oid_list_todo[i])
-          i++;
-
-        if (j == res->errindex)
-          break;
-
-        i++;
-        j++;
-      }
-
+      /* Get value index from todo list and skip OID found */
+      assert(res->errindex <= oid_list_todo_num);
+      i = var_idx[res->errindex - 1];
       assert(i < oid_list_len);
       oid_list_todo[i] = 0;
 
@@ -1527,9 +1521,6 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
     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);