/*
* viking -- GPS Data and Topo Analyzer, Explorer, and Manager
*
- * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
+ * Copyright (C) 2007, Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
+ * Copyright (C) 2007, Quy Tonthat <qtonthat@gmail.com>
+ * Copyright (C) 2009-2010, Jocelyn Jaubert <jocelyn.jaubert@gmail.com>
+ * Copyright (C) 2010, Sven Wegener <sven.wegener@stealer.net>
*
* 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
#include <curl/curl.h>
#include "background.h"
+#include "dir.h"
#include "file.h"
#include "globals.h"
#include "curl_download.h"
-gchar *curl_download_user_agent;
+gchar *curl_download_user_agent = NULL;
/*
* Even if writing to FILE* is supported by libcurl by default,
return fwrite(ptr, size, nmemb, stream);
}
-static size_t curl_get_etag_func(void *ptr, size_t size, size_t nmemb, gchar **stream)
+static size_t curl_get_etag_func(char *ptr, size_t size, size_t nmemb, void *stream)
{
+#define ETAG_KEYWORD "ETag: "
+#define ETAG_LEN (sizeof(ETAG_KEYWORD)-1)
+ gchar **etag = stream;
size_t len = size*nmemb;
- char *str = g_strstr_len(ptr, len, "ETag:");
+ char *str = g_strstr_len((const char*)ptr, len, ETAG_KEYWORD);
if (str) {
- char *etag_str = str + strlen("ETag: ");
- char *end_str = g_strstr_len(etag_str, len, "\n");
+ char *etag_str = str + ETAG_LEN;
+ char *end_str = g_strstr_len(etag_str, len - ETAG_LEN, "\r\n");
if (etag_str && end_str) {
- end_str = '\0';
- *stream = g_strndup(etag_str, len);
+ *etag = g_strndup(etag_str, end_str - etag_str);
+ g_debug("%s: ETAG found: %s", __FUNCTION__, *etag);
}
}
return nmemb;
static gchar *get_cookie_file(gboolean init)
{
static gchar *cookie_file = NULL;
- static GMutex *mutex = NULL;
- if (init) { /* to make sure it's thread safe */
- mutex = g_mutex_new();
+ // Wipe any previous cookies set on startup (for some reason??)
+ // Startup is single threaded so don't care about mutexes
+ if (init) {
static gchar *cookie_fn = "cookies.txt";
const gchar *viking_dir = a_get_viking_dir();
cookie_file = g_build_filename(viking_dir, cookie_fn, NULL);
return NULL;
}
- g_assert(cookie_file != NULL);
-
- g_mutex_lock(mutex);
- if (g_file_test(cookie_file, G_FILE_TEST_EXISTS) == FALSE) { /* file not there */
- gchar * name_tmp = NULL;
- FILE * out_file = tmpfile();
- if (out_file == NULL) {
- // Something wrong with previous call (unsuported?)
- name_tmp = g_strdup_printf("%s.tmp", cookie_file);
- out_file = g_fopen(name_tmp, "w+b");
- }
- CURLcode res;
- CURL *curl = curl_easy_init();
- if (vik_verbose)
- curl_easy_setopt ( curl, CURLOPT_VERBOSE, 1 );
- curl_easy_setopt(curl, CURLOPT_URL, "http://maps.google.com/"); /* google.com sets "PREF" cookie */
- curl_easy_setopt ( curl, CURLOPT_WRITEDATA, out_file );
- curl_easy_setopt ( curl, CURLOPT_WRITEFUNCTION, curl_write_func);
- curl_easy_setopt(curl, CURLOPT_COOKIEJAR, cookie_file);
- res = curl_easy_perform(curl);
- if (res != CURLE_OK) {
- g_warning(_("%s() Curl perform failed: %s"), __PRETTY_FUNCTION__,
- curl_easy_strerror(res));
- g_unlink(cookie_file);
- }
- curl_easy_cleanup(curl);
- fclose(out_file);
- out_file = NULL;
- if (name_tmp != NULL) {
- g_remove(name_tmp);
- g_free(name_tmp);
- name_tmp = NULL;
- }
- }
- g_mutex_unlock(mutex);
-
return(cookie_file);
}
curl_download_user_agent = g_strdup_printf ("%s/%s %s", PACKAGE, VERSION, curl_version());
}
+/* This should to be called from main() to make sure thread safe */
+void curl_download_uninit()
+{
+ curl_global_cleanup();
+}
+
int curl_download_uri ( const char *uri, FILE *f, DownloadMapOptions *options, DownloadFileOptions *file_options, void *handle )
{
CURL *curl;
}
if (vik_verbose)
curl_easy_setopt ( curl, CURLOPT_VERBOSE, 1 );
+ curl_easy_setopt ( curl, CURLOPT_NOSIGNAL, 1 ); // Yep, we're a multi-threaded program so don't let signals mess it up!
+ if ( options != NULL && options->user_pass ) {
+ curl_easy_setopt ( curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY );
+ curl_easy_setopt ( curl, CURLOPT_USERPWD, options->user_pass );
+ }
curl_easy_setopt ( curl, CURLOPT_URL, uri );
curl_easy_setopt ( curl, CURLOPT_WRITEDATA, f );
curl_easy_setopt ( curl, CURLOPT_WRITEFUNCTION, curl_write_func);
if (options->use_etag) {
if (file_options->etag != NULL) {
/* add an header on the HTTP request */
- char str[50];
- g_snprintf(str, 50, "If-None-Match: %s", file_options->etag);
+ char str[60];
+ g_snprintf(str, 60, "If-None-Match: %s", file_options->etag);
curl_send_headers = curl_slist_append(curl_send_headers, str);
curl_easy_setopt ( curl, CURLOPT_HTTPHEADER , curl_send_headers);
}
else
res = DOWNLOAD_NO_ERROR;
} else {
- g_warning("%s: http response: %ld for uri %s (time_condition = %ld)\n", __FUNCTION__, response, uri, file_options->time_condition);
+ g_warning("%s: http response: %ld for uri %s\n", __FUNCTION__, response, uri);
res = DOWNLOAD_ERROR;
}
} else {
}
if (!handle)
curl_easy_cleanup ( curl );
- if (curl_send_headers)
+ if (curl_send_headers) {
curl_slist_free_all(curl_send_headers);
+ curl_send_headers = NULL;
+ curl_easy_setopt ( curl, CURLOPT_HTTPHEADER , NULL);
+ }
return res;
}
projects / andy / viking.git / blobdiff