static int buffer_add_value (const char *value, /* {{{ */
char **buffer_ret, size_t *buffer_size_ret)
{
- char temp[4096];
+ char temp[RRD_CMD_MAX];
if (strncmp (value, "N:", 2) == 0)
snprintf (temp, sizeof (temp), "%lu:%s",
static int buffer_add_ulong (const unsigned long value, /* {{{ */
char **buffer_ret, size_t *buffer_size_ret)
{
- char temp[4096];
+ char temp[RRD_CMD_MAX];
snprintf (temp, sizeof (temp), "%lu", value);
temp[sizeof (temp) - 1] = 0;
static int response_read (rrdc_response_t **ret_response) /* {{{ */
{
- rrdc_response_t *ret;
+ rrdc_response_t *ret = NULL;
+ int status = 0;
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t i;
+#define DIE(code) do { status = code; goto err_out; } while(0)
+
if (sh == NULL)
- return (-1);
+ DIE(-1);
ret = (rrdc_response_t *) malloc (sizeof (rrdc_response_t));
if (ret == NULL)
- return (-2);
+ DIE(-2);
memset (ret, 0, sizeof (*ret));
ret->lines = NULL;
ret->lines_num = 0;
buffer_ptr = fgets (buffer, sizeof (buffer), sh);
- if (buffer_ptr == NULL) {
- close_connection();
- return (-3);
- }
+ if (buffer_ptr == NULL)
+ DIE(-3);
+
chomp (buffer);
ret->status = strtol (buffer, &ret->message, 0);
if (buffer == ret->message)
- {
- response_free (ret);
- close_connection();
- return (-4);
- }
+ DIE(-4);
+
/* Skip leading whitespace of the status message */
ret->message += strspn (ret->message, " \t");
{
if (ret->status < 0)
rrd_set_error("rrdcached: %s", ret->message);
- *ret_response = ret;
- return (0);
+ goto out;
}
ret->lines = (char **) malloc (sizeof (char *) * ret->status);
if (ret->lines == NULL)
- {
- response_free (ret);
- close_connection();
- return (-5);
- }
+ DIE(-5);
+
memset (ret->lines, 0, sizeof (char *) * ret->status);
ret->lines_num = (size_t) ret->status;
{
buffer_ptr = fgets (buffer, sizeof (buffer), sh);
if (buffer_ptr == NULL)
- {
- response_free (ret);
- close_connection();
- return (-6);
- }
+ DIE(-6);
+
chomp (buffer);
ret->lines[i] = strdup (buffer);
if (ret->lines[i] == NULL)
- {
- response_free (ret);
- close_connection();
- return (-7);
- }
+ DIE(-7);
}
+out:
*ret_response = ret;
- return (0);
+ fflush(sh);
+ return (status);
+
+err_out:
+ response_free(ret);
+ close_connection();
+ return (status);
+
+#undef DIE
+
} /* }}} rrdc_response_t *response_read */
static int request (const char *buffer, size_t buffer_size, /* {{{ */
return 0;
else if (daemon_addr == NULL)
{
+ char *addr = getenv(ENV_RRDCACHED_ADDRESS);
/* here we have to handle the case i.e.
* UPDATE --daemon ...; UPDATEV (no --daemon) ...
* In other words: we have a cached connection,
* but it is not specified in the current command.
* Daemon is only implied in this case if set in ENV
*/
- if (getenv(ENV_RRDCACHED_ADDRESS) != NULL)
+ if (addr != NULL && strcmp(addr,"") != 0)
return 1;
else
return 0;
break;
} /* for (ai_ptr) */
+ freeaddrinfo(ai_res);
+
return (status);
} /* }}} int rrdc_connect_network */
{
int status = 0;
- if (addr == NULL)
+ if (addr == NULL) {
addr = getenv (ENV_RRDCACHED_ADDRESS);
+ }
- if (addr == NULL)
+ if (addr == NULL || strcmp(addr,"") == 0) {
+ addr = NULL;
return 0;
+ }
pthread_mutex_lock(&lock);
int rrdc_update (const char *filename, int values_num, /* {{{ */
const char * const *values)
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
int rrdc_flush (const char *filename) /* {{{ */
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
rrd_info_t * rrdc_info (const char *filename) /* {{{ */
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
time_t rrdc_last (const char *filename) /* {{{ */
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
time_t rrdc_first (const char *filename, int rraindex) /* {{{ */
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
int argc,
const char **argv)
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
char ***ret_ds_names,
rrd_value_t **ret_data)
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;