Make sure Linux SNMP loops over all ports with peers

Author: Jonas Berg

src/ports/linux/mib/lldpRemManAddrTable.c

@@ -122,22 +122,21 @@ netsnmp_variable_list * lldpRemManAddrTable_get_next_data_point (
    int error;
 
    iterator = (pf_port_iterator_t *)*my_loop_context;
-   port = pf_snmp_get_next_port (iterator);
-   if (port == 0)
-   {
-      return NULL;
-   }
 
-   error = pf_snmp_get_peer_timestamp (pnet, port, &timestamp);
-   if (error)
+   do
    {
-      return NULL;
-   }
-   error = pf_snmp_get_peer_management_address (pnet, port, &address);
-   if (error)
-   {
-      return NULL;
-   }
+      port = pf_snmp_get_next_port (iterator);
+      if (port == 0)
+      {
+         return NULL;
+      }
+
+      error = pf_snmp_get_peer_timestamp (pnet, port, &timestamp);
+      if (error == 0)
+      {
+         error = pf_snmp_get_peer_management_address (pnet, port, &address);
+      }
+   } while (error);
 
    snmp_set_var_typed_integer (idx, ASN_TIMETICKS, timestamp);
    idx = idx->next_variable;

src/ports/linux/mib/lldpRemTable.c

@@ -118,17 +118,17 @@ netsnmp_variable_list * lldpRemTable_get_next_data_point (
    int error;
 
    iterator = (pf_port_iterator_t *)*my_loop_context;
-   port = pf_snmp_get_next_port (iterator);
-   if (port == 0)
-   {
-      return NULL;
-   }
 
-   error = pf_snmp_get_peer_timestamp (pnet, port, &timestamp);
-   if (error)
+   do
    {
-      return NULL;
-   }
+      port = pf_snmp_get_next_port (iterator);
+      if (port == 0)
+      {
+         return NULL;
+      }
+
+      error = pf_snmp_get_peer_timestamp (pnet, port, &timestamp);
+   } while (error);
 
    snmp_set_var_typed_integer (idx, ASN_TIMETICKS, timestamp);
    idx = idx->next_variable;

src/ports/linux/mib/lldpXPnoRemTable.c

@@ -118,17 +118,17 @@ netsnmp_variable_list * lldpXPnoRemTable_get_next_data_point (
    int error;
 
    iterator = (pf_port_iterator_t *)*my_loop_context;
-   port = pf_snmp_get_next_port (iterator);
-   if (port == 0)
-   {
-      return NULL;
-   }
 
-   error = pf_snmp_get_peer_timestamp (pnet, port, &timestamp);
-   if (error)
+   do
    {
-      return NULL;
-   }
+      port = pf_snmp_get_next_port (iterator);
+      if (port == 0)
+      {
+         return NULL;
+      }
+
+      error = pf_snmp_get_peer_timestamp (pnet, port, &timestamp);
+   } while (error);
 
    snmp_set_var_typed_integer (idx, ASN_TIMETICKS, timestamp);
    idx = idx->next_variable;

src/ports/linux/mib/lldpXdot3RemPortTable.c

@@ -120,17 +120,17 @@ netsnmp_variable_list * lldpXdot3RemPortTable_get_next_data_point (
    int error;
 
    iterator = (pf_port_iterator_t *)*my_loop_context;
-   port = pf_snmp_get_next_port (iterator);
-   if (port == 0)
-   {
-      return NULL;
-   }
 
-   error = pf_snmp_get_peer_timestamp (pnet, port, &timestamp);
-   if (error)
+   do
    {
-      return NULL;
-   }
+      port = pf_snmp_get_next_port (iterator);
+      if (port == 0)
+      {
+         return NULL;
+      }
+
+      error = pf_snmp_get_peer_timestamp (pnet, port, &timestamp);
+   } while (error);
 
    snmp_set_var_typed_integer (idx, ASN_TIMETICKS, timestamp);
    idx = idx->next_variable;