[GNUnet-SVN] r21548 - gnunet/src/gns/gnocksy

[gnunet]

Author: schanzen
Date: 2012-05-18 16:40:35 +0200 (Fri, 18 May 2012)
New Revision: 21548

Modified:
   gnunet/src/gns/gnocksy/gnocksy.c
Log:
-fixes


Modified: gnunet/src/gns/gnocksy/gnocksy.c
===================================================================
--- gnunet/src/gns/gnocksy/gnocksy.c    2012-05-18 14:36:12 UTC (rev 21547)
+++ gnunet/src/gns/gnocksy/gnocksy.c    2012-05-18 14:40:35 UTC (rev 21548)
@@ -219,6 +219,7 @@
   struct MHD_Response *response;
   struct socks5_bridge *br = cls;
   CURLcode ret;
+  char* full_url;
 
   if (0 != strcmp (meth, "GET"))
     return MHD_NO;
@@ -235,11 +236,17 @@
 
   if (curl)
   {
-    printf ("url %s\n", br->host);
-    curl_easy_setopt (curl, CURLOPT_URL, br->host);
+    if (-1 == asprintf (&full_url, "%s%s", br->host, url))
+    {
+      printf ("error building url!\n");
+      return MHD_NO;
+    }
+    printf ("url %s\n", full_url);
+    curl_easy_setopt (curl, CURLOPT_URL, full_url);
     curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, &curl_write_data);
     curl_easy_setopt (curl, CURLOPT_WRITEDATA, con);
     ret = curl_easy_perform (curl);
+    free (full_url);
     if (ret == CURLE_OK)
     {
       printf("all good on the curl end\n");
@@ -558,6 +565,7 @@
 
   free (events);
   MHD_stop_daemon (mhd_daemon);
+  curl_easy_cleanup (curl);
   close (sfd);
 
   return EXIT_SUCCESS;