check_snmp: Fix number processing (offset + multiplier)

3 files changed, 62 insertions, 13 deletions

diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index a939f078..0a9c6752 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -286,9 +286,21 @@ int main(int argc, char **argv) {
                         }
                         struct counter64 tmp = *(vars->val.counter64);
                         uint64_t counter = (tmp.high << 32) + tmp.low;
-                        counter *= (uint64_t)config.multiplier;
-                        counter += (uint64_t)config.offset;
-                        pd_result_val = mp_create_pd_value(counter);
+
+                        if (config.multiplier_set || config.offset_set) {
+                                double processed = 0;
+                                if (config.multiplier_set) {
+                                        processed = (double)counter * config.multiplier;
+                                }
+
+                                if (config.offset_set) {
+                                        processed += config.offset;
+                                }
+                                pd_result_val = mp_create_pd_value(processed);
+                        } else {
+                                pd_result_val = mp_create_pd_value(counter);
+                        }
+
                 } break;
                 /* Numerical values */
                 case ASN_GAUGE: // same as ASN_UNSIGNED
@@ -299,10 +311,20 @@ int main(int argc, char **argv) {
                                 printf("Debug: Got a Integer like\n");
                         }
                         unsigned long tmp = (unsigned long)*(vars->val.integer);
-                        tmp *= (unsigned long)config.multiplier;
 
-                        tmp += (unsigned long)config.offset;
-                        pd_result_val = mp_create_pd_value(tmp);
+                        if (config.multiplier_set || config.offset_set) {
+                                double processed = 0;
+                                if (config.multiplier_set) {
+                                        processed = (double)tmp * config.multiplier;
+                                }
+
+                                if (config.offset_set) {
+                                        processed += config.offset;
+                                }
+                                pd_result_val = mp_create_pd_value(processed);
+                        } else {
+                                pd_result_val = mp_create_pd_value(tmp);
+                        }
                         break;
                 }
                 case ASN_INTEGER: {
@@ -311,19 +333,36 @@ int main(int argc, char **argv) {
                         }
 
                         long tmp = *(vars->val.integer);
-                        tmp *= (long)config.multiplier;
-                        tmp += (long)config.offset;
 
-                        pd_result_val = mp_create_pd_value(tmp);
+                        if (config.multiplier_set || config.offset_set) {
+                                double processed = 0;
+                                if (config.multiplier_set) {
+                                        processed = (double)tmp * config.multiplier;
+                                }
+
+                                if (config.offset_set) {
+                                        processed += config.offset;
+                                }
+                                pd_result_val = mp_create_pd_value(processed);
+                        } else {
+                                pd_result_val = mp_create_pd_value(tmp);
+                        }
+
                 } break;
                 case ASN_FLOAT: {
                         if (verbose) {
                                 printf("Debug: Got a float\n");
                         }
                         double tmp = *(vars->val.floatVal);
-                        tmp *= config.multiplier;
 
-                        tmp += config.offset;
+                        if (config.multiplier_set) {
+                                tmp *= config.multiplier;
+                        }
+
+                        if (config.offset_set) {
+                                tmp += config.offset;
+                        }
+
                         pd_result_val = mp_create_pd_value(tmp);
                         break;
                 }
@@ -332,8 +371,14 @@ int main(int argc, char **argv) {
                                 printf("Debug: Got a double\n");
                         }
                         double tmp = *(vars->val.doubleVal);
-                        tmp *= config.multiplier;
-                        tmp += config.offset;
+                        if (config.multiplier_set) {
+                                tmp *= config.multiplier;
+                        }
+
+                        if (config.offset_set) {
+                                tmp += config.offset;
+                        }
+
                         pd_result_val = mp_create_pd_value(tmp);
                         break;
                 }
diff --git a/plugins/check_snmp.d/check_snmp_helpers.c b/plugins/check_snmp.d/check_snmp_helpers.c
index 7725cc18..8f4bcb9c 100644
--- a/plugins/check_snmp.d/check_snmp_helpers.c
+++ b/plugins/check_snmp.d/check_snmp_helpers.c
@@ -97,7 +97,9 @@ check_snmp_config check_snmp_config_init() {
                 .string_cmp_value = "",
 
                 .multiplier = 1.0,
+                .multiplier_set = false,
                 .offset = 0,
+                .offset_set = false,
 
                 .use_perf_data_labels_from_input = false,
         };
diff --git a/plugins/check_snmp.d/config.h b/plugins/check_snmp.d/config.h
index e96dff5c..e68986e2 100644
--- a/plugins/check_snmp.d/config.h
+++ b/plugins/check_snmp.d/config.h
@@ -58,7 +58,9 @@ typedef struct check_snmp_config {
 
         // Modify data
         double multiplier;
+        bool multiplier_set;
         double offset;
+        bool offset_set;
 
         // Modify output
         bool use_perf_data_labels_from_input;