Skip to content

Commit

Permalink
snmp plugin: Keep track of signedness of ASN values.
Browse files Browse the repository at this point in the history
Prior to this, the signed variant was used when casting to gauge_t. This caused
problems with values larger than 2^31-1, since they were casted to negative
values.

Hopefully fixes GitHub issue #50.
  • Loading branch information
octo committed Mar 11, 2012
1 parent f426ea7 commit b606324
Showing 1 changed file with 22 additions and 5 deletions.
27 changes: 22 additions & 5 deletions src/snmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,9 @@ static value_t csnmp_value_list_to_value (struct variable_list *vl, int type,
value_t ret;
uint64_t tmp_unsigned = 0;
int64_t tmp_signed = 0;
int defined = 1;
_Bool defined = 1;
/* Set to true when the original SNMP type appears to have been signed. */
_Bool prefer_signed = 0;

if ((vl->type == ASN_INTEGER)
|| (vl->type == ASN_UINTEGER)
Expand All @@ -739,7 +741,12 @@ static value_t csnmp_value_list_to_value (struct variable_list *vl, int type,
{
tmp_unsigned = (uint32_t) *vl->val.integer;
tmp_signed = (int32_t) *vl->val.integer;
DEBUG ("snmp plugin: Parsed int32 value is %"PRIi64".", tmp_signed);

if ((vl->type == ASN_INTEGER)
|| (vl->type == ASN_GAUGE))
prefer_signed = 1;

DEBUG ("snmp plugin: Parsed int32 value is %"PRIu64".", tmp_unsigned);
}
else if (vl->type == ASN_COUNTER64)
{
Expand Down Expand Up @@ -828,14 +835,24 @@ static value_t csnmp_value_list_to_value (struct variable_list *vl, int type,
}
else if (type == DS_TYPE_GAUGE)
{
ret.gauge = NAN;
if (defined != 0)
if (!defined)
ret.gauge = NAN;
else if (prefer_signed)
ret.gauge = (scale * tmp_signed) + shift;
else
ret.gauge = (scale * tmp_unsigned) + shift;
}
else if (type == DS_TYPE_DERIVE)
ret.derive = (derive_t) tmp_signed;
{
if (prefer_signed)
ret.derive = (derive_t) tmp_signed;
else
ret.derive = (derive_t) tmp_unsigned;
}
else if (type == DS_TYPE_ABSOLUTE)
{
ret.absolute = (absolute_t) tmp_unsigned;
}
else
{
ERROR ("snmp plugin: csnmp_value_list_to_value: Unknown data source "
Expand Down

0 comments on commit b606324

Please sign in to comment.