commit 508784b4a98364d120448e132a046423ec78541f
parent c92893e0b0be2b93f2fb15e7f5bffab214c890c3
Author: Phil <phil.buschmann@tum.de>
Date: Thu, 7 Dec 2017 13:54:14 +0000
-merge
Diffstat:
7 files changed, 100 insertions(+), 17 deletions(-)
diff --git a/src/cadet/gnunet-service-cadet_paths.c b/src/cadet/gnunet-service-cadet_paths.c
@@ -179,7 +179,7 @@ GCPP_del_connection (struct CadetPeerPath *path,
GCC_2s (cc),
GCPP_2s (path),
off);
- GNUNET_assert (off < path->entries_length); /* FIXME: This assertion fails sometimes! */
+ GNUNET_assert (off < path->entries_length); /* FIXME: #4909: This assertion fails sometimes! */
entry = path->entries[off];
GNUNET_assert (cc == entry->cc);
entry->cc = NULL;
@@ -428,13 +428,14 @@ extend_path (struct CadetPeerPath *path,
path->entries_length = old_len + i + 1;
recalculate_path_desirability (path);
+ if (NULL != entry->cc)
+ force = GNUNET_YES;
path->hn = GCP_attach_path (peers[i],
path,
old_len + (unsigned int) i,
force);
if (NULL != path->hn)
break;
- GNUNET_assert (NULL == entry->cc);
GCP_path_entry_remove (entry->peer,
entry,
old_len + i);
diff --git 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 *********************** */
+static void
+curl_download_prepare ();
/**
* 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");
+ if (NULL != s5r->curl)
+ {
+ curl_easy_pause (s5r->curl, CURLPAUSE_CONT);
+ curl_download_prepare ();
+ }
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;
}
+ 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],
@@ -865,7 +874,7 @@ check_ssl_certificate (struct Socks5Request *s5r)
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,
@@ -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,
- "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],
@@ -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,
- s5r->header_head,
+ s5r->header_tail,
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 */
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Write Error\n");
cleanup_s5r (s5r);
return;
}
diff --git a/src/identity-provider/logfile.txt b/src/identity-provider/logfile.txt
@@ -0,0 +1,73 @@
+*** Error in `/usr/local/lib//gnunet/libexec/gnunet-rest-server': free(): invalid pointer: 0x00007f9c415c9275 ***
+*** Error in `/usr/local/lib//gnunet/libexec/gnunet-rest-server': free(): invalid pointer: 0x00007f0888c25275 ***
+*** Error in `/usr/local/lib//gnunet/libexec/gnunet-rest-server': free(): invalid pointer: 0x00007f7dee65b275 ***
+Nov 23 13:58:28-246065 gnunet-rest-server-26879 ERROR Error: (null)
+Nov 23 13:58:46-677968 gnunet-rest-server-26879 ERROR Error: Missing openid scope
+Nov 23 13:59:34-165447 gnunet-rest-server-26901 ERROR Error: Missing openid scope
+Nov 23 14:04:07-545573 gnunet-rest-server-28097 ERROR Error: Response type is not code
+Nov 23 14:53:06-102430 gnunet-rest-server-30299 ERROR Error: Missing openid scope
+Nov 23 14:54:04-248567 gnunet-rest-server-30798 ERROR Error: Missing openid scope
+Nov 23 14:56:12-809322 gnunet-rest-server-31914 ERROR Error: Missing openid scope
+Nov 23 14:56:39-819194 gnunet-rest-server-31914 ERROR Error: Missing openid scope
+Nov 23 14:58:38-889573 gnunet-rest-server-601 ERROR Error: Missing openid scope
+Nov 30 11:59:42-727619 gnunet-rest-server-9307 ERROR (null)Nov 30 12:00:28-889186 gnunet-rest-server-9307 ERROR (null)Nov 30 12:01:56-950658 gnunet-rest-server-10445 ERROR con_handle: /idp/authorize
+Nov 30 12:01:56-982304 gnunet-rest-server-10445 ERROR url: /idp/authorize
+Nov 30 12:08:22-749785 gnunet-rest-server-11652 ERROR con_handle: /idp/authorize
+Nov 30 12:08:22-782042 gnunet-rest-server-11652 ERROR url: /idp/authorize
+Nov 30 12:39:51-816632 gnunet-rest-server-14500 ERROR url: /idp/authorize
+Dec 04 09:51:02-313753 gnunet-rest-server-1974 ERROR No default ego configured in identity service
+Dec 04 09:51:09-311601 gnunet-rest-server-1974 ERROR No default ego configured in identity service
+Failed to send data in request for `/idp/attributes/testego'.
+Dec 04 11:58:11-490711 gnunet-rest-server-6760 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/idp/tickets/testego'.
+Dec 04 11:58:11-508689 gnunet-rest-server-6760 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/names/'.
+Dec 04 11:58:11-511015 gnunet-rest-server-6760 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/idp/tickets/testego'.
+Dec 04 12:38:15-960444 gnunet-rest-server-6760 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/names/'.
+Dec 04 12:38:16-003695 gnunet-rest-server-6760 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/idp/attributes/testego'.
+Dec 04 12:38:16-021887 gnunet-rest-server-6760 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/idp/tickets/testego'.
+Dec 04 12:38:29-977580 gnunet-rest-server-6760 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/names/'.
+Dec 04 12:38:30-008002 gnunet-rest-server-6760 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/idp/attributes/testego'.
+Dec 04 12:38:30-036167 gnunet-rest-server-6760 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/idp/attributes/testego'.
+Dec 04 12:43:23-654462 gnunet-rest-server-6760 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/idp/tickets/testego'.
+Dec 04 12:43:23-655070 gnunet-rest-server-6760 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/names/'.
+Dec 04 12:43:23-665165 gnunet-rest-server-6760 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/idp/tickets/testego'.
+Dec 04 13:06:56-306701 gnunet-rest-server-9599 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/idp/attributes/testego'.
+Dec 04 13:06:56-326200 gnunet-rest-server-9599 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/names/'.
+Dec 04 13:06:56-331741 gnunet-rest-server-9599 ERROR MHD encountered error handling request: 1
+Dec 04 13:09:56-080335 gnunet-rest-server-10794 ERROR URL (response_type=code)
+Dec 04 13:12:49-565164 gnunet-rest-server-11931 ERROR URL (response_type=code)
+Failed to send data in request for `/idp/tickets/testego'.
+Dec 04 13:12:49-586734 gnunet-rest-server-11931 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/idp/attributes/testego'.
+Dec 04 13:12:49-592627 gnunet-rest-server-11931 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/names/'.
+Dec 04 13:12:49-601007 gnunet-rest-server-11931 ERROR MHD encountered error handling request: 1
+Dec 04 13:15:25-370395 gnunet-rest-server-13261 ERROR URL (acr_values=true)
+Failed to send data in request for `/idp/tickets/testego'.
+Dec 04 13:15:25-395382 gnunet-rest-server-13261 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/idp/attributes/testego'.
+Dec 04 13:15:25-399622 gnunet-rest-server-13261 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/names/'.
+Dec 04 13:15:25-408151 gnunet-rest-server-13261 ERROR MHD encountered error handling request: 1
+Dec 04 13:36:24-427812 gnunet-rest-server-15336 ERROR URL (?response_type=code&client_id=test&scope=openid email&redirect_uri=https://google.com&nonce=11111&ui_locales=test&)
+Failed to send data in request for `/idp/tickets/testego'.
+Dec 04 13:36:24-450636 gnunet-rest-server-15336 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/idp/attributes/testego'.
+Dec 04 13:36:24-456164 gnunet-rest-server-15336 ERROR MHD encountered error handling request: 1
+Failed to send data in request for `/names/'.
+Dec 04 13:36:24-461431 gnunet-rest-server-15336 ERROR MHD encountered error handling request: 1
+Dec 04 13:39:02-052691 gnunet-rest-server-16482 ERROR URL (?response_type=code&client_id=test&scope=openid email&redirect_uri=https://google.com&nonce=1111&ui_locales=test&acr_values=true)
+Dec 04 15:27:43-226881 gnunet-rest-server-16482 ERROR URL (?response_type=code&client_id=test&scope=openid email&redirect_uri=https://google.com&nonce=11111&ui_locales=test&acr_values=true)
diff --git a/src/identity-provider/plugin_rest_identity_provider.c b/src/identity-provider/plugin_rest_identity_provider.c
@@ -847,10 +847,10 @@ revoke_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle,
strlen (rnd_str),
&ticket.rnd,
sizeof (uint64_t));
- GNUNET_STRINGS_string_to_data (identity_str,
- strlen (identity_str),
- &ticket.identity,
- sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey));
+// GNUNET_STRINGS_string_to_data (identity_str,
+// strlen (identity_str),
+// &ticket.identity,type filter text
+// sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey));
GNUNET_STRINGS_string_to_data (audience_str,
strlen (audience_str),
&ticket.audience,
diff --git a/src/identity-provider/vgcore.2692 b/src/identity-provider/vgcore.2692
Binary files differ.
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
@@ -739,11 +739,10 @@ get_order_from_difference (unsigned int diff)
unsigned int ibf_order;
ibf_order = 2;
- while ( (1<<ibf_order) < (IBF_ALPHA * diff) ||
- ((1<<ibf_order) < SE_IBF_HASH_NUM) )
+ while ( ( (1<<ibf_order) < (IBF_ALPHA * diff) ||
+ ((1<<ibf_order) < SE_IBF_HASH_NUM) ) &&
+ (ibf_order < MAX_IBF_ORDER) )
ibf_order++;
- if (ibf_order > MAX_IBF_ORDER)
- ibf_order = MAX_IBF_ORDER;
// add one for correction
return ibf_order + 1;
}
diff --git a/src/set/gnunet-service-set_union_strata_estimator.c b/src/set/gnunet-service-set_union_strata_estimator.c
@@ -228,21 +228,19 @@ unsigned int
strata_estimator_difference (const struct StrataEstimator *se1,
const struct StrataEstimator *se2)
{
- int i;
unsigned int count;
GNUNET_assert (se1->strata_count == se2->strata_count);
count = 0;
- for (i = se1->strata_count - 1; i >= 0; i--)
+ for (int i = se1->strata_count - 1; i >= 0; i--)
{
struct InvertibleBloomFilter *diff;
/* number of keys decoded from the ibf */
- int ibf_count;
/* FIXME: implement this without always allocating new IBFs */
diff = ibf_dup (se1->strata[i]);
ibf_subtract (diff, se2->strata[i]);
- for (ibf_count = 0; GNUNET_YES; ibf_count++)
+ for (int ibf_count = 0; GNUNET_YES; ibf_count++)
{
int more;
