[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 configure.in          |    9 ++-
 src/collectd.conf.pod |   17 +++++
 src/network.c         |  185 +++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 206 insertions(+), 5 deletions(-)

New commits:
commit 2048b4ee2c360726f610c321095868a2e87226cd
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Apr 5 16:32:45 2010 +0200

    network plugin: Be more strict when checking the return value of "setsockopt".

commit dbe559f1627d886078d27c59f21f4f6572c00f0b
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Apr 5 16:32:19 2010 +0200

    network plugin: Print a warning when setting the interface on a unicast socket is not possible.

commit b6d95bf9f5713c62286851c1782ac95b2eb2fa21
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Apr 5 16:22:30 2010 +0200

    Build system: Check for the "if_indextoname" function.
    
    Use this information rather than hard-coding "if Linux …"

commit 76489692cb9eef2590d8280a3cefad1c9f9244a2
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Apr 5 16:20:34 2010 +0200

    Build system: Check for "struct ip_mreqn".
    
    Use this rather than hard-coding "if Linux …"

commit 0df36253a21b2eec9784bb6a15ee564559f145c4
Author: Max Henkel <henkel at gmx.at>
Date:   Fri Apr 2 12:41:11 2010 +0200

    network plugin: Interface option moved to Server/Listen block
    
    Hello list!
    
    On Tue, Mar 09, 2010 at 06:17:35PM +0100, Florian Forster wrote:
    [...]
    > On Fri, Feb 26, 2010 at 12:49:02PM +0100, Max Henkel wrote:
    [...]
    > > @@ -2842,6 +2929,8 @@ static int network_config (oconfig_item_t *ci) /* {{{ */
    > >        network_config_add_server (child);
    > >      else if (strcasecmp ("TimeToLive", child->key) == 0)
    > >        network_config_set_ttl (child);
    > > +    else if (strcasecmp ("Interface", child->key) == 0)
    > > +      network_config_set_interface (child);
    > >      else if (strcasecmp ("MaxPacketSize", child->key) == 0)
    > >        network_config_set_buffer_size (child);
    > >      else if (strcasecmp ("Forward", child->key) == 0)
    >
    > Starting with the signing and encryption option, we have <Server> and
    > <Listen> blocks that take socket specific options. It'd be kind of
    > inconsistent with the "TimeToLive" and other options, but maybe adding
    > this to those blocks would be even better. It would enable to forward
    > data from one multicast group on interface-0 to the *same* multicast
    > group on interface-1, which I guess could be useful. But maybe it's an
    > academic case, I dunno.. Thoughts, anyone?
    [...]
    
    This patch provides the configuration possibility inside the
    Server/Listen-block, but I'm unsure if the "int interface" is
    located properly inside the sockent_t.
    
    Best regards,
    
    Max
    
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 9d095a155631f4cf973b9c5a489f81ffbef5263b
Author: Max Henkel <henkel at gmx.at>
Date:   Fri Apr 2 12:40:01 2010 +0200

    network plugin: Bind to device for unicast
    
    Hello list!
    
    On Tue, Mar 09, 2010 at 06:17:35PM +0100, Florian Forster wrote:
    [...]
    > On Fri, Feb 26, 2010 at 12:49:02PM +0100, Max Henkel wrote:
    [...]
    > > +           if (! IN_MULTICAST (ntohl (addr->sin_addr.s_addr)))
    > > +                   return (0);
    >
    > Doesn't it make sense to be able to set the interface in unicast mode,
    > too? For example if the host has multiple default gateways. The
    > socket(7) option "SO_BINDTODEVICE" could be used for this I guess.
    [...]
    
    Thus this patch binds the socket to a specific interface for unicast
    traffic, too. But, as Sebastian already mentioned, the behaviour is
    Linux specific.
    
    Best regards,
    
    Max
    
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 0d5e07999e8769be8f6808c6e7d910277384bb39
Author: Max Henkel <henkel at gmx.at>
Date:   Fri Apr 2 12:39:19 2010 +0200

    network plugin: Added Interface option
    
    Hello list!
    
    Again I'm providing an interface option for the network plugin for
    the manual selection of an incoming or outgoing interface,
    incorporating the changes proposed by Florian and Sebastian.
    
    Please look through it and feedback or suggest new changes! :-)
    
    Best regards,
    
    Max
    
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>