Merge branch 'collectd-4.1'

Conflicts:

	ChangeLog

diff --combined ChangeLog
index 49e6c31,928cc8d..d25d3cb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,13 +1,21 @@@
- yyyy-mm-dd, Version 4.1.2
 +yyyy-mm-dd, Version 4.2.0
 +      * collectd: The new config option `Include' lets you include other
 +        configfiles and thus split up your config into smaller parts. This
 +        may be especially interresting for the snmp plugin to keep the data
 +        definitions seperate from the host definitions.
 +      * snmp plugin: Added the options `Scale' and `Shift' to Data-blocks to
 +        correct the values returned by SNMP-agents.
 +
+ 2007-09-28, Version 4.1.2
        * apcups plugin: Fix reporting of the `load percent' data.
+       * wireless plugin: Correct the handling of cards returning signal and
+         noise quality as percentage.
+       * perl plugin: Fix a possible buffer overflow in get_module_name().
+       * build system: Further improve the detection of libraries.
        * netlink plugin: Build issues under some older versions of the Linux
          includes (i. e. Debian Sarge) have been fixed.
+       * snmp plugin: Fix a potential segfault when a host times out. Add
+         support for the `timeticks' type. 
  
  2007-09-12, Version 4.1.1
        * Build system: The detection of `libnetlink' has been improved.
@@@ -46,8 -44,11 +52,11 @@@
        * xmms plugin: The new `xmms' plugin graphs the bitrate and frequency
          of music played with xmms.
  
- yyyy-mm-dd, Version 4.0.9
+ 2007-09-28, Version 4.0.9
        * apcups plugin: Fix reporting of the `load percent' data.
+       * wireless plugin: Correct the handling of cards returning signal and
+         noise quality as percentage.
+       * perl plugin: Fix a possible buffer overflow in get_module_name().
  
  2007-09-12, Version 4.0.8
        * collectd: The `sstrerror' function was improved to work correctly
@@@ -154,6 -155,10 +163,10 @@@
          from collectd, parses them and exits according to Nagios-standards.
        * manpages: The manpages have been improved a lot.
  
+ 2007-09-28, Version 3.11.7
+       * wireless plugin: Correct the handling of cards returning signal and
+         noise quality as percentage.
+ 
  2007-08-31, Version 3.11.6
        * processes plugin: Fix a potential segmentation fault.
  

diff --combined src/snmp.c
index dd3763d,3c8a4fc..ebb9bb7
--- 1/src/snmp.c
--- 2/src/snmp.c
+++ b/src/snmp.c
@@@ -53,8 -53,6 +53,8 @@@ struct data_definition_
    instance_t instance;
    oid_t *values;
    int values_len;
 +  double scale;
 +  double shift;
    struct data_definition_s *next;
  };
  typedef struct data_definition_s data_definition_t;
