From: Pavel Rochnyack <pavel2000@ngs.ru>
Date: Wed, 27 Sep 2017 12:15:13 +0000 (+0700)
Subject: snmp plugin: Use array instead of cycle in res->errstat check
X-Git-Tag: collectd-5.8.0~72^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=81eeac695e82db28b2e5a38ca0947650c43cf028;p=collectd.git

snmp plugin: Use array instead of cycle in res->errstat check
---

diff --git a/src/snmp.c b/src/snmp.c
index 8faccbe9..bce820e2 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,13 +1334,17 @@ 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) {
@@ -1410,20 +1412,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;