/**
* collectd - src/curl_json.c
* Copyright (C) 2009 Doug MacEachern
- * Copyright (C) 2006-2011 Florian octo Forster
+ * Copyright (C) 2006-2013 Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
typedef struct cj_key_s cj_key_t;
struct cj_key_s /* {{{ */
{
+ unsigned long magic;
char *path;
char *type;
char *instance;
- unsigned long magic;
};
/* }}} */
char *user;
char *pass;
char *credentials;
+ _Bool digest;
_Bool verify_peer;
_Bool verify_host;
char *cacert;
static int cj_cb_map_key (void *ctx, const unsigned char *val,
yajl_len_t len);
-static void cj_cb_inc_array_index (void * ctx, _Bool ignore)
+static void cj_cb_inc_array_index (void *ctx, _Bool update_key)
{
cj_t *db = (cj_t *)ctx;
- if (db->state[db->depth].in_array) {
- if (ignore)
- db->state[db->depth].index++;
- else {
- char name[DATA_MAX_NAME_LEN];
- cj_cb_map_key (ctx, (unsigned char *)name,
- ssnprintf (name, sizeof (name),
- "%d", db->state[db->depth].index++));
- }
+ if (!db->state[db->depth].in_array)
+ return;
+
+ db->state[db->depth].index++;
+
+ if (update_key)
+ {
+ char name[DATA_MAX_NAME_LEN];
+
+ ssnprintf (name, sizeof (name), "%d", db->state[db->depth].index - 1);
+
+ cj_cb_map_key (ctx, (unsigned char *)name, (yajl_len_t) strlen (name));
}
}
static int cj_cb_boolean (void * ctx, int boolVal)
{
- cj_cb_inc_array_index (ctx, 1);
+ cj_cb_inc_array_index (ctx, /* update_key = */ 0);
return (CJ_CB_CONTINUE);
}
static int cj_cb_null (void * ctx)
{
- cj_cb_inc_array_index (ctx, 1);
+ cj_cb_inc_array_index (ctx, /* update_key = */ 0);
return (CJ_CB_CONTINUE);
}
-/* "number" may not be null terminated, so copy it into a buffer before
- * parsing. */
static int cj_cb_number (void *ctx,
const char *number, yajl_len_t number_len)
{
int type;
int status;
+ /* Create a null-terminated version of the string. */
+ memcpy (buffer, number, number_len);
+ buffer[sizeof (buffer) - 1] = 0;
+
if ((key == NULL) || !CJ_IS_KEY (key)) {
if (key != NULL)
- NOTICE ("curl_json plugin: Found \"%.*s\", but the configuration expects"
- " a map.", (int)number_len > number_len ? 0 : (int)number_len,
- number);
- cj_cb_inc_array_index (ctx, 1);
+ NOTICE ("curl_json plugin: Found \"%s\", but the configuration expects"
+ " a map.", buffer);
+ cj_cb_inc_array_index (ctx, /* update_key = */ 0);
return (CJ_CB_CONTINUE);
- } else
- cj_cb_inc_array_index (ctx, 0);
-
- memcpy (buffer, number, number_len);
- buffer[sizeof (buffer) - 1] = 0;
+ } else {
+ cj_cb_inc_array_index (ctx, /* update_key = */ 1);
+ }
type = cj_get_type (key);
status = parse_value (buffer, &vt, type);
return (CJ_CB_CONTINUE);
} /* int cj_cb_number */
-static int cj_cb_map_key (void *ctx, const unsigned char *val,
- yajl_len_t len)
+/* Queries the key-tree of the parent context for "in_name" and, if found,
+ * updates the "key" field of the current context. Otherwise, "key" is set to
+ * NULL. */
+static int cj_cb_map_key (void *ctx,
+ unsigned char const *in_name, yajl_len_t in_name_len)
{
cj_t *db = (cj_t *)ctx;
c_avl_tree_t *tree;
if (tree != NULL)
{
- cj_key_t *value;
+ cj_key_t *value = NULL;
char *name;
+ size_t name_len;
+ /* Create a null-terminated version of the name. */
name = db->state[db->depth].name;
- len = COUCH_MIN(len, sizeof (db->state[db->depth].name)-1);
- sstrncpy (name, (char *)val, len+1);
+ name_len = COUCH_MIN ((size_t) in_name_len,
+ sizeof (db->state[db->depth].name) - 1);
+ memcpy (name, in_name, name_len);
+ name[name_len] = 0;
if (c_avl_get (tree, name, (void *) &value) == 0)
db->state[db->depth].key = value;
static int cj_cb_start_map (void *ctx)
{
- cj_cb_inc_array_index (ctx, 0);
+ cj_cb_inc_array_index (ctx, /* update_key = */ 1);
return cj_cb_start (ctx);
}
static int cj_cb_start_array (void * ctx)
{
cj_t *db = (cj_t *)ctx;
- cj_cb_inc_array_index (ctx, 0);
+ cj_cb_inc_array_index (ctx, /* update_key = */ 1);
if (db->depth+1 < YAJL_MAX_DEPTH) {
db->state[db->depth+1].in_array = 1;
db->state[db->depth+1].index = 0;
len = ptr-name;
if (len == 0)
break;
+ len = COUCH_MIN(len, sizeof (ent)-1);
sstrncpy (ent, name, len+1);
if (c_avl_get (tree, ent, (void *) &value) != 0)
curl_easy_setopt (db->curl, CURLOPT_NOSIGNAL, 1L);
curl_easy_setopt (db->curl, CURLOPT_WRITEFUNCTION, cj_curl_callback);
curl_easy_setopt (db->curl, CURLOPT_WRITEDATA, db);
- curl_easy_setopt (db->curl, CURLOPT_USERAGENT,
- PACKAGE_NAME"/"PACKAGE_VERSION);
+ curl_easy_setopt (db->curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT);
curl_easy_setopt (db->curl, CURLOPT_ERRORBUFFER, db->curl_errbuf);
curl_easy_setopt (db->curl, CURLOPT_URL, db->url);
ssnprintf (db->credentials, credentials_size, "%s:%s",
db->user, (db->pass == NULL) ? "" : db->pass);
curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials);
+
+ if (db->digest)
+ {
+ curl_easy_setopt (db->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+ curl_easy_setopt (db->curl, CURLOPT_USERNAME, db->user);
+ curl_easy_setopt (db->curl, CURLOPT_PASSWORD, db->pass);
+ }
}
curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, (long) db->verify_peer);
status = cf_util_get_string (child, &db->user);
else if (db->url && strcasecmp ("Password", child->key) == 0)
status = cf_util_get_string (child, &db->pass);
+ else if (strcasecmp ("Digest", child->key) == 0)
+ status = cf_util_get_boolean (child, &db->digest);
else if (db->url && strcasecmp ("VerifyPeer", child->key) == 0)
status = cf_util_get_boolean (child, &db->verify_peer);
else if (db->url && strcasecmp ("VerifyHost", child->key) == 0)
int status;
long rc;
char *url;
- url = NULL;
- curl_easy_getinfo(db->curl, CURLINFO_EFFECTIVE_URL, &url);
+ url = db->url;
status = curl_easy_perform (db->curl);
if (status != CURLE_OK)
{
ERROR ("curl_json plugin: curl_easy_perform failed with status %i: %s (%s)",
- status, db->curl_errbuf, (url != NULL) ? url : "<null>");
+ status, db->curl_errbuf, url);
return (-1);
}
+ curl_easy_getinfo(db->curl, CURLINFO_EFFECTIVE_URL, &url);
curl_easy_getinfo(db->curl, CURLINFO_RESPONSE_CODE, &rc);
/* The response code is zero if a non-HTTP transport was used. */
projects / collectd.git / blobdiff