X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fipvs.c;h=0dcc8b364e1ca07c5fc15543b803f6c43de781e7;hb=48efd3deb4c9139fd060ff3d289896e9031bcc7c;hp=760aa3c5598af6a8a96785ec5a83137ae7e484e2;hpb=21ab7512825cf8177d5eee5101344b45d0854610;p=collectd.git diff --git a/src/ipvs.c b/src/ipvs.c index 760aa3c5..0dcc8b36 100644 --- a/src/ipvs.c +++ b/src/ipvs.c @@ -31,27 +31,21 @@ */ #include "collectd.h" + #include "plugin.h" -#include "common.h" +#include "utils/common/common.h" #if HAVE_ARPA_INET_H -# include +#include #endif /* HAVE_ARPA_INET_H */ #if HAVE_NETINET_IN_H -# include +#include #endif /* HAVE_NETINET_IN_H */ -/* this can probably only be found in the kernel sources */ -#if HAVE_LINUX_IP_VS_H -# include -#elif HAVE_NET_IP_VS_H -# include -#elif HAVE_IP_VS_H -# include -#endif /* HAVE_IP_VS_H */ +#include -#define log_err(...) ERROR ("ipvs: " __VA_ARGS__) -#define log_info(...) INFO ("ipvs: " __VA_ARGS__) +#define log_err(...) ERROR("ipvs: " __VA_ARGS__) +#define log_info(...) INFO("ipvs: " __VA_ARGS__) /* * private variables @@ -61,115 +55,98 @@ static int sockfd = -1; /* * libipvs API */ -static struct ip_vs_get_services *ipvs_get_services (void) -{ - struct ip_vs_getinfo ipvs_info; - struct ip_vs_get_services *ret; - - socklen_t len; - - len = sizeof (ipvs_info); - - if (0 != getsockopt (sockfd, IPPROTO_IP, IP_VS_SO_GET_INFO, - (void *)&ipvs_info, &len)) { - char errbuf[1024]; - log_err ("ip_vs_get_services: getsockopt() failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - return NULL; - } - - len = sizeof (*ret) + - sizeof (struct ip_vs_service_entry) * ipvs_info.num_services; - - if (NULL == (ret = malloc (len))) { - log_err ("ipvs_get_services: Out of memory."); - exit (3); - } - - ret->num_services = ipvs_info.num_services; - - if (0 != getsockopt (sockfd, IPPROTO_IP, IP_VS_SO_GET_SERVICES, - (void *)ret, &len)) { - char errbuf[1024]; - log_err ("ipvs_get_services: getsockopt failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - - free(ret); - return NULL; - } - return ret; +static struct ip_vs_get_services *ipvs_get_services(void) { + struct ip_vs_getinfo ipvs_info; + struct ip_vs_get_services *services; + + socklen_t len = sizeof(ipvs_info); + + if (getsockopt(sockfd, IPPROTO_IP, IP_VS_SO_GET_INFO, &ipvs_info, &len) == + -1) { + log_err("ip_vs_get_services: getsockopt() failed: %s", STRERRNO); + return NULL; + } + + len = sizeof(*services) + + sizeof(struct ip_vs_service_entry) * ipvs_info.num_services; + + services = malloc(len); + if (services == NULL) { + log_err("ipvs_get_services: Out of memory."); + return NULL; + } + + services->num_services = ipvs_info.num_services; + + if (getsockopt(sockfd, IPPROTO_IP, IP_VS_SO_GET_SERVICES, services, &len) == + -1) { + log_err("ipvs_get_services: getsockopt failed: %s", STRERRNO); + + free(services); + return NULL; + } + return services; } /* ipvs_get_services */ -static struct ip_vs_get_dests *ipvs_get_dests (struct ip_vs_service_entry *se) -{ - struct ip_vs_get_dests *ret; - socklen_t len; - - len = sizeof (*ret) + sizeof (struct ip_vs_dest_entry) * se->num_dests; - - if (NULL == (ret = malloc (len))) { - log_err ("ipvs_get_dests: Out of memory."); - exit (3); - } - - ret->fwmark = se->fwmark; - ret->protocol = se->protocol; - ret->addr = se->addr; - ret->port = se->port; - ret->num_dests = se->num_dests; - - if (0 != getsockopt (sockfd, IPPROTO_IP, IP_VS_SO_GET_DESTS, - (void *)ret, &len)) { - char errbuf[1024]; - log_err ("ipvs_get_dests: getsockopt() failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - free (ret); - return NULL; - } - return ret; +static struct ip_vs_get_dests *ipvs_get_dests(struct ip_vs_service_entry *se) { + struct ip_vs_get_dests *dests; + + socklen_t len = + sizeof(*dests) + sizeof(struct ip_vs_dest_entry) * se->num_dests; + + dests = malloc(len); + if (dests == NULL) { + log_err("ipvs_get_dests: Out of memory."); + return NULL; + } + + dests->fwmark = se->fwmark; + dests->protocol = se->protocol; + dests->addr = se->addr; + dests->port = se->port; + dests->num_dests = se->num_dests; + + if (getsockopt(sockfd, IPPROTO_IP, IP_VS_SO_GET_DESTS, dests, &len) == -1) { + log_err("ipvs_get_dests: getsockopt() failed: %s", STRERRNO); + free(dests); + return NULL; + } + return dests; } /* ip_vs_get_dests */ /* * collectd plugin API and helper functions */ -static int cipvs_init (void) -{ - struct ip_vs_getinfo ipvs_info; - - socklen_t len; - - if (-1 == (sockfd = socket (AF_INET, SOCK_RAW, IPPROTO_RAW))) { - char errbuf[1024]; - log_err ("cipvs_init: socket() failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - return -1; - } - - len = sizeof (ipvs_info); - - if (0 != getsockopt (sockfd, IPPROTO_IP, IP_VS_SO_GET_INFO, - (void *)&ipvs_info, &len)) { - char errbuf[1024]; - log_err ("cipvs_init: getsockopt() failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - close (sockfd); - sockfd = -1; - return -1; - } - - /* we need IPVS >= 1.1.4 */ - if (ipvs_info.version < ((1 << 16) + (1 << 8) + 4)) { - log_err ("cipvs_init: IPVS version too old (%d.%d.%d < %d.%d.%d)", - NVERSION (ipvs_info.version), 1, 1, 4); - close (sockfd); - sockfd = -1; - return -1; - } - else { - log_info ("Successfully connected to IPVS %d.%d.%d", - NVERSION (ipvs_info.version)); - } - return 0; +static int cipvs_init(void) { + struct ip_vs_getinfo ipvs_info; + + if ((sockfd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) == -1) { + log_err("cipvs_init: socket() failed: %s", STRERRNO); + return -1; + } + + socklen_t len = sizeof(ipvs_info); + + if (getsockopt(sockfd, IPPROTO_IP, IP_VS_SO_GET_INFO, &ipvs_info, &len) == + -1) { + log_err("cipvs_init: getsockopt() failed: %s", STRERRNO); + close(sockfd); + sockfd = -1; + return -1; + } + + /* we need IPVS >= 1.1.4 */ + if (ipvs_info.version < ((1 << 16) + (1 << 8) + 4)) { + log_err("cipvs_init: IPVS version too old (%d.%d.%d < %d.%d.%d)", + NVERSION(ipvs_info.version), 1, 1, 4); + close(sockfd); + sockfd = -1; + return -1; + } else { + log_info("Successfully connected to IPVS %d.%d.%d", + NVERSION(ipvs_info.version)); + } + return 0; } /* cipvs_init */ /* @@ -178,171 +155,136 @@ static int cipvs_init (void) */ /* plugin instance */ -static int get_pi (struct ip_vs_service_entry *se, char *pi, size_t size) -{ - struct in_addr addr; - int len = 0; - - if ((NULL == se) || (NULL == pi)) - return 0; - - addr.s_addr = se->addr; - - /* inet_ntoa() returns a pointer to a statically allocated buffer - * I hope non-glibc systems behave the same */ - len = ssnprintf (pi, size, "%s_%s%u", inet_ntoa (addr), - (se->protocol == IPPROTO_TCP) ? "TCP" : "UDP", - ntohs (se->port)); - - if ((0 > len) || (size <= ((size_t) len))) { - log_err ("plugin instance truncated: %s", pi); - return -1; - } - return 0; +static int get_pi(struct ip_vs_service_entry *se, char *pi, size_t size) { + if ((se == NULL) || (pi == NULL)) + return 0; + + struct in_addr addr = {.s_addr = se->addr}; + + int len = + snprintf(pi, size, "%s_%s%u", inet_ntoa(addr), + (se->protocol == IPPROTO_TCP) ? "TCP" : "UDP", ntohs(se->port)); + + if ((len < 0) || (size <= ((size_t)len))) { + log_err("plugin instance truncated: %s", pi); + return -1; + } + return 0; } /* get_pi */ /* type instance */ -static int get_ti (struct ip_vs_dest_entry *de, char *ti, size_t size) -{ - struct in_addr addr; - int len = 0; - - if ((NULL == de) || (NULL == ti)) - return 0; - - addr.s_addr = de->addr; - - /* inet_ntoa() returns a pointer to a statically allocated buffer - * I hope non-glibc systems behave the same */ - len = ssnprintf (ti, size, "%s_%u", inet_ntoa (addr), - ntohs (de->port)); - - if ((0 > len) || (size <= ((size_t) len))) { - log_err ("type instance truncated: %s", ti); - return -1; - } - return 0; -} /* get_ti */ +static int get_ti(struct ip_vs_dest_entry *de, char *ti, size_t size) { + if ((de == NULL) || (ti == NULL)) + return 0; -static void cipvs_submit_connections (const char *pi, const char *ti, - derive_t value) -{ - value_t values[1]; - value_list_t vl = VALUE_LIST_INIT; + struct in_addr addr = {.s_addr = de->addr}; - values[0].derive = value; + int len = snprintf(ti, size, "%s_%u", inet_ntoa(addr), ntohs(de->port)); - vl.values = values; - vl.values_len = 1; + if ((len < 0) || (size <= ((size_t)len))) { + log_err("type instance truncated: %s", ti); + return -1; + } + return 0; +} /* get_ti */ - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - sstrncpy (vl.plugin, "ipvs", sizeof (vl.plugin)); - sstrncpy (vl.plugin_instance, pi, sizeof (vl.plugin_instance)); - sstrncpy (vl.type, "connections", sizeof (vl.type)); - sstrncpy (vl.type_instance, (NULL != ti) ? ti : "total", - sizeof (vl.type_instance)); +static void cipvs_submit_connections(const char *pi, const char *ti, + derive_t value) { + value_list_t vl = VALUE_LIST_INIT; - plugin_dispatch_values (&vl); - return; -} /* cipvs_submit_connections */ + vl.values = &(value_t){.derive = value}; + vl.values_len = 1; -static void cipvs_submit_if (const char *pi, const char *t, const char *ti, - derive_t rx, derive_t tx) -{ - value_t values[2]; - value_list_t vl = VALUE_LIST_INIT; + sstrncpy(vl.plugin, "ipvs", sizeof(vl.plugin)); + sstrncpy(vl.plugin_instance, pi, sizeof(vl.plugin_instance)); + sstrncpy(vl.type, "connections", sizeof(vl.type)); + sstrncpy(vl.type_instance, (ti != NULL) ? ti : "total", + sizeof(vl.type_instance)); - values[0].derive = rx; - values[1].derive = tx; + plugin_dispatch_values(&vl); +} /* cipvs_submit_connections */ - vl.values = values; - vl.values_len = 2; +static void cipvs_submit_if(const char *pi, const char *t, const char *ti, + derive_t rx, derive_t tx) { + value_t values[] = { + {.derive = rx}, + {.derive = tx}, + }; + value_list_t vl = VALUE_LIST_INIT; - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - sstrncpy (vl.plugin, "ipvs", sizeof (vl.plugin)); - sstrncpy (vl.plugin_instance, pi, sizeof (vl.plugin_instance)); - sstrncpy (vl.type, t, sizeof (vl.type)); - sstrncpy (vl.type_instance, (NULL != ti) ? ti : "total", - sizeof (vl.type_instance)); + vl.values = values; + vl.values_len = STATIC_ARRAY_SIZE(values); - plugin_dispatch_values (&vl); - return; + sstrncpy(vl.plugin, "ipvs", sizeof(vl.plugin)); + sstrncpy(vl.plugin_instance, pi, sizeof(vl.plugin_instance)); + sstrncpy(vl.type, t, sizeof(vl.type)); + sstrncpy(vl.type_instance, (ti != NULL) ? ti : "total", + sizeof(vl.type_instance)); + + plugin_dispatch_values(&vl); } /* cipvs_submit_if */ -static void cipvs_submit_dest (const char *pi, struct ip_vs_dest_entry *de) -{ - struct ip_vs_stats_user stats = de->stats; +static void cipvs_submit_dest(const char *pi, struct ip_vs_dest_entry *de) { + struct ip_vs_stats_user stats = de->stats; - char ti[DATA_MAX_NAME_LEN]; + char ti[DATA_MAX_NAME_LEN]; - if (0 != get_ti (de, ti, sizeof (ti))) - return; + if (get_ti(de, ti, sizeof(ti)) != 0) + return; - cipvs_submit_connections (pi, ti, stats.conns); - cipvs_submit_if (pi, "if_packets", ti, stats.inpkts, stats.outpkts); - cipvs_submit_if (pi, "if_octets", ti, stats.inbytes, stats.outbytes); - return; + cipvs_submit_connections(pi, ti, stats.conns); + cipvs_submit_if(pi, "if_packets", ti, stats.inpkts, stats.outpkts); + cipvs_submit_if(pi, "if_octets", ti, stats.inbytes, stats.outbytes); } /* cipvs_submit_dest */ -static void cipvs_submit_service (struct ip_vs_service_entry *se) -{ - struct ip_vs_stats_user stats = se->stats; - struct ip_vs_get_dests *dests = ipvs_get_dests (se); - - char pi[DATA_MAX_NAME_LEN]; +static void cipvs_submit_service(struct ip_vs_service_entry *se) { + struct ip_vs_stats_user stats = se->stats; + struct ip_vs_get_dests *dests = ipvs_get_dests(se); - size_t i; + char pi[DATA_MAX_NAME_LEN]; - if (0 != get_pi (se, pi, sizeof (pi))) - { - free (dests); - return; - } + if (get_pi(se, pi, sizeof(pi)) != 0) { + free(dests); + return; + } - cipvs_submit_connections (pi, NULL, stats.conns); - cipvs_submit_if (pi, "if_packets", NULL, stats.inpkts, stats.outpkts); - cipvs_submit_if (pi, "if_octets", NULL, stats.inbytes, stats.outbytes); + cipvs_submit_connections(pi, NULL, stats.conns); + cipvs_submit_if(pi, "if_packets", NULL, stats.inpkts, stats.outpkts); + cipvs_submit_if(pi, "if_octets", NULL, stats.inbytes, stats.outbytes); - for (i = 0; i < dests->num_dests; ++i) - cipvs_submit_dest (pi, &dests->entrytable[i]); + for (size_t i = 0; i < dests->num_dests; ++i) + cipvs_submit_dest(pi, &dests->entrytable[i]); - free (dests); - return; + free(dests); + return; } /* cipvs_submit_service */ -static int cipvs_read (void) -{ - struct ip_vs_get_services *services = NULL; - size_t i; +static int cipvs_read(void) { + if (sockfd < 0) + return -1; - if (sockfd < 0) - return (-1); + struct ip_vs_get_services *services = ipvs_get_services(); + if (services == NULL) + return -1; - if (NULL == (services = ipvs_get_services ())) - return -1; + for (size_t i = 0; i < services->num_services; ++i) + cipvs_submit_service(&services->entrytable[i]); - for (i = 0; i < services->num_services; ++i) - cipvs_submit_service (&services->entrytable[i]); - - free (services); - return 0; + free(services); + return 0; } /* cipvs_read */ -static int cipvs_shutdown (void) -{ - if (sockfd >= 0) - close (sockfd); - sockfd = -1; +static int cipvs_shutdown(void) { + if (sockfd >= 0) + close(sockfd); + sockfd = -1; - return 0; + return 0; } /* cipvs_shutdown */ -void module_register (void) -{ - plugin_register_init ("ipvs", cipvs_init); - plugin_register_read ("ipvs", cipvs_read); - plugin_register_shutdown ("ipvs", cipvs_shutdown); - return; +void module_register(void) { + plugin_register_init("ipvs", cipvs_init); + plugin_register_read("ipvs", cipvs_read); + plugin_register_shutdown("ipvs", cipvs_shutdown); + return; } /* module_register */ - -/* vim: set sw=4 ts=4 tw=78 noexpandtab : */