aboutsummaryrefslogtreecommitdiff
path: root/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-02-19 18:48:02 +0100
committerChristian Grothoff <christian@grothoff.org>2017-02-19 18:48:02 +0100
commit8802f213c67692abebebdf9fe2d4a77afe2b1fcb (patch)
tree6ca39dbf3d851a88f2ed7f21faba3616c13b3796 /src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
parent360d7afad50d1af425a20e89419d2063a6a0e220 (diff)
downloadgnunet-8802f213c67692abebebdf9fe2d4a77afe2b1fcb.tar.gz
gnunet-8802f213c67692abebebdf9fe2d4a77afe2b1fcb.zip
misc logging, no semantic changes
Diffstat (limited to 'src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c')
-rw-r--r--src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
index 26468f9e7..7fd69a4ea 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
@@ -699,8 +699,15 @@ handle_alices_computation_request (void *cls,
699 struct BobServiceSession *s = cls; 699 struct BobServiceSession *s = cls;
700 700
701 s->session_id = msg->session_id; // ?? 701 s->session_id = msg->session_id; // ??
702 if (s->client_received_element_count == s->total) 702 if (s->client_received_element_count < s->total)
703 start_intersection (s); 703 {
704 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
705 "Alice ready, still waiting for Bob client data!\n");
706 return;
707 }
708 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
709 "Both ready, launching intersection!\n");
710 start_intersection (s);
704} 711}
705 712
706 713
@@ -811,13 +818,19 @@ handle_bob_client_message_multipart (void *cls,
811 if (s->total != s->client_received_element_count) 818 if (s->total != s->client_received_element_count)
812 { 819 {
813 /* more to come */ 820 /* more to come */
821 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
822 "Request still partial, waiting for more client data!\n");
814 return; 823 return;
815 } 824 }
816 if (NULL == s->channel) 825 if (NULL == s->channel)
817 { 826 {
818 /* no Alice waiting for this request, wait for Alice */ 827 /* no Alice waiting for this request, wait for Alice */
828 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
829 "Client ready, still waiting for Alice!\n");
819 return; 830 return;
820 } 831 }
832 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
833 "Both ready, launching intersection!\n");
821 start_intersection (s); 834 start_intersection (s);
822} 835}
823 836
@@ -931,6 +944,9 @@ handle_bob_client_message (void *cls,
931 s->used_element_count++; 944 s->used_element_count++;
932 } 945 }
933 GNUNET_SERVICE_client_continue (s->client); 946 GNUNET_SERVICE_client_continue (s->client);
947 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
948 "Received client request, opening port %s!\n",
949 GNUNET_h2s (&msg->session_key));
934 s->port = GNUNET_CADET_open_porT (my_cadet, 950 s->port = GNUNET_CADET_open_porT (my_cadet,
935 &msg->session_key, 951 &msg->session_key,
936 &cb_channel_incoming, 952 &cb_channel_incoming,