-/*
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
* Conky, a system monitor, based on torsmo
*
* Please see COPYING for details
*
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
#include "conky.h"
#include "logging.h"
#include "ccurl_thread.h"
+#include "text_object.h"
#ifdef DEBUG
#include <assert.h>
size_t size;
} ccurl_memory_t;
+typedef struct _ccurl_headers_t {
+ char *last_modified;
+ char *etag;
+} ccurl_headers_t;
+
/* finds a location based on uri in the list provided */
ccurl_location_t *ccurl_find_location(ccurl_location_t **locations_head, char *uri)
{
while (tail) {
if (tail->uri) free(tail->uri);
if (tail->result) free(tail->result);
+ if (tail->last_modified) free(tail->last_modified);
+ if (tail->etag) free(tail->etag);
last = tail;
tail = tail->next;
free(last);
*locations_head = 0;
}
+/* callback used by curl for parsing the header data */
+size_t ccurl_parse_header_callback(void *ptr, size_t size, size_t nmemb, void *data)
+{
+ size_t realsize = size * nmemb;
+ const char *value = (const char*)ptr;
+ char *end;
+ ccurl_headers_t *headers = (ccurl_headers_t*)data;
+
+ if (strncmp(value, "Last-Modified: ", 15) == EQUAL) {
+ headers->last_modified = strndup(value + 15, realsize - 15);
+ if ((end = strchr(headers->last_modified, '\r')) != NULL) {
+ *end = '\0';
+ }
+ } else if (strncmp(value,"ETag: ", 6) == EQUAL) {
+ headers->etag = strndup(value + 6, realsize - 6);
+ if ((end = strchr(headers->etag, '\r')) != NULL) {
+ *end = '\0';
+ }
+ }
+
+ return realsize;
+}
+
/* callback used by curl for writing the received data */
size_t ccurl_write_memory_callback(void *ptr, size_t size, size_t nmemb, void *data)
{
{
CURL *curl = NULL;
CURLcode res;
+ struct curl_slist *headers = NULL;
// curl temps
ccurl_memory_t chunk;
+ ccurl_headers_t response_headers;
chunk.memory = NULL;
chunk.size = 0;
+ memset(&response_headers, 0, sizeof(ccurl_headers_t));
curl = curl_easy_init();
if (curl) {
DBGP("reading curl data from '%s'", curloc->uri);
curl_easy_setopt(curl, CURLOPT_URL, curloc->uri);
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
+ curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, ccurl_parse_header_callback);
+ curl_easy_setopt(curl, CURLOPT_HEADERDATA, (void *) &response_headers);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, ccurl_write_memory_callback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *) &chunk);
- curl_easy_setopt(curl, CURLOPT_USERAGENT, "conky-curl/1.0");
+ curl_easy_setopt(curl, CURLOPT_USERAGENT, "conky-curl/1.1");
+ curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1000);
+ curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 60);
+
+ if (curloc->last_modified) {
+ const char *header = "If-Modified-Since: ";
+ int len = strlen(header) + strlen(curloc->last_modified) + 1;
+ char *str = (char*) malloc(len);
+ snprintf(str, len, "%s%s", header, curloc->last_modified);
+ headers = curl_slist_append(headers, str);
+ free(str);
+ }
+ if (curloc->etag) {
+ const char *header = "If-None-Match: ";
+ int len = strlen(header) + strlen(curloc->etag) + 1;
+ char *str = (char*) malloc(len);
+ snprintf(str, len, "%s%s", header, curloc->etag);
+ headers = curl_slist_append(headers, str);
+ free(str);
+ }
+ if (headers) {
+ curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
+ }
res = curl_easy_perform(curl);
- if (res == CURLE_OK && chunk.size) {
- timed_thread_lock(curloc->p_timed_thread);
- (*curloc->process_function)(curloc->result, chunk.memory);
- timed_thread_unlock(curloc->p_timed_thread);
+ if (res == CURLE_OK) {
+ long http_status_code;
+
+ if (curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE,
+ &http_status_code) == CURLE_OK) {
+ switch (http_status_code) {
+ case 200:
+ timed_thread_lock(curloc->p_timed_thread);
+ if(curloc->last_modified) {
+ free(curloc->last_modified);
+ curloc->last_modified = NULL;
+ }
+ if(curloc->etag) {
+ free(curloc->etag);
+ curloc->etag = NULL;
+ }
+ if (response_headers.last_modified) {
+ curloc->last_modified =
+ strdup(response_headers.last_modified);
+ }
+ if (response_headers.etag) {
+ curloc->etag = strdup(response_headers.etag);
+ }
+ (*curloc->process_function)(curloc->result, chunk.memory);
+ timed_thread_unlock(curloc->p_timed_thread);
+ break;
+ case 304:
+ break;
+ default:
+ NORM_ERR("curl: no data from server, got HTTP status %ld",
+ http_status_code);
+ break;
+ }
+ } else {
+ NORM_ERR("curl: no HTTP status from server");
+ }
free(chunk.memory);
} else {
- ERR("curl: no data from server");
+ NORM_ERR("curl: could not retrieve data from server");
}
+ if(response_headers.last_modified) {
+ free(response_headers.last_modified);
+ }
+ if(response_headers.etag) {
+ free(response_headers.etag);
+ }
+ curl_slist_free_all(headers);
curl_easy_cleanup(curl);
}
}
(void *)curloc, interval * 1000000);
if (!curloc->p_timed_thread) {
- ERR("curl thread: error creating timed thread");
+ NORM_ERR("curl thread: error creating timed thread");
}
timed_thread_register(curloc->p_timed_thread,
&curloc->p_timed_thread);
if (timed_thread_run(curloc->p_timed_thread)) {
- ERR("curl thread: error running timed thread");
+ NORM_ERR("curl thread: error running timed thread");
}
}
* This is where the $curl section begins.
*/
+struct curl_data {
+ char uri[128];
+ float interval;
+};
+
/* internal location pointer for use by $curl, no touchy */
static ccurl_location_t *ccurl_locations_head = 0;
}
/* straight copy, used by $curl */
-void ccurl_parse_data(void *result, const char *data)
+static void ccurl_parse_data(void *result, const char *data)
{
strncpy(result, data, max_user_text);
}
curloc->process_function = &ccurl_parse_data;
ccurl_init_thread(curloc, interval);
if (!curloc->p_timed_thread) {
- ERR("error setting up curl thread");
+ NORM_ERR("error setting up curl thread");
}
}
timed_thread_unlock(curloc->p_timed_thread);
}
+void curl_parse_arg(struct text_object *obj, const char *arg)
+{
+ int argc;
+ struct curl_data *cd;
+ float interval = 0;
+
+ cd = malloc(sizeof(struct curl_data));
+ memset(cd, 0, sizeof(struct curl_data));
+
+ argc = sscanf(arg, "%127s %f", cd->uri, &interval);
+ if (argc < 1) {
+ free(cd);
+ NORM_ERR("wrong number of arguments for $curl");
+ return;
+ }
+ cd->interval = interval > 0 ? interval * 60 : 15*60;
+ obj->data.opaque = cd;
+}
+
+void curl_print(struct text_object *obj, char *p, int p_max_size)
+{
+ struct curl_data *cd = obj->data.opaque;
+
+ if (!cd || !cd->uri) {
+ NORM_ERR("error processing Curl data");
+ return;
+ }
+ ccurl_process_info(p, p_max_size, cd->uri, cd->interval);
+}
+
+void curl_obj_free(struct text_object *obj)
+{
+ if (obj->data.opaque) {
+ free(obj->data.opaque);
+ obj->data.opaque = NULL;
+ }
+}
projects / monky / blobdiff