aboutsummaryrefslogtreecommitdiff
path: root/src/gns
diff options
context:
space:
mode:
authorMartin Schanzenbach <mschanzenbach@posteo.de>2012-07-09 12:40:58 +0000
committerMartin Schanzenbach <mschanzenbach@posteo.de>2012-07-09 12:40:58 +0000
commit244cfa6605ff9807ffead349e937be3f327257ee (patch)
tree5b844ef817f016573e824490ed3cba349357e135 /src/gns
parentb19a72414f039bc1dd2b7a8206059ca962c8cf1b (diff)
downloadgnunet-244cfa6605ff9807ffead349e937be3f327257ee.tar.gz
gnunet-244cfa6605ff9807ffead349e937be3f327257ee.zip
-add uri values to curl
Diffstat (limited to 'src/gns')
-rw-r--r--src/gns/gnunet-gns-proxy.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 63e94a6ff..f1a756c80 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -368,6 +368,18 @@ is_tld(const char* name, const char* tld)
368 return GNUNET_YES; 368 return GNUNET_YES;
369} 369}
370 370
371static int
372get_uri_val_iter (void *cls,
373 enum MHD_ValueKind kind,
374 const char *key,
375 const char *value)
376{
377 char* buf = cls;
378
379 sprintf (buf+strlen (buf), "?%s=%s", key, value);
380
381 return MHD_YES;
382}
371 383
372/** 384/**
373 * Read HTTP request header field 'Host' 385 * Read HTTP request header field 'Host'
@@ -1408,7 +1420,11 @@ create_response (void *cls,
1408 1420
1409 //FIXME handle 1421 //FIXME handle
1410 if (0 != strcmp (meth, "GET")) 1422 if (0 != strcmp (meth, "GET"))
1423 {
1424 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
1425 "%s NOT IMPLEMENTED!\n", meth);
1411 return MHD_NO; 1426 return MHD_NO;
1427 }
1412 1428
1413 if (0 != *upload_data_size) 1429 if (0 != *upload_data_size)
1414 return MHD_NO; 1430 return MHD_NO;
@@ -1472,11 +1488,17 @@ create_response (void *cls,
1472 if (GNUNET_NO == ctask->mhd->is_ssl) 1488 if (GNUNET_NO == ctask->mhd->is_ssl)
1473 { 1489 {
1474 sprintf (curlurl, "http://%s%s", ctask->host, url); 1490 sprintf (curlurl, "http://%s%s", ctask->host, url);
1491 MHD_get_connection_values (con,
1492 MHD_GET_ARGUMENT_KIND,
1493 &get_uri_val_iter, curlurl);
1475 curl_easy_setopt (ctask->curl, CURLOPT_URL, curlurl); 1494 curl_easy_setopt (ctask->curl, CURLOPT_URL, curlurl);
1476 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1495 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1477 "Adding new curl task for %s\n", curlurl); 1496 "Adding new curl task for %s\n", curlurl);
1478 } 1497 }
1479 strcpy (ctask->url, url); 1498 strcpy (ctask->url, url);
1499 MHD_get_connection_values (con,
1500 MHD_GET_ARGUMENT_KIND,
1501 &get_uri_val_iter, ctask->url);
1480 1502
1481 //curl_easy_setopt (ctask->curl, CURLOPT_URL, curlurl); 1503 //curl_easy_setopt (ctask->curl, CURLOPT_URL, curlurl);
1482 curl_easy_setopt (ctask->curl, CURLOPT_FAILONERROR, 1); 1504 curl_easy_setopt (ctask->curl, CURLOPT_FAILONERROR, 1);