X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flibcollectdclient%2Fnetwork.c;h=16293ca09c59a64973b497605d11d23166e7746f;hb=4d370741101aeb037ae52f3529a4a0869e0dc08a;hp=2f296f645691ffc9764b4c6e4f56fb8df63a07e1;hpb=c1219a1c9db2e8400e2ee94b87f86ccd441485d5;p=collectd.git diff --git a/src/libcollectdclient/network.c b/src/libcollectdclient/network.c index 2f296f64..16293ca0 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" @@ -113,9 +119,7 @@ static void int_server_destroy (lcc_server_t *srv) /* {{{ */ static int server_open_socket (lcc_server_t *srv) /* {{{ */ { - struct addrinfo ai_hints = { 0 }; - struct addrinfo *ai_list = NULL; - struct addrinfo *ai_ptr; + struct addrinfo *ai_list; int status; if (srv == NULL) @@ -124,18 +128,18 @@ static int server_open_socket (lcc_server_t *srv) /* {{{ */ if (srv->fd >= 0) server_close_socket (srv); -#ifdef AI_ADDRCONFIG - ai_hints.ai_flags |= AI_ADDRCONFIG; -#endif - ai_hints.ai_family = AF_UNSPEC; - ai_hints.ai_socktype = SOCK_DGRAM; + struct addrinfo ai_hints = { + .ai_family = AF_UNSPEC, + .ai_flags = AI_ADDRCONFIG, + .ai_socktype = SOCK_DGRAM + }; status = getaddrinfo (srv->node, srv->service, &ai_hints, &ai_list); if (status != 0) return (status); assert (ai_list != NULL); - for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) + for (struct addrinfo *ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) { srv->fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol); if (srv->fd < 0) @@ -198,7 +202,7 @@ static int server_open_socket (lcc_server_t *srv) /* {{{ */ static int server_send_buffer (lcc_server_t *srv) /* {{{ */ { - char buffer[LCC_NETWORK_BUFFER_SIZE_DEFAULT]; + char buffer[LCC_NETWORK_BUFFER_SIZE_DEFAULT] = { 0 }; size_t buffer_size; int status; @@ -209,10 +213,15 @@ static int server_send_buffer (lcc_server_t *srv) /* {{{ */ return (status); } - 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); @@ -259,10 +268,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; @@ -287,10 +295,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; @@ -378,6 +385,79 @@ 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 = { + .imr_multiaddr.s_addr = addr->sin_addr.s_addr, + .imr_address.s_addr = ntohl (INADDR_ANY), + .imr_ifindex = (int) if_index + }; +#else + struct ip_mreq mreq = { + .imr_multiaddr.s_addr = addr->sin_addr.s_addr, + .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) @@ -389,12 +469,10 @@ int lcc_server_set_security_level (lcc_server_t *srv, /* {{{ */ int lcc_network_values_send (lcc_network_t *net, /* {{{ */ const lcc_value_list_t *vl) { - lcc_server_t *srv; - if ((net == NULL) || (vl == NULL)) return (EINVAL); - for (srv = net->servers; srv != NULL; srv = srv->next) + for (lcc_server_t *srv = net->servers; srv != NULL; srv = srv->next) server_value_add (srv, vl); return (0);