projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'identity_oidc' of git-int.aisec.fraunhofer.de:sas/gnunet-mirror into...
[oweals/gnunet.git]
/
src
/
gns
/
gnunet-gns-proxy.c
diff --git
a/src/gns/gnunet-gns-proxy.c
b/src/gns/gnunet-gns-proxy.c
index 35f42cdecaa875be7139f55f6662dde1a276841a..3af571eba90a2e7ceb7bf18ca3a5be1d580c8b25 100644
(file)
--- a/
src/gns/gnunet-gns-proxy.c
+++ b/
src/gns/gnunet-gns-proxy.c
@@
-786,6
+786,8
@@
cleanup_s5r (struct Socks5Request *s5r)
/* ************************* HTTP handling with cURL *********************** */
/* ************************* HTTP handling with cURL *********************** */
+static void
+curl_download_prepare ();
/**
* Callback for MHD response generation. This function is called from
/**
* Callback for MHD response generation. This function is called from
@@
-824,6
+826,11
@@
mhd_content_cb (void *cls,
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Pausing MHD download, no data available\n");
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Pausing MHD download, no data available\n");
+ if (NULL != s5r->curl)
+ {
+ curl_easy_pause (s5r->curl, CURLPAUSE_CONT);
+ curl_download_prepare ();
+ }
return 0; /* more data later */
}
if ( (0 == bytes_to_copy) &&
return 0; /* more data later */
}
if ( (0 == bytes_to_copy) &&
@@
-833,6
+840,8
@@
mhd_content_cb (void *cls,
"Completed MHD download\n");
return MHD_CONTENT_READER_END_OF_STREAM;
}
"Completed MHD download\n");
return MHD_CONTENT_READER_END_OF_STREAM;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Writing %lu/%lu bytes\n", bytes_to_copy, s5r->io_len);
GNUNET_memcpy (buf, s5r->io_buf, bytes_to_copy);
memmove (s5r->io_buf,
&s5r->io_buf[bytes_to_copy],
GNUNET_memcpy (buf, s5r->io_buf, bytes_to_copy);
memmove (s5r->io_buf,
&s5r->io_buf[bytes_to_copy],
@@
-865,7
+874,7
@@
check_ssl_certificate (struct Socks5Request *s5r)
const char *name;
s5r->ssl_checked = GNUNET_YES;
const char *name;
s5r->ssl_checked = GNUNET_YES;
- GNUNET_log (GNUNET_ERROR_TYPE_
ERROR
,
+ GNUNET_log (GNUNET_ERROR_TYPE_
DEBUG
,
"Checking SSL certificate\n");
if (CURLE_OK !=
curl_easy_getinfo (s5r->curl,
"Checking SSL certificate\n");
if (CURLE_OK !=
curl_easy_getinfo (s5r->curl,
@@
-1249,7
+1258,8
@@
curl_download_cb (void *ptr, size_t size, size_t nmemb, void* ctx)
if (sizeof (s5r->io_buf) - s5r->io_len < total)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
if (sizeof (s5r->io_buf) - s5r->io_len < total)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Pausing CURL download, not enough space\n");
+ "Pausing CURL download, not enough space %lu %lu %lu\n", sizeof (s5r->io_buf),
+ s5r->io_len, total);
return CURL_WRITEFUNC_PAUSE; /* not enough space */
}
GNUNET_memcpy (&s5r->io_buf[s5r->io_len],
return CURL_WRITEFUNC_PAUSE; /* not enough space */
}
GNUNET_memcpy (&s5r->io_buf[s5r->io_len],
@@
-1833,7
+1843,7
@@
mhd_completed_cb (void *cls,
for (header = s5r->header_head; header != NULL; header = s5r->header_head)
{
GNUNET_CONTAINER_DLL_remove (s5r->header_head,
for (header = s5r->header_head; header != NULL; header = s5r->header_head)
{
GNUNET_CONTAINER_DLL_remove (s5r->header_head,
- s5r->header_
head
,
+ s5r->header_
tail
,
header);
GNUNET_free (header->type);
GNUNET_free (header->value);
header);
GNUNET_free (header->type);
GNUNET_free (header->value);
@@
-2414,6
+2424,8
@@
do_write (void *cls)
if (len <= 0)
{
/* write error: connection closed, shutdown, etc.; just clean up */
if (len <= 0)
{
/* write error: connection closed, shutdown, etc.; just clean up */
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Write Error\n");
cleanup_s5r (s5r);
return;
}
cleanup_s5r (s5r);
return;
}
@@
-3263,13
+3275,13
@@
main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_
OPTION_SET_ULONG
('p',
+ GNUNET_GETOPT_
option_ulong
('p',
"port",
NULL,
gettext_noop ("listen on specified port (default: 7777)"),
&port),
"port",
NULL,
gettext_noop ("listen on specified port (default: 7777)"),
&port),
- GNUNET_GETOPT_
OPTION_STRING
('a',
+ GNUNET_GETOPT_
option_string
('a',
"authority",
NULL,
gettext_noop ("pem file to use as CA"),
"authority",
NULL,
gettext_noop ("pem file to use as CA"),