X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flibcollectdclient%2Fnetwork.c;h=4564fbbe9158c03437f8d81711c4c0ca5e8ce1dd;hb=b81104a423234c04f0eb4ace0ec5e93a363c917a;hp=6b6450c9b785171547c3fef30a50e28acd02340f;hpb=d1483d2e2a9116c233aeaceba99fa58a7e6bdc87;p=collectd.git diff --git a/src/libcollectdclient/network.c b/src/libcollectdclient/network.c index 6b6450c9..4564fbbe 100644 --- a/src/libcollectdclient/network.c +++ b/src/libcollectdclient/network.c @@ -1,6 +1,7 @@ /** * collectd - src/libcollectdclient/network.c - * Copyright (C) 2005-2012 Florian octo Forster + * Copyright (C) 2005-2015 Florian Forster + * Copyright (C) 2010 Max Henkel * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -21,7 +22,8 @@ * DEALINGS IN THE SOFTWARE. * * Authors: - * Florian octo Forster + * Florian Forster + * Max Henkel **/ #include "collectd.h" @@ -41,6 +43,10 @@ # include #endif +#if HAVE_NET_IF_H +# include +#endif + #include "collectd/network.h" #include "collectd/network_buffer.h" @@ -83,6 +89,7 @@ static int server_close_socket (lcc_server_t *srv) /* {{{ */ return (0); close (srv->fd); + srv->fd = -1; free (srv->sa); srv->sa = NULL; srv->sa_len = 0; @@ -101,12 +108,6 @@ static void int_server_destroy (lcc_server_t *srv) /* {{{ */ next = srv->next; - if (srv->fd >= 0) - { - close (srv->fd); - srv->fd = -1; - } - free (srv->node); free (srv->service); free (srv->username); @@ -148,7 +149,6 @@ static int server_open_socket (lcc_server_t *srv) /* {{{ */ if (ai_ptr->ai_family == AF_INET) { - struct sockaddr_in *addr = (struct sockaddr_in *) ai_ptr->ai_addr; int optname; @@ -157,9 +157,8 @@ static int server_open_socket (lcc_server_t *srv) /* {{{ */ else optname = IP_TTL; - setsockopt (srv->fd, IPPROTO_IP, optname, - &srv->ttl, - sizeof (srv->ttl)); + status = setsockopt (srv->fd, IPPROTO_IP, optname, + &srv->ttl, sizeof (srv->ttl)); } else if (ai_ptr->ai_family == AF_INET6) { @@ -172,9 +171,15 @@ static int server_open_socket (lcc_server_t *srv) /* {{{ */ else optname = IPV6_UNICAST_HOPS; - setsockopt (srv->fd, IPPROTO_IPV6, optname, - &srv->ttl, - sizeof (srv->ttl)); + status = setsockopt (srv->fd, IPPROTO_IPV6, optname, + &srv->ttl, sizeof (srv->ttl)); + } + if (status != 0) + { + /* setsockopt failed. */ + close (srv->fd); + srv->fd = -1; + continue; } srv->sa = malloc (ai_ptr->ai_addrlen); @@ -213,7 +218,13 @@ static int server_send_buffer (lcc_server_t *srv) /* {{{ */ memset (buffer, 0, sizeof (buffer)); buffer_size = sizeof (buffer); - lcc_network_buffer_finalize (srv->buffer); + status = lcc_network_buffer_finalize (srv->buffer); + if (status != 0) + { + lcc_network_buffer_initialize (srv->buffer); + return (status); + } + status = lcc_network_buffer_get (srv->buffer, buffer, &buffer_size); lcc_network_buffer_initialize (srv->buffer); @@ -260,10 +271,9 @@ lcc_network_t *lcc_network_create (void) /* {{{ */ { lcc_network_t *net; - net = malloc (sizeof (*net)); + net = calloc (1, sizeof (*net)); if (net == NULL) return (NULL); - memset (net, 0, sizeof (*net)); net->servers = NULL; @@ -288,10 +298,9 @@ lcc_server_t *lcc_server_create (lcc_network_t *net, /* {{{ */ if (service == NULL) service = NET_DEFAULT_PORT; - srv = malloc (sizeof (*srv)); + srv = calloc (1, sizeof (*srv)); if (srv == NULL) return (NULL); - memset (srv, 0, sizeof (*srv)); srv->fd = -1; srv->security_level = NONE; @@ -379,6 +388,81 @@ int lcc_server_set_ttl (lcc_server_t *srv, uint8_t ttl) /* {{{ */ return (0); } /* }}} int lcc_server_set_ttl */ +int lcc_server_set_interface (lcc_server_t *srv, char const *interface) /* {{{ */ +{ + unsigned int if_index; + int status; + + if ((srv == NULL) || (interface == NULL)) + return (EINVAL); + + if_index = if_nametoindex (interface); + if (if_index == 0) + return (ENOENT); + + /* IPv4 multicast */ + if (srv->sa->sa_family == AF_INET) + { + struct sockaddr_in *addr = (struct sockaddr_in *) srv->sa; + + if (IN_MULTICAST (ntohl (addr->sin_addr.s_addr))) + { +#if HAVE_STRUCT_IP_MREQN_IMR_IFINDEX + /* If possible, use the "ip_mreqn" structure which has + * an "interface index" member. Using the interface + * index is preferred here, because of its similarity + * to the way IPv6 handles this. Unfortunately, it + * appears not to be portable. */ + struct ip_mreqn mreq; + + memset (&mreq, 0, sizeof (mreq)); + mreq.imr_multiaddr.s_addr = addr->sin_addr.s_addr; + mreq.imr_address.s_addr = ntohl (INADDR_ANY); + mreq.imr_ifindex = (int) if_index; +#else + struct ip_mreq mreq; + + memset (&mreq, 0, sizeof (mreq)); + mreq.imr_multiaddr.s_addr = addr->sin_addr.s_addr; + mreq.imr_interface.s_addr = ntohl (INADDR_ANY); +#endif + + status = setsockopt (srv->fd, IPPROTO_IP, IP_MULTICAST_IF, + &mreq, sizeof (mreq)); + if (status != 0) + return (status); + + return (0); + } + } + + /* IPv6 multicast */ + if (srv->sa->sa_family == AF_INET6) + { + struct sockaddr_in6 *addr = (struct sockaddr_in6 *) srv->sa; + + if (IN6_IS_ADDR_MULTICAST (&addr->sin6_addr)) + { + status = setsockopt (srv->fd, IPPROTO_IPV6, IPV6_MULTICAST_IF, + &if_index, sizeof (if_index)); + if (status != 0) + return (status); + + return (0); + } + } + + /* else: Not a multicast interface. */ +#if defined(SO_BINDTODEVICE) + status = setsockopt (srv->fd, SOL_SOCKET, SO_BINDTODEVICE, interface, + (socklen_t) (strlen (interface) + 1)); + if (status != 0) + return (-1); +#endif + + return (0); +} /* }}} int lcc_server_set_interface */ + int lcc_server_set_security_level (lcc_server_t *srv, /* {{{ */ lcc_security_level_t level, const char *username, const char *password)