@@@ -247,34 -245,6 +247,34 @@@ static int csnmp_config_add_data_value
    return (0);
  } /* int csnmp_config_add_data_instance */
  
 +static int csnmp_config_add_data_shift (data_definition_t *dd, oconfig_item_t *ci)
 +{
 +  if ((ci->values_num != 1)
 +      || (ci->values[0].type != OCONFIG_TYPE_NUMBER))
 +  {
 +    WARNING ("snmp plugin: The `Scale' config option needs exactly one number argument.");
 +    return (-1);
 +  }
 +
 +  dd->shift = ci->values[0].value.number;
 +
 +  return (0);
 +} /* int csnmp_config_add_data_shift */
 +
 +static int csnmp_config_add_data_scale (data_definition_t *dd, oconfig_item_t *ci)
 +{
 +  if ((ci->values_num != 1)
 +      || (ci->values[0].type != OCONFIG_TYPE_NUMBER))
 +  {
 +    WARNING ("snmp plugin: The `Scale' config option needs exactly one number argument.");
 +    return (-1);
 +  }
 +
 +  dd->scale = ci->values[0].value.number;
 +
 +  return (0);
 +} /* int csnmp_config_add_data_scale */
 +
  static int csnmp_config_add_data (oconfig_item_t *ci)
  {
    data_definition_t *dd;
@@@ -299,8 -269,6 +299,8 @@@
      free (dd);
      return (-1);
    }
 +  dd->scale = 1.0;
 +  dd->shift = 0.0;
  
    for (i = 0; i < ci->children_num; i++)
    {
@@@ -315,10 -283,6 +315,10 @@@
        status = csnmp_config_add_data_instance (dd, option);
      else if (strcasecmp ("Values", option->key) == 0)
        status = csnmp_config_add_data_values (dd, option);
 +    else if (strcasecmp ("Shift", option->key) == 0)
 +      status = csnmp_config_add_data_shift (dd, option);
 +    else if (strcasecmp ("Scale", option->key) == 0)
 +      status = csnmp_config_add_data_scale (dd, option);
      else
      {
        WARNING ("snmp plugin: Option `%s' not allowed here.", option->key);
@@@ -645,8 -609,8 +645,8 @@@ static void csnmp_host_close_session (h
  
      snmp_sess_error (host->sess_handle, NULL, NULL, &errstr);
  
-     ERROR ("snmp plugin: snmp_sess_close failed: %s",
-       (errstr == NULL) ? "Unknown problem" : errstr);
+     ERROR ("snmp plugin: host %s: snmp_sess_close failed: %s",
+       host->name, (errstr == NULL) ? "Unknown problem" : errstr);
      sfree (errstr);
    }
  
@@@ -675,14 -639,13 +675,14 @@@ static void csnmp_host_open_session (ho
  
      snmp_error (&sess, NULL, NULL, &errstr);
  
-     ERROR ("snmp plugin: snmp_sess_open failed: %s",
-       (errstr == NULL) ? "Unknown problem" : errstr);
+     ERROR ("snmp plugin: host %s: snmp_sess_open failed: %s",
+       host->name, (errstr == NULL) ? "Unknown problem" : errstr);
      sfree (errstr);
    }
  } /* void csnmp_host_open_session */
  
 -static value_t csnmp_value_list_to_value (struct variable_list *vl, int type)
 +static value_t csnmp_value_list_to_value (struct variable_list *vl, int type,
 +    double scale, double shift)
  {
    value_t ret;
    uint64_t temp = 0;
@@@ -691,6 -654,9 +691,9 @@@
    if ((vl->type == ASN_INTEGER)
        || (vl->type == ASN_UINTEGER)
        || (vl->type == ASN_COUNTER)
+ #ifdef ASN_TIMETICKS
+       || (vl->type == ASN_TIMETICKS)
+ #endif
        || (vl->type == ASN_GAUGE))
    {
      temp = (uint32_t) *vl->val.integer;
@@@ -717,7 -683,7 +720,7 @@@
    {
      ret.gauge = NAN;
      if (defined != 0)
 -      ret.gauge = temp;
 +      ret.gauge = (scale * temp) + shift;
    }
  
    return (ret);
@@@ -826,6 -792,12 +829,12 @@@ static int csnmp_read_table (host_defin
    DEBUG ("snmp plugin: csnmp_read_table (host = %s, data = %s)",
        host->name, data->name);
  
+   if (host->sess_handle == NULL)
+   {
+     DEBUG ("snmp plugin: csnmp_read_table: host->sess_handle == NULL");
+     return (-1);
+   }
+ 
    ds = plugin_get_ds (data->type);
    if (!ds)
    {
@@@ -886,8 -858,8 +895,8 @@@
        char *errstr = NULL;
  
        snmp_sess_error (host->sess_handle, NULL, NULL, &errstr);
-       ERROR ("snmp plugin: snmp_sess_synch_response failed: %s",
-         (errstr == NULL) ? "Unknown problem" : errstr);
+       ERROR ("snmp plugin: host %s: snmp_sess_synch_response failed: %s",
+         host->name, (errstr == NULL) ? "Unknown problem" : errstr);
        csnmp_host_close_session (host);
  
        status = -1;
@@@ -947,7 -919,7 +956,7 @@@
      }
      else
      {
 -      value_t val = csnmp_value_list_to_value (vb, DS_TYPE_COUNTER);
 +      value_t val = csnmp_value_list_to_value (vb, DS_TYPE_COUNTER, 1.0, 0.0);
        snprintf (il->instance, sizeof (il->instance),
          "%llu", val.counter);
      }
@@@ -999,8 -971,7 +1008,8 @@@
        if (vt != NULL)
        {
        vt->subid = vb->name[vb->name_length - 1];
 -      vt->value = csnmp_value_list_to_value (vb, ds->ds[i].type);
 +      vt->value = csnmp_value_list_to_value (vb, ds->ds[i].type,
 +          data->scale, data->shift);
        vt->next = NULL;
  
        if (value_table_ptr[i] == NULL)
@@@ -1063,6 -1034,12 +1072,12 @@@ static int csnmp_read_value (host_defin
    DEBUG ("snmp plugin: csnmp_read_value (host = %s, data = %s)",
        host->name, data->name);
  
+   if (host->sess_handle == NULL)
+   {
+     DEBUG ("snmp plugin: csnmp_read_table: host->sess_handle == NULL");
+     return (-1);
+   }
+ 
    ds = plugin_get_ds (data->type);
    if (!ds)
    {
@@@ -1114,8 -1091,8 +1129,8 @@@
      char *errstr = NULL;
  
      snmp_sess_error (host->sess_handle, NULL, NULL, &errstr);
-     ERROR ("snmp plugin: snmp_sess_synch_response failed: %s",
-       (errstr == NULL) ? "Unknown problem" : errstr);
+     ERROR ("snmp plugin: host %s: snmp_sess_synch_response failed: %s",
+       host->name, (errstr == NULL) ? "Unknown problem" : errstr);
      csnmp_host_close_session (host);
      sfree (errstr);
  
@@@ -1134,8 -1111,7 +1149,8 @@@
      for (i = 0; i < data->values_len; i++)
        if (snmp_oid_compare (data->values[i].oid, data->values[i].oid_len,
            vb->name, vb->name_length) == 0)
 -      vl.values[i] = csnmp_value_list_to_value (vb, ds->ds[i].type);
 +      vl.values[i] = csnmp_value_list_to_value (vb, ds->ds[i].type,
 +          data->scale, data->shift);
    } /* for (res->variables) */
  
    snmp_free_pdu (res);
@@@ -1207,7 -1183,10 +1222,10 @@@ static int csnmp_init (void
    int i;
  
    if (host_head == NULL)
+   {
+     NOTICE ("snmp plugin: No host has been defined.");
      return (-1);
+   }
  
    call_snmp_init_once ();
  
@@@ -1242,7 -1221,10 +1260,10 @@@
  
    threads = (pthread_t *) malloc (threads_num * sizeof (pthread_t));
    if (threads == NULL)
+   {
+     ERROR ("snmp plugin: malloc failed.");
      return (-1);
+   }
    memset (threads, '\0', threads_num * sizeof (pthread_t));
  
    for (i = 0; i < threads_num; i++)