projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
99806e8
)
Merged revisions 640 and 642 from `trunk' to `tags/collectd-3.9.1'
author
octo
<octo>
Fri, 21 Apr 2006 07:05:39 +0000
(07:05 +0000)
committer
octo
<octo>
Fri, 21 Apr 2006 07:05:39 +0000
(07:05 +0000)
src/liboping/liboping.c
patch
|
blob
|
history
src/swap.c
patch
|
blob
|
history
diff --git
a/src/liboping/liboping.c
b/src/liboping/liboping.c
index
57de9b5
..
a85de2e
100644
(file)
--- a/
src/liboping/liboping.c
+++ b/
src/liboping/liboping.c
@@
-87,46
+87,11
@@
# define dprintf(...) /**/
#endif
# define dprintf(...) /**/
#endif
-#define PING_ERRMSG_LEN 256
-
#define PING_DATA "Florian Forster <octo@verplant.org> http://verplant.org/"
#define PING_DATA "Florian Forster <octo@verplant.org> http://verplant.org/"
-struct pinghost
-{
- char *hostname;
- struct sockaddr_storage *addr;
- socklen_t addrlen;
- int addrfamily;
- int fd;
- int ident;
- int sequence;
- struct timeval *timer;
- double latency;
-
- struct pinghost *next;
-};
-
-struct pingobj
-{
- double timeout;
- int ttl;
- int addrfamily;
-
- char errmsg[PING_ERRMSG_LEN];
-
- pinghost_t *head;
-};
-
/*
* private (static) functions
*/
/*
* private (static) functions
*/
-static void ping_set_error (pingobj_t *obj, const char *function,
- const char *message)
-{
- snprintf (obj->errmsg, PING_ERRMSG_LEN, "%s: %s", function, message);
- obj->errmsg[PING_ERRMSG_LEN - 1] = '\0';
-}
-
static int ping_timeval_add (struct timeval *tv1, struct timeval *tv2,
struct timeval *res)
{
static int ping_timeval_add (struct timeval *tv1, struct timeval *tv2,
struct timeval *res)
{
@@
-423,10
+388,7
@@
static int ping_receive_all (pingobj_t *obj)
ptr->latency = -1.0;
if (gettimeofday (&nowtime, NULL) == -1)
ptr->latency = -1.0;
if (gettimeofday (&nowtime, NULL) == -1)
- {
- ping_set_error (obj, "gettimeofday", strerror (errno));
return (-1);
return (-1);
- }
/* Set up timeout */
timeout.tv_sec = (time_t) obj->timeout;
/* Set up timeout */
timeout.tv_sec = (time_t) obj->timeout;
@@
-460,10
+422,7
@@
static int ping_receive_all (pingobj_t *obj)
break;
if (gettimeofday (&nowtime, NULL) == -1)
break;
if (gettimeofday (&nowtime, NULL) == -1)
- {
- ping_set_error (obj, "gettimeofday", strerror (errno));
return (-1);
return (-1);
- }
if (ping_timeval_sub (&endtime, &nowtime, &timeout) == -1)
break;
if (ping_timeval_sub (&endtime, &nowtime, &timeout) == -1)
break;
@@
-475,10
+434,7
@@
static int ping_receive_all (pingobj_t *obj)
status = select (max_readfds + 1, &readfds, NULL, NULL, &timeout);
if (gettimeofday (&nowtime, NULL) == -1)
status = select (max_readfds + 1, &readfds, NULL, NULL, &timeout);
if (gettimeofday (&nowtime, NULL) == -1)
- {
- ping_set_error (obj, "gettimeofday", strerror (errno));
return (-1);
return (-1);
- }
if ((status == -1) && (errno == EINTR))
{
if ((status == -1) && (errno == EINTR))
{
@@
-514,7
+470,7
@@
static int ping_receive_all (pingobj_t *obj)
* +-> ping_send_one_ipv4 *
* `-> ping_send_one_ipv6 *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
* +-> ping_send_one_ipv4 *
* `-> ping_send_one_ipv6 *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-s
tatic s
size_t ping_sendto (pinghost_t *ph, const void *buf, size_t buflen)
+ssize_t ping_sendto (pinghost_t *ph, const void *buf, size_t buflen)
{
ssize_t ret;
{
ssize_t ret;
@@
-758,11
+714,6
@@
static void ping_free (pinghost_t *ph)
/*
* public methods
*/
/*
* public methods
*/
-const char *ping_get_error (pingobj_t *obj)
-{
- return (obj->errmsg);
-}
-
pingobj_t *ping_construct (void)
{
pingobj_t *obj;
pingobj_t *ping_construct (void)
{
pingobj_t *obj;
@@
-771,6
+722,10
@@
pingobj_t *ping_construct (void)
return (NULL);
memset (obj, '\0', sizeof (pingobj_t));
return (NULL);
memset (obj, '\0', sizeof (pingobj_t));
+ obj->timeout = PING_DEF_TIMEOUT;
+ obj->ttl = PING_DEF_TTL;
+ obj->addrfamily = PING_DEF_AF;
+
return (obj);
}
return (obj);
}
@@
-896,7
+851,6
@@
int ping_host_add (pingobj_t *obj, const char *host)
if ((ph->hostname = strdup (host)) == NULL)
{
dprintf ("Out of memory!\n");
if ((ph->hostname = strdup (host)) == NULL)
{
dprintf ("Out of memory!\n");
- ping_set_error (obj, "strdup", strerror (errno));
ping_free (ph);
return (-1);
}
ping_free (ph);
return (-1);
}
@@
-904,17
+858,10
@@
int ping_host_add (pingobj_t *obj, const char *host)
if ((ai_return = getaddrinfo (host, NULL, &ai_hints, &ai_list)) != 0)
{
dprintf ("getaddrinfo failed\n");
if ((ai_return = getaddrinfo (host, NULL, &ai_hints, &ai_list)) != 0)
{
dprintf ("getaddrinfo failed\n");
- ping_set_error (obj, "getaddrinfo",
- (ai_return == EAI_SYSTEM)
- ? strerror (errno)
- : gai_strerror (ai_return));
ping_free (ph);
return (-1);
}
ping_free (ph);
return (-1);
}
- if (ai_list == NULL)
- ping_set_error (obj, "getaddrinfo", "No hosts returned");
-
for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
ph->fd = -1;
for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
ph->fd = -1;
@@
-931,7
+878,6
@@
int ping_host_add (pingobj_t *obj, const char *host)
si->sin_port = htons (ph->ident);
si->sin_addr.s_addr = htonl (INADDR_ANY);
si->sin_port = htons (ph->ident);
si->sin_addr.s_addr = htonl (INADDR_ANY);
- ai_ptr->ai_socktype = SOCK_RAW;
ai_ptr->ai_protocol = IPPROTO_ICMP;
}
else if (ai_ptr->ai_family == AF_INET6)
ai_ptr->ai_protocol = IPPROTO_ICMP;
}
else if (ai_ptr->ai_family == AF_INET6)
@@
-943,18
+889,11
@@
int ping_host_add (pingobj_t *obj, const char *host)
si->sin6_port = htons (ph->ident);
si->sin6_addr = in6addr_any;
si->sin6_port = htons (ph->ident);
si->sin6_addr = in6addr_any;
- ai_ptr->ai_socktype = SOCK_RAW;
ai_ptr->ai_protocol = IPPROTO_ICMPV6;
}
else
{
ai_ptr->ai_protocol = IPPROTO_ICMPV6;
}
else
{
- char errmsg[PING_ERRMSG_LEN];
-
- snprintf (errmsg, PING_ERRMSG_LEN, "Unknown `ai_family': %i", ai_ptr->ai_family);
- errmsg[PING_ERRMSG_LEN - 1] = '\0';
-
- dprintf (errmsg);
- ping_set_error (obj, "getaddrinfo", errmsg);
+ dprintf ("Unknown `ai_family': %i\n", ai_ptr->ai_family);
continue;
}
continue;
}
@@
-962,14
+901,12
@@
int ping_host_add (pingobj_t *obj, const char *host)
if (ph->fd == -1)
{
dprintf ("socket: %s\n", strerror (errno));
if (ph->fd == -1)
{
dprintf ("socket: %s\n", strerror (errno));
- ping_set_error (obj, "socket", strerror (errno));
continue;
}
if (bind (ph->fd, (struct sockaddr *) &sockaddr, sockaddr_len) == -1)
{
dprintf ("bind: %s\n", strerror (errno));
continue;
}
if (bind (ph->fd, (struct sockaddr *) &sockaddr, sockaddr_len) == -1)
{
dprintf ("bind: %s\n", strerror (errno));
- ping_set_error (obj, "bind", strerror (errno));
close (ph->fd);
ph->fd = -1;
continue;
close (ph->fd);
ph->fd = -1;
continue;
@@
-1018,10
+955,7
@@
int ping_host_remove (pingobj_t *obj, const char *host)
}
if (cur == NULL)
}
if (cur == NULL)
- {
- ping_set_error (obj, "ping_host_remove", "Host not found");
return (-1);
return (-1);
- }
if (pre == NULL)
obj->head = cur->next;
if (pre == NULL)
obj->head = cur->next;
diff --git
a/src/swap.c
b/src/swap.c
index
b7fc7ed
..
5812b59
100644
(file)
--- a/
src/swap.c
+++ b/
src/swap.c
@@
-82,8
+82,8
@@
static void swap_submit (unsigned long long swap_used,
{
char buffer[512];
{
char buffer[512];
- if (snprintf (buffer, 512, "
N:%llu:%llu:%llu:%llu", swap_used
,
- swap_free, swap_cached, swap_resv) >= 512)
+ if (snprintf (buffer, 512, "
%u:%llu:%llu:%llu:%llu", (unsigned int) curtime
,
+ swap_
used, swap_
free, swap_cached, swap_resv) >= 512)
return;
plugin_submit (MODULE_NAME, "-", buffer);
return;
plugin_submit (MODULE_NAME, "-", buffer);