diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-07 01:07:07 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-07 01:07:07 +0000 |
commit | 4e508bb9f251f0b1d261bb4178fb8a2b0009635d (patch) | |
tree | 7eccde4f1e915a6762f523330633557e7e5987c2 /src/scalarproduct/gnunet-service-scalarproduct_bob.c | |
parent | 4ede109b9167fde6558b4281b023e1010c260522 (diff) | |
download | gnunet-4e508bb9f251f0b1d261bb4178fb8a2b0009635d.tar.gz gnunet-4e508bb9f251f0b1d261bb4178fb8a2b0009635d.zip |
-more SP fixes and todos
Diffstat (limited to 'src/scalarproduct/gnunet-service-scalarproduct_bob.c')
-rw-r--r-- | src/scalarproduct/gnunet-service-scalarproduct_bob.c | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_bob.c b/src/scalarproduct/gnunet-service-scalarproduct_bob.c index 23bfcda0e..879e6abbd 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_bob.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_bob.c | |||
@@ -156,7 +156,10 @@ struct BobServiceSession | |||
156 | uint32_t used_element_count; | 156 | uint32_t used_element_count; |
157 | 157 | ||
158 | /** | 158 | /** |
159 | * already transferred elements (sent/received) for multipart messages, less or equal than @e used_element_count for | 159 | * Already transferred elements (sent/received) for multipart |
160 | * messages. First used to count values received from client (less | ||
161 | * than @e total), then used to count values transmitted from Alice | ||
162 | * (less than @e used_element_count)! FIXME: maybe separate this. | ||
160 | */ | 163 | */ |
161 | uint32_t transferred_element_count; | 164 | uint32_t transferred_element_count; |
162 | 165 | ||
@@ -530,6 +533,9 @@ transmit_bobs_cryptodata_message_multipart (struct BobServiceSession *s) | |||
530 | if (todo_count > ELEMENT_CAPACITY / 2) | 533 | if (todo_count > ELEMENT_CAPACITY / 2) |
531 | todo_count = ELEMENT_CAPACITY / 2; | 534 | todo_count = ELEMENT_CAPACITY / 2; |
532 | 535 | ||
536 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
537 | "Sending %u additional crypto values to Alice\n", | ||
538 | (unsigned int) todo_count); | ||
533 | e = GNUNET_MQ_msg_extra (msg, | 539 | e = GNUNET_MQ_msg_extra (msg, |
534 | todo_count * sizeof (struct GNUNET_CRYPTO_PaillierCiphertext) * 2, | 540 | todo_count * sizeof (struct GNUNET_CRYPTO_PaillierCiphertext) * 2, |
535 | GNUNET_MESSAGE_TYPE_SCALARPRODUCT_BOB_CRYPTODATA_MULTIPART); | 541 | GNUNET_MESSAGE_TYPE_SCALARPRODUCT_BOB_CRYPTODATA_MULTIPART); |
@@ -584,11 +590,17 @@ transmit_bobs_cryptodata_message (struct BobServiceSession *s) | |||
584 | (2 + s->transferred_element_count * 2) | 590 | (2 + s->transferred_element_count * 2) |
585 | * sizeof (struct GNUNET_CRYPTO_PaillierCiphertext), | 591 | * sizeof (struct GNUNET_CRYPTO_PaillierCiphertext), |
586 | GNUNET_MESSAGE_TYPE_SCALARPRODUCT_BOB_CRYPTODATA); | 592 | GNUNET_MESSAGE_TYPE_SCALARPRODUCT_BOB_CRYPTODATA); |
587 | msg->total_element_count = htonl (s->total); | 593 | // FIXME: 'total' maybe confusing here, and should already be known to Alice |
588 | msg->used_element_count = htonl (s->used_element_count); | 594 | msg->total_element_count = htonl (s->used_element_count); |
595 | // FIXME: redundant! | ||
596 | msg->used_element_count = htonl (s->transferred_element_count); | ||
589 | msg->contained_element_count = htonl (s->transferred_element_count); | 597 | msg->contained_element_count = htonl (s->transferred_element_count); |
590 | msg->key = s->session_id; | 598 | msg->key = s->session_id; |
591 | 599 | ||
600 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
601 | "Sending %u crypto values to Alice\n", | ||
602 | (unsigned int) s->transferred_element_count); | ||
603 | |||
592 | payload = (struct GNUNET_CRYPTO_PaillierCiphertext *) &msg[1]; | 604 | payload = (struct GNUNET_CRYPTO_PaillierCiphertext *) &msg[1]; |
593 | memcpy (&payload[0], | 605 | memcpy (&payload[0], |
594 | &s->s, | 606 | &s->s, |
@@ -834,6 +846,8 @@ static void | |||
834 | transmit_cryptographic_reply (struct BobServiceSession *s) | 846 | transmit_cryptographic_reply (struct BobServiceSession *s) |
835 | { | 847 | { |
836 | /* TODO: code duplication with Alice! */ | 848 | /* TODO: code duplication with Alice! */ |
849 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
850 | "Received everything, building reply for Alice\n"); | ||
837 | s->sorted_elements | 851 | s->sorted_elements |
838 | = GNUNET_malloc (GNUNET_CONTAINER_multihashmap_size (s->intersected_elements) * | 852 | = GNUNET_malloc (GNUNET_CONTAINER_multihashmap_size (s->intersected_elements) * |
839 | sizeof (struct MpiElement)); | 853 | sizeof (struct MpiElement)); |
@@ -841,9 +855,6 @@ transmit_cryptographic_reply (struct BobServiceSession *s) | |||
841 | GNUNET_CONTAINER_multihashmap_iterate (s->intersected_elements, | 855 | GNUNET_CONTAINER_multihashmap_iterate (s->intersected_elements, |
842 | ©_element_cb, | 856 | ©_element_cb, |
843 | s); | 857 | s); |
844 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
845 | "Finished intersection, %d items remain\n", | ||
846 | s->used_element_count); | ||
847 | qsort (s->sorted_elements, | 858 | qsort (s->sorted_elements, |
848 | s->used_element_count, | 859 | s->used_element_count, |
849 | sizeof (struct MpiElement), | 860 | sizeof (struct MpiElement), |
@@ -911,6 +922,9 @@ handle_alices_cryptodata_message (void *cls, | |||
911 | GNUNET_break_op (0); | 922 | GNUNET_break_op (0); |
912 | return GNUNET_SYSERR; | 923 | return GNUNET_SYSERR; |
913 | } | 924 | } |
925 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
926 | "Received %u crypto values from Alice\n", | ||
927 | (unsigned int) contained_elements); | ||
914 | 928 | ||
915 | payload = (const struct GNUNET_CRYPTO_PaillierCiphertext *) &msg[1]; | 929 | payload = (const struct GNUNET_CRYPTO_PaillierCiphertext *) &msg[1]; |
916 | if (NULL == s->e_a) | 930 | if (NULL == s->e_a) |
@@ -969,6 +983,9 @@ cb_intersection_element_removed (void *cls, | |||
969 | case GNUNET_SET_STATUS_DONE: | 983 | case GNUNET_SET_STATUS_DONE: |
970 | s->intersection_op = NULL; | 984 | s->intersection_op = NULL; |
971 | s->intersection_set = NULL; | 985 | s->intersection_set = NULL; |
986 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
987 | "Finished intersection, %d items remain\n", | ||
988 | GNUNET_CONTAINER_multihashmap_size (s->intersected_elements)); | ||
972 | if (s->transferred_element_count == | 989 | if (s->transferred_element_count == |
973 | GNUNET_CONTAINER_multihashmap_size (s->intersected_elements)) | 990 | GNUNET_CONTAINER_multihashmap_size (s->intersected_elements)) |
974 | { | 991 | { |
@@ -1007,8 +1024,9 @@ static void | |||
1007 | start_intersection (struct BobServiceSession *s) | 1024 | start_intersection (struct BobServiceSession *s) |
1008 | { | 1025 | { |
1009 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1026 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1010 | "Got session with key %s and a matching element set, processing.\n", | 1027 | "Got session with key %s and %u elements, starting intersection.\n", |
1011 | GNUNET_h2s (&s->session_id)); | 1028 | GNUNET_h2s (&s->session_id), |
1029 | (unsigned int) s->transferred_element_count); | ||
1012 | 1030 | ||
1013 | s->intersection_op | 1031 | s->intersection_op |
1014 | = GNUNET_SET_prepare (&s->cadet->peer, | 1032 | = GNUNET_SET_prepare (&s->cadet->peer, |