projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
redis plugin: Fixed bug of Timeout option
[collectd.git]
/
src
/
ipvs.c
diff --git
a/src/ipvs.c
b/src/ipvs.c
index
da67970
..
0afc749
100644
(file)
--- a/
src/ipvs.c
+++ b/
src/ipvs.c
@@
-63,9
+63,7
@@
static struct ip_vs_get_services *ipvs_get_services(void) {
if (getsockopt(sockfd, IPPROTO_IP, IP_VS_SO_GET_INFO, &ipvs_info, &len) ==
-1) {
if (getsockopt(sockfd, IPPROTO_IP, IP_VS_SO_GET_INFO, &ipvs_info, &len) ==
-1) {
- char errbuf[1024];
- log_err("ip_vs_get_services: getsockopt() failed: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ log_err("ip_vs_get_services: getsockopt() failed: %s", STRERRNO);
return NULL;
}
return NULL;
}
@@
-82,9
+80,7
@@
static struct ip_vs_get_services *ipvs_get_services(void) {
if (getsockopt(sockfd, IPPROTO_IP, IP_VS_SO_GET_SERVICES, services, &len) ==
-1) {
if (getsockopt(sockfd, IPPROTO_IP, IP_VS_SO_GET_SERVICES, services, &len) ==
-1) {
- char errbuf[1024];
- log_err("ipvs_get_services: getsockopt failed: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ log_err("ipvs_get_services: getsockopt failed: %s", STRERRNO);
free(services);
return NULL;
free(services);
return NULL;
@@
-111,9
+107,7
@@
static struct ip_vs_get_dests *ipvs_get_dests(struct ip_vs_service_entry *se) {
dests->num_dests = se->num_dests;
if (getsockopt(sockfd, IPPROTO_IP, IP_VS_SO_GET_DESTS, dests, &len) == -1) {
dests->num_dests = se->num_dests;
if (getsockopt(sockfd, IPPROTO_IP, IP_VS_SO_GET_DESTS, dests, &len) == -1) {
- char errbuf[1024];
- log_err("ipvs_get_dests: getsockopt() failed: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ log_err("ipvs_get_dests: getsockopt() failed: %s", STRERRNO);
free(dests);
return NULL;
}
free(dests);
return NULL;
}
@@
-127,9
+121,7
@@
static int cipvs_init(void) {
struct ip_vs_getinfo ipvs_info;
if ((sockfd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) == -1) {
struct ip_vs_getinfo ipvs_info;
if ((sockfd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) == -1) {
- char errbuf[1024];
- log_err("cipvs_init: socket() failed: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ log_err("cipvs_init: socket() failed: %s", STRERRNO);
return -1;
}
return -1;
}
@@
-137,9
+129,7
@@
static int cipvs_init(void) {
if (getsockopt(sockfd, IPPROTO_IP, IP_VS_SO_GET_INFO, &ipvs_info, &len) ==
-1) {
if (getsockopt(sockfd, IPPROTO_IP, IP_VS_SO_GET_INFO, &ipvs_info, &len) ==
-1) {
- char errbuf[1024];
- log_err("cipvs_init: getsockopt() failed: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ log_err("cipvs_init: getsockopt() failed: %s", STRERRNO);
close(sockfd);
sockfd = -1;
return -1;
close(sockfd);
sockfd = -1;
return -1;
@@
-172,8
+162,8
@@
static int get_pi(struct ip_vs_service_entry *se, char *pi, size_t size) {
struct in_addr addr = {.s_addr = se->addr};
int len =
struct in_addr addr = {.s_addr = se->addr};
int len =
- s
s
nprintf(pi, size, "%s_%s%u", inet_ntoa(addr),
-
(se->protocol == IPPROTO_TCP) ? "TCP" : "UDP", ntohs(se->port));
+ 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);
if ((len < 0) || (size <= ((size_t)len))) {
log_err("plugin instance truncated: %s", pi);
@@
-189,7
+179,7
@@
static int get_ti(struct ip_vs_dest_entry *de, char *ti, size_t size) {
struct in_addr addr = {.s_addr = de->addr};
struct in_addr addr = {.s_addr = de->addr};
- int len = s
s
nprintf(ti, size, "%s_%u", inet_ntoa(addr), ntohs(de->port));
+ int len = snprintf(ti, size, "%s_%u", inet_ntoa(addr), ntohs(de->port));
if ((len < 0) || (size <= ((size_t)len))) {
log_err("type instance truncated: %s", ti);
if ((len < 0) || (size <= ((size_t)len))) {
log_err("type instance truncated: %s", ti);