diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-05-18 14:40:35 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-05-18 14:40:35 +0000 |
commit | 5d8ff31556bc2ad731dd43462167ea9249f052c3 (patch) | |
tree | 9e945ec5add6313d4e0154264ea507b8103731d5 | |
parent | 7cde11ee3cae1e8116fae441f6d614aa7a707100 (diff) | |
download | gnunet-5d8ff31556bc2ad731dd43462167ea9249f052c3.tar.gz gnunet-5d8ff31556bc2ad731dd43462167ea9249f052c3.zip |
-fixes
-rw-r--r-- | src/gns/gnocksy/gnocksy.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/gns/gnocksy/gnocksy.c b/src/gns/gnocksy/gnocksy.c index 08e90b371..2f2699955 100644 --- a/src/gns/gnocksy/gnocksy.c +++ b/src/gns/gnocksy/gnocksy.c | |||
@@ -219,6 +219,7 @@ accept_cb (void *cls, | |||
219 | struct MHD_Response *response; | 219 | struct MHD_Response *response; |
220 | struct socks5_bridge *br = cls; | 220 | struct socks5_bridge *br = cls; |
221 | CURLcode ret; | 221 | CURLcode ret; |
222 | char* full_url; | ||
222 | 223 | ||
223 | if (0 != strcmp (meth, "GET")) | 224 | if (0 != strcmp (meth, "GET")) |
224 | return MHD_NO; | 225 | return MHD_NO; |
@@ -235,11 +236,17 @@ accept_cb (void *cls, | |||
235 | 236 | ||
236 | if (curl) | 237 | if (curl) |
237 | { | 238 | { |
238 | printf ("url %s\n", br->host); | 239 | if (-1 == asprintf (&full_url, "%s%s", br->host, url)) |
239 | curl_easy_setopt (curl, CURLOPT_URL, br->host); | 240 | { |
241 | printf ("error building url!\n"); | ||
242 | return MHD_NO; | ||
243 | } | ||
244 | printf ("url %s\n", full_url); | ||
245 | curl_easy_setopt (curl, CURLOPT_URL, full_url); | ||
240 | curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, &curl_write_data); | 246 | curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, &curl_write_data); |
241 | curl_easy_setopt (curl, CURLOPT_WRITEDATA, con); | 247 | curl_easy_setopt (curl, CURLOPT_WRITEDATA, con); |
242 | ret = curl_easy_perform (curl); | 248 | ret = curl_easy_perform (curl); |
249 | free (full_url); | ||
243 | if (ret == CURLE_OK) | 250 | if (ret == CURLE_OK) |
244 | { | 251 | { |
245 | printf("all good on the curl end\n"); | 252 | printf("all good on the curl end\n"); |
@@ -558,6 +565,7 @@ int main ( int argc, char *argv[] ) | |||
558 | 565 | ||
559 | free (events); | 566 | free (events); |
560 | MHD_stop_daemon (mhd_daemon); | 567 | MHD_stop_daemon (mhd_daemon); |
568 | curl_easy_cleanup (curl); | ||
561 | close (sfd); | 569 | close (sfd); |
562 | 570 | ||
563 | return EXIT_SUCCESS; | 571 | return EXIT_SUCCESS; |