Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 01:53:02 +01:00
Code Issues Projects Releases Wiki Activity

Add more descriptive curl errors

Browse Source
This commit is contained in:
Jfreegman 2015-10-29 20:16:35 -04:00
parent 368a1465ec
commit 2b4b8c0289
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/name_lookup.c
View File

@ -65,10 +65,17 @@ static struct lookup_thread {
pthread_attr_t attr; pthread_attr_t attr;
} lookup_thread; } lookup_thread;
static int lookup_error(ToxWindow *self, const char *errmsg) static int lookup_error(ToxWindow *self, const char *errmsg, ...)
{ {
char frmt_msg[MAX_STR_SIZE];
va_list args;
va_start(args, errmsg);
vsnprintf(frmt_msg, sizeof(frmt_msg), errmsg, args);
va_end(args);
pthread_mutex_lock(&Winthread.lock); pthread_mutex_lock(&Winthread.lock);
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "name lookup failed: %s", errmsg); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "name lookup failed: %s", frmt_msg);
pthread_mutex_unlock(&Winthread.lock); pthread_mutex_unlock(&Winthread.lock);
return -1; return -1;
@ -285,24 +292,31 @@ void *lookup_thread_func(void *data)
curl_easy_setopt(c_handle, CURLOPT_USERAGENT, "libcurl-agent/1.0"); curl_easy_setopt(c_handle, CURLOPT_USERAGENT, "libcurl-agent/1.0");
curl_easy_setopt(c_handle, CURLOPT_POSTFIELDS, post_data); curl_easy_setopt(c_handle, CURLOPT_POSTFIELDS, post_data);
int ret = curl_easy_setopt(c_handle, CURLOPT_USE_SSL, CURLUSESSL_ALL);
if (curl_easy_setopt(c_handle, CURLOPT_USE_SSL, CURLUSESSL_ALL) != CURLE_OK) { if (ret != CURLE_OK) {
lookup_error(self, "TLS could not be enabled."); lookup_error(self, "TLS could not be enabled (libcurl error %d)", ret);
goto on_exit; goto on_exit;
} }
if (curl_easy_setopt(c_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2) != CURLE_OK) { ret = curl_easy_setopt(c_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2);
lookup_error(self, "TLSv1.2 could not be set.");
if (ret != CURLE_OK) {
lookup_error(self, "TLSv1.2 could not be set (libcurl error %d)", ret);
goto on_exit; goto on_exit;
} }
if (curl_easy_setopt(c_handle, CURLOPT_SSL_CIPHER_LIST, TLS_CIPHER_SUITE_LIST) != CURLE_OK) { ret = curl_easy_setopt(c_handle, CURLOPT_SSL_CIPHER_LIST, TLS_CIPHER_SUITE_LIST);
lookup_error(self, "Failed to set TLS cipher list.");
if (ret != CURLE_OK) {
lookup_error(self, "Failed to set TLS cipher list (libcurl error %d)", ret);
goto on_exit; goto on_exit;
} }
if (curl_easy_perform(c_handle) != CURLE_OK) { ret = curl_easy_perform(c_handle);
lookup_error(self, "https lookup error.");
if (ret != CURLE_OK) {
lookup_error(self, "https lookup error (libcurl error %d)", ret);
goto on_exit; goto on_exit;
} }