char *node;
char *service;
+ int interface;
union
{
* Private variables
*/
static int network_config_ttl = 0;
-static int network_config_interface_idx = 0;
static size_t network_config_packet_size = 1024;
static int network_config_forward = 0;
static int network_config_stats = 0;
static int network_set_interface (const sockent_t *se, const struct addrinfo *ai) /* {{{ */
{
DEBUG ("network plugin: network_set_interface: interface index = %i;",
- network_config_interface_idx);
+ se->interface);
assert (se->type == SOCKENT_TYPE_CLIENT);
if (ai->ai_family == AF_INET)
{
struct sockaddr_in *addr = (struct sockaddr_in *) ai->ai_addr;
+
+ if (IN_MULTICAST (ntohl (addr->sin_addr.s_addr)))
+ {
#if KERNEL_LINUX
- struct ip_mreqn mreq;
+ struct ip_mreqn mreq;
#else
- struct ip_mreq mreq;
+ struct ip_mreq mreq;
#endif
- if (! IN_MULTICAST (ntohl (addr->sin_addr.s_addr)))
- return (0);
-
- mreq.imr_multiaddr.s_addr = addr->sin_addr.s_addr;
+ mreq.imr_multiaddr.s_addr = addr->sin_addr.s_addr;
#if KERNEL_LINUX
- mreq.imr_address.s_addr = ntohl (INADDR_ANY);
- mreq.imr_ifindex = network_config_interface_idx;
+ mreq.imr_address.s_addr = ntohl (INADDR_ANY);
+ mreq.imr_ifindex = se->interface;
#else
- mreq.imr_interface.s_addr = ntohl (INADDR_ANY);
+ mreq.imr_interface.s_addr = ntohl (INADDR_ANY);
#endif
- if (setsockopt (se->data.client.fd, IPPROTO_IP, IP_MULTICAST_IF,
- &mreq, sizeof (mreq)) == -1)
- {
- char errbuf[1024];
- ERROR ("setsockopt: %s",
- sstrerror (errno, errbuf, sizeof (errbuf)));
- return (-1);
+ if (setsockopt (se->data.client.fd, IPPROTO_IP, IP_MULTICAST_IF,
+ &mreq, sizeof (mreq)) == -1)
+ {
+ char errbuf[1024];
+ ERROR ("setsockopt: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ return (-1);
+ }
+
+ return (0);
}
}
else if (ai->ai_family == AF_INET6)
{
struct sockaddr_in6 *addr = (struct sockaddr_in6 *) ai->ai_addr;
- if (! IN6_IS_ADDR_MULTICAST (&addr->sin6_addr))
+ if (IN6_IS_ADDR_MULTICAST (&addr->sin6_addr))
+ {
+ if (setsockopt (se->data.client.fd, IPPROTO_IPV6, IPV6_MULTICAST_IF,
+ &se->interface,
+ sizeof (se->interface)) == -1)
+ {
+ char errbuf[1024];
+ ERROR ("setsockopt: %s",
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
+ return (-1);
+ }
+
return (0);
+ }
+ }
- if (setsockopt (se->data.client.fd, IPPROTO_IPV6, IPV6_MULTICAST_IF,
- &network_config_interface_idx,
- sizeof (network_config_interface_idx)) == -1)
+#if KERNEL_LINUX
+ if (se->interface != 0)
+ {
+ char interface_name[IFNAMSIZ];
+
+ if (if_indextoname (se->interface, interface_name) == NULL)
+ return (-1);
+
+ DEBUG ("network plugin: Binding socket to interface %s", interface_name);
+
+ if (setsockopt (se->data.client.fd, SOL_SOCKET, SO_BINDTODEVICE,
+ interface_name,
+ sizeof(interface_name)) == -1 )
{
char errbuf[1024];
ERROR ("setsockopt: %s",
- sstrerror (errno, errbuf,
- sizeof (errbuf)));
+ sstrerror (errno, errbuf, sizeof (errbuf)));
return (-1);
}
}
+#endif
return (0);
} /* }}} network_set_interface */
-static int network_bind_socket (int fd, const struct addrinfo *ai)
+static int network_bind_socket (int fd, const struct addrinfo *ai, const int interface_idx)
{
int loop = 0;
int yes = 1;
mreq.imr_multiaddr.s_addr = addr->sin_addr.s_addr;
#if KERNEL_LINUX
mreq.imr_address.s_addr = ntohl (INADDR_ANY);
- mreq.imr_ifindex = network_config_interface_idx;
+ mreq.imr_ifindex = interface_idx;
#else
mreq.imr_interface.s_addr = ntohl (INADDR_ANY);
#endif
sizeof (errbuf)));
return (-1);
}
+
+ return (0);
}
}
else if (ai->ai_family == AF_INET6)
* single interface; programs running on
* multihomed hosts may need to join the same
* group on more than one interface.*/
- mreq.ipv6mr_interface = network_config_interface_idx;
+ mreq.ipv6mr_interface = interface_idx;
if (setsockopt (fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,
&loop, sizeof (loop)) == -1)
sizeof (errbuf)));
return (-1);
}
+
+ return (0);
+ }
+ }
+
+#if KERNEL_LINUX
+ /* if a specific interface was set, bind the socket to it. But to avoid
+ * possible problems with multicast routing, only do that for non-multicast
+ * addresses */
+ if (interface_idx != 0)
+ {
+ char interface_name[IFNAMSIZ];
+
+ if (if_indextoname (interface_idx, interface_name) == NULL)
+ return (-1);
+
+ DEBUG ("fd = %i; Binding socket to interface %s", fd, interface_name);
+
+ if (setsockopt (fd, SOL_SOCKET, SO_BINDTODEVICE,
+ interface_name,
+ sizeof(interface_name)) == -1 )
+ {
+ char errbuf[1024];
+ ERROR ("setsockopt: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ return (-1);
}
}
+#endif
return (0);
} /* int network_bind_socket */
se->type = SOCKENT_TYPE_CLIENT;
se->node = NULL;
se->service = NULL;
+ se->interface = 0;
se->next = NULL;
if (type == SOCKENT_TYPE_SERVER)
continue;
}
- status = network_bind_socket (*tmp, ai_ptr);
+ status = network_bind_socket (*tmp, ai_ptr, se->interface);
if (status != 0)
{
close (*tmp);
return (0);
} /* }}} int network_config_set_ttl */
-static int network_config_set_interface (const oconfig_item_t *ci) /* {{{ */
+static int network_config_set_interface (const oconfig_item_t *ci, /* {{{ */
+ int *interface)
{
if ((ci->values_num != 1)
|| (ci->values[0].type != OCONFIG_TYPE_STRING))
return (-1);
}
- network_config_interface_idx = if_nametoindex (ci->values[0].value.string);
+ if (interface == NULL)
+ return (-1);
+
+ *interface = if_nametoindex (ci->values[0].value.string);
return (0);
} /* }}} int network_config_set_interface */
&se->data.server.security_level);
else
#endif /* HAVE_LIBGCRYPT */
+ if (strcasecmp ("Interface", child->key) == 0)
+ network_config_set_interface (child,
+ &se->interface);
+ else
{
WARNING ("network plugin: Option `%s' is not allowed here.",
child->key);
&se->data.client.security_level);
else
#endif /* HAVE_LIBGCRYPT */
+ if (strcasecmp ("Interface", child->key) == 0)
+ network_config_set_interface (child,
+ &se->interface);
+ else
{
WARNING ("network plugin: Option `%s' is not allowed here.",
child->key);
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)
projects / collectd.git / blobdiff