diff --git a/src/apcups.c b/src/apcups.c
index f5a0deac941f21b745e1bdd7fd7409072889fb3e..cd64426afa01e42125f3b210b7e39dc40f991c12 100644 (file)
--- a/src/apcups.c
+++ b/src/apcups.c
#define BIG_BUF 4096
#define BIG_BUF 4096
-/*
- * Read nbytes from the network.
- * It is possible that the total bytes require in several
- * read requests
- */
-static int read_nbytes (int *fd, char *ptr, int nbytes)
-{
- int nleft;
- int nread;
-
- nleft = nbytes;
- nread = -1;
-
- assert (*fd >= 0);
-
- while ((nleft > 0) && (nread != 0))
- {
- nread = read (*fd, ptr, nleft);
-
- if ((nread < 0) && (errno == EINTR || errno == EAGAIN))
- continue;
-
- if (nread < 0)
- {
- *fd = -1;
- DBG ("Reading from socket failed failed: %s; *fd = -1;", strerror (errno));
- syslog (LOG_ERR, "apcups plugin: Reading from socket failed failed: %s", strerror (errno));
- return (-1);
- }
-
- if (nread == 0)
- {
- DBG ("Received EOF. Closing socket %i.", *fd);
- close (*fd);
- *fd = -1;
- return (nbytes - nleft);
- }
-
- nleft -= nread;
- ptr += nread;
- }
-
- return (nbytes - nleft);
-}
-
-/*
- * Write nbytes to the network.
- * It may require several writes.
- */
-static int write_nbytes (int *fd, void *buf, int buflen)
-{
- int nleft;
- int nwritten;
- char *ptr;
-
- assert (buflen > 0);
- assert (*fd >= 0);
-
- ptr = (char *) buf;
-
- nleft = buflen;
- while (nleft > 0)
- {
- nwritten = write (*fd, ptr, nleft);
-
- if ((nwritten < 0) && ((errno == EAGAIN) || (errno == EINTR)))
- continue;
-
- if (nwritten < 0)
- {
- *fd = -1;
- DBG ("Writing to socket failed: %s; *fd = -1;", strerror (errno));
- syslog (LOG_ERR, "apcups plugin: Writing to socket failed: %s", strerror (errno));
- return (-1);
- }
-
- nleft -= nwritten;
- ptr += nwritten;
- }
-
- /* If we get here, (nleft <= 0) is true */
- return (buflen);
-}
-
#if APCMAIN
/* Close the network connection */
static void net_close (int *fd)
{
#if APCMAIN
/* Close the network connection */
static void net_close (int *fd)
{
- short pktsiz = 0;
+ uint16_t packet_size = 0;
assert (*fd >= 0);
DBG ("Gracefully shutting down socket %i.", *fd);
/* send EOF sentinel */
assert (*fd >= 0);
DBG ("Gracefully shutting down socket %i.", *fd);
/* send EOF sentinel */
- write_nbytes (fd, &pktsiz, sizeof (short));
+ swrite (*fd, (void *) &packet_size, sizeof (packet_size));
close (*fd);
*fd = -1;
close (*fd);
*fd = -1;
if (status != 0) /* `connect(2)' failed */
{
DBG ("connect failed: %s", strerror (errno));
if (status != 0) /* `connect(2)' failed */
{
DBG ("connect failed: %s", strerror (errno));
+ close (sd);
return (-1);
}
return (-1);
}
*/
static int net_recv (int *sockfd, char *buf, int buflen)
{
*/
static int net_recv (int *sockfd, char *buf, int buflen)
{
- int nbytes;
- short pktsiz;
+ uint16_t packet_size;
/* get data size -- in short */
/* get data size -- in short */
- if ((nbytes = read_nbytes (sockfd, (char *) &pktsiz, sizeof (short))) <= 0)
+ if (sread (*sockfd, (void *) &packet_size, sizeof (packet_size)) != 0)
+ {
+ *sockfd = -1;
return (-1);
return (-1);
+ }
- if (nbytes != sizeof (short))
- return (-2);
-
- pktsiz = ntohs (pktsiz);
- if (pktsiz > buflen)
+ packet_size = ntohs (packet_size);
+ if (packet_size > buflen)
{
DBG ("record length too large");
return (-2);
}
{
DBG ("record length too large");
return (-2);
}
- if (pktsiz == 0)
+ if (packet_size == 0)
return (0);
/* now read the actual data */
return (0);
/* now read the actual data */
- if ((nbytes = read_nbytes (sockfd, buf, pktsiz)) <= 0)
- return (-2);
-
- if (nbytes != pktsiz)
- return (-2);
+ if (sread (*sockfd, (void *) buf, packet_size) != 0)
+ {
+ *sockfd = -1;
+ return (-1);
+ }
- return (nbytes);
-} /* static int net_recv (int sockfd, char *buf, int buflen) */
+ return ((int) packet_size);
+} /* static int net_recv (int *sockfd, char *buf, int buflen) */
/*
* Send a message over the network. The send consists of
/*
* Send a message over the network. The send consists of
*/
static int net_send (int *sockfd, char *buff, int len)
{
*/
static int net_send (int *sockfd, char *buff, int len)
{
- int rc;
- short packet_size;
+ uint16_t packet_size;
assert (len > 0);
assert (*sockfd >= 0);
/* send short containing size of data packet */
assert (len > 0);
assert (*sockfd >= 0);
/* send short containing size of data packet */
- packet_size = htons ((short) len);
+ packet_size = htons ((uint16_t) len);
- rc = write_nbytes (sockfd, &packet_size, sizeof (packet_size));
- if (rc != sizeof (packet_size))
+ if (swrite (*sockfd, (void *) &packet_size, sizeof (packet_size)) != 0)
+ {
+ *sockfd = -1;
return (-1);
return (-1);
+ }
/* send data packet */
/* send data packet */
- rc = write_nbytes (sockfd, buff, len);
- if (rc != len)
- return (-1);
+ if (swrite (*sockfd, (void *) buff, len) != 0)
+ {
+ *sockfd = -1;
+ return (-2);
+ }
return (0);
}
return (0);
}
double value;
static int sockfd = -1;
double value;
static int sockfd = -1;
- static unsigned int complain = 0;
+ static complain_t compl;
#if APCMAIN
# define PRINT_VALUE(name, val) printf(" Found property: name = %s; value = %f;\n", name, val)
#if APCMAIN
# define PRINT_VALUE(name, val) printf(" Found property: name = %s; value = %f;\n", name, val)
{
if ((sockfd = net_open (host, NULL, port)) < 0)
{
{
if ((sockfd = net_open (host, NULL, port)) < 0)
{
- /* Complain once every six hours. */
- int complain_step = 21600 / atoi (COLLECTD_STEP);
-
- if ((complain % complain_step) == 0)
- syslog (LOG_ERR, "apcups plugin: Connecting to the apcupsd failed.");
- complain++;
-
+ plugin_complain (LOG_ERR, &compl, "apcups plugin: "
+ "Connecting to the apcupsd failed.");
return (-1);
}
return (-1);
}
- else if (complain > 1)
+ else
{
{
- syslog (LOG_NOTICE, "apcups plugin: Connection re-established to the apcupsd.");
- complain = 0;
+ plugin_relief (LOG_NOTICE, &compl, "apcups plugin: "
+ "Connection re-established to the apcupsd.");
}
}
}
}