aboutsummaryrefslogtreecommitdiff
path: root/src/set
diff options
context:
space:
mode:
Diffstat (limited to 'src/set')
-rw-r--r--src/set/gnunet-service-set.c12
-rw-r--r--src/set/gnunet-service-set.h2
-rw-r--r--src/set/gnunet-service-set_intersection.c30
-rw-r--r--src/set/gnunet-service-set_union.c28
-rw-r--r--src/set/gnunet-set-ibf-profiler.c2
-rw-r--r--src/set/gnunet-set-profiler.c2
-rw-r--r--src/set/ibf.c2
-rw-r--r--src/set/ibf.h2
-rw-r--r--src/set/set_api.c6
-rw-r--r--src/set/test_set_api.c2
10 files changed, 44 insertions, 44 deletions
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index a339bb993..99deb3b23 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -530,7 +530,7 @@ handle_client_iterate (void *cls,
530 const struct GNUNET_MessageHeader *m) 530 const struct GNUNET_MessageHeader *m)
531{ 531{
532 struct Set *set; 532 struct Set *set;
533 533
534 set = set_get (client); 534 set = set_get (client);
535 if (NULL == set) 535 if (NULL == set)
536 { 536 {
@@ -717,7 +717,7 @@ handle_client_add_remove (void *cls,
717 GNUNET_SERVER_receive_done (client, GNUNET_OK); 717 GNUNET_SERVER_receive_done (client, GNUNET_OK);
718 msg = (const struct GNUNET_SET_ElementMessage *) m; 718 msg = (const struct GNUNET_SET_ElementMessage *) m;
719 el.size = ntohs (m->size) - sizeof *msg; 719 el.size = ntohs (m->size) - sizeof *msg;
720 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 720 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
721 "client ins/rem element of size %u\n", el.size); 721 "client ins/rem element of size %u\n", el.size);
722 el.data = &msg[1]; 722 el.data = &msg[1];
723 if (GNUNET_MESSAGE_TYPE_SET_REMOVE == ntohs (m->type)) 723 if (GNUNET_MESSAGE_TYPE_SET_REMOVE == ntohs (m->type))
@@ -829,7 +829,7 @@ handle_client_iter_ack (void *cls,
829 const struct GNUNET_MessageHeader *m) 829 const struct GNUNET_MessageHeader *m)
830{ 830{
831 struct Set *set; 831 struct Set *set;
832 832
833 set = set_get (client); 833 set = set_get (client);
834 if (NULL == set) 834 if (NULL == set)
835 { 835 {
@@ -1023,7 +1023,7 @@ tunnel_new_cb (void *cls,
1023 incoming->tc = GNUNET_new (struct TunnelContext);; 1023 incoming->tc = GNUNET_new (struct TunnelContext);;
1024 incoming->tc->vt = &incoming_vt; 1024 incoming->tc->vt = &incoming_vt;
1025 incoming->tc->op = (struct OperationState *) incoming; 1025 incoming->tc->op = (struct OperationState *) incoming;
1026 incoming->timeout_task = 1026 incoming->timeout_task =
1027 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, incoming_timeout_cb, incoming); 1027 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, incoming_timeout_cb, incoming);
1028 GNUNET_CONTAINER_DLL_insert_tail (incoming_head, incoming_tail, incoming); 1028 GNUNET_CONTAINER_DLL_insert_tail (incoming_head, incoming_tail, incoming);
1029 1029
@@ -1057,7 +1057,7 @@ tunnel_end_cb (void *cls,
1057/** 1057/**
1058 * Functions with this signature are called whenever a message is 1058 * Functions with this signature are called whenever a message is
1059 * received. 1059 * received.
1060 * 1060 *
1061 * Each time the function must call GNUNET_MESH_receive_done on the tunnel 1061 * Each time the function must call GNUNET_MESH_receive_done on the tunnel
1062 * in order to receive the next message. This doesn't need to be immediate: 1062 * in order to receive the next message. This doesn't need to be immediate:
1063 * can be delayed if some processing is done on the message. 1063 * can be delayed if some processing is done on the message.
@@ -1066,7 +1066,7 @@ tunnel_end_cb (void *cls,
1066 * @param tunnel Connection to the other end. 1066 * @param tunnel Connection to the other end.
1067 * @param tunnel_ctx Place to store local state associated with the tunnel. 1067 * @param tunnel_ctx Place to store local state associated with the tunnel.
1068 * @param message The actual message. 1068 * @param message The actual message.
1069 * 1069 *
1070 * @return GNUNET_OK to keep the tunnel open, 1070 * @return GNUNET_OK to keep the tunnel open,
1071 * GNUNET_SYSERR to close it (signal serious error). 1071 * GNUNET_SYSERR to close it (signal serious error).
1072 */ 1072 */
diff --git a/src/set/gnunet-service-set.h b/src/set/gnunet-service-set.h
index 63b743ec4..f26ff3fc3 100644
--- a/src/set/gnunet-service-set.h
+++ b/src/set/gnunet-service-set.h
@@ -275,7 +275,7 @@ struct ElementEntry
275 int removed; 275 int removed;
276 276
277 /** 277 /**
278 * Generation the element was removed by the client. 278 * Generation the element was removed by the client.
279 * Operations of later generations will not consider the element. 279 * Operations of later generations will not consider the element.
280 * Only valid if is_removed is GNUNET_YES. 280 * Only valid if is_removed is GNUNET_YES.
281 */ 281 */
diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c
index 2a1cf634b..3082f94b5 100644
--- a/src/set/gnunet-service-set_intersection.c
+++ b/src/set/gnunet-service-set_intersection.c
@@ -175,13 +175,13 @@ struct IntersectionEvaluateOperation
175 * was created. 175 * was created.
176 */ 176 */
177 unsigned int generation_created; 177 unsigned int generation_created;
178 178
179 /** 179 /**
180 * Evaluate operations are held in 180 * Evaluate operations are held in
181 * a linked list. 181 * a linked list.
182 */ 182 */
183 struct IntersectionEvaluateOperation *next; 183 struct IntersectionEvaluateOperation *next;
184 184
185 /** 185 /**
186 * Evaluate operations are held in 186 * Evaluate operations are held in
187 * a linked list. 187 * a linked list.
@@ -224,7 +224,7 @@ struct ElementEntry
224 int removed; 224 int removed;
225 225
226 /** 226 /**
227 * Generation the element was removed by the client. 227 * Generation the element was removed by the client.
228 * Operations of later generations will not consider the element. 228 * Operations of later generations will not consider the element.
229 * Only valid if is_removed is GNUNET_YES. 229 * Only valid if is_removed is GNUNET_YES.
230 */ 230 */
@@ -374,7 +374,7 @@ destroy_key_to_element_iter (void *cls,
374 void *value) 374 void *value)
375{ 375{
376 struct KeyEntry *k = value; 376 struct KeyEntry *k = value;
377 377
378 while (NULL != k) 378 while (NULL != k)
379 { 379 {
380 struct KeyEntry *k_tmp = k; 380 struct KeyEntry *k_tmp = k;
@@ -395,7 +395,7 @@ void
395_GSS_union_operation_destroy (struct UnionEvaluateOperation *eo) 395_GSS_union_operation_destroy (struct UnionEvaluateOperation *eo)
396{ 396{
397 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "destroying union op\n"); 397 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "destroying union op\n");
398 398
399 if (NULL != eo->tunnel) 399 if (NULL != eo->tunnel)
400 { 400 {
401 GNUNET_MESH_tunnel_destroy (eo->tunnel); 401 GNUNET_MESH_tunnel_destroy (eo->tunnel);
@@ -457,7 +457,7 @@ fail_union_operation (struct UnionEvaluateOperation *eo)
457 457
458 458
459/** 459/**
460 * Derive the IBF key from a hash code and 460 * Derive the IBF key from a hash code and
461 * a salt. 461 * a salt.
462 * 462 *
463 * @param src the hash code 463 * @param src the hash code
@@ -863,14 +863,14 @@ decode_and_send (struct UnionEvaluateOperation *eo)
863 next_order++; 863 next_order++;
864 if (next_order <= MAX_IBF_ORDER) 864 if (next_order <= MAX_IBF_ORDER)
865 { 865 {
866 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 866 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
867 "decoding failed, sending larger ibf (size %u)\n", 867 "decoding failed, sending larger ibf (size %u)\n",
868 1<<next_order); 868 1<<next_order);
869 send_ibf (eo, next_order); 869 send_ibf (eo, next_order);
870 } 870 }
871 else 871 else
872 { 872 {
873 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 873 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
874 "set union failed: reached ibf limit\n"); 874 "set union failed: reached ibf limit\n");
875 } 875 }
876 break; 876 break;
@@ -950,7 +950,7 @@ handle_p2p_ibf (void *cls, const struct GNUNET_MessageHeader *mh)
950 fail_union_operation (eo); 950 fail_union_operation (eo);
951 return; 951 return;
952 } 952 }
953 953
954 ibf_read_slice (&msg[1], eo->ibf_buckets_received, buckets_in_message, eo->remote_ibf); 954 ibf_read_slice (&msg[1], eo->ibf_buckets_received, buckets_in_message, eo->remote_ibf);
955 eo->ibf_buckets_received += buckets_in_message; 955 eo->ibf_buckets_received += buckets_in_message;
956 956
@@ -1106,7 +1106,7 @@ peer_done_sent_cb (void *cls)
1106 1106
1107/** 1107/**
1108 * Handle a done message from a remote peer 1108 * Handle a done message from a remote peer
1109 * 1109 *
1110 * @param cls the union operation 1110 * @param cls the union operation
1111 * @param mh the message 1111 * @param mh the message
1112 */ 1112 */
@@ -1160,15 +1160,15 @@ _GSS_intersection_evaluate (struct GNUNET_SET_EvaluateMessage *m, struct Set *se
1160 eo->se = strata_estimator_dup (set->state.i->se); 1160 eo->se = strata_estimator_dup (set->state.i->se);
1161 eo->salt = ntohs (m->salt); 1161 eo->salt = ntohs (m->salt);
1162 eo->app_id = m->app_id; 1162 eo->app_id = m->app_id;
1163 1163
1164 context_msg = GNUNET_MQ_extract_nested_mh (m); 1164 context_msg = GNUNET_MQ_extract_nested_mh (m);
1165 if (NULL != context_msg) 1165 if (NULL != context_msg)
1166 { 1166 {
1167 eo->context_msg = GNUNET_copy_message (context_msg); 1167 eo->context_msg = GNUNET_copy_message (context_msg);
1168 } 1168 }
1169 1169
1170 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 1170 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
1171 "evaluating intersection operation, (app %s)\n", 1171 "evaluating intersection operation, (app %s)\n",
1172 GNUNET_h2s (&eo->app_id)); 1172 GNUNET_h2s (&eo->app_id));
1173 1173
1174 eo->tc = GNUNET_new (struct TunnelContext); 1174 eo->tc = GNUNET_new (struct TunnelContext);
@@ -1231,7 +1231,7 @@ _GSS_intersection_set_create (void)
1231 struct Set *set; 1231 struct Set *set;
1232 1232
1233 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "intersection set created\n"); 1233 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "intersection set created\n");
1234 1234
1235 set = GNUNET_malloc (sizeof (struct Set) + sizeof (struct IntersectionState)); 1235 set = GNUNET_malloc (sizeof (struct Set) + sizeof (struct IntersectionState));
1236 set->state.i = (struct IntersectionState *) &set[1]; 1236 set->state.i = (struct IntersectionState *) &set[1];
1237 set->operation = GNUNET_SET_OPERATION_INTERSECTION; 1237 set->operation = GNUNET_SET_OPERATION_INTERSECTION;
@@ -1239,7 +1239,7 @@ _GSS_intersection_set_create (void)
1239 * want the hash map to copy them */ 1239 * want the hash map to copy them */
1240 set->state.i->elements = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES); 1240 set->state.i->elements = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES);
1241 set->state.i->se = strata_estimator_create (SE_STRATA_COUNT, 1241 set->state.i->se = strata_estimator_create (SE_STRATA_COUNT,
1242 SE_IBF_SIZE, SE_IBF_HASH_NUM); 1242 SE_IBF_SIZE, SE_IBF_HASH_NUM);
1243 return set; 1243 return set;
1244} 1244}
1245 1245
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index b70436635..436d707d7 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -166,13 +166,13 @@ struct OperationState
166 * belongs to. 166 * belongs to.
167 */ 167 */
168 struct Set *set; 168 struct Set *set;
169 169
170 /** 170 /**
171 * Evaluate operations are held in 171 * Evaluate operations are held in
172 * a linked list. 172 * a linked list.
173 */ 173 */
174 struct OperationState *next; 174 struct OperationState *next;
175 175
176 /** 176 /**
177 * Evaluate operations are held in 177 * Evaluate operations are held in
178 * a linked list. 178 * a linked list.
@@ -273,7 +273,7 @@ destroy_key_to_element_iter (void *cls,
273 void *value) 273 void *value)
274{ 274{
275 struct KeyEntry *k = value; 275 struct KeyEntry *k = value;
276 276
277 while (NULL != k) 277 while (NULL != k)
278 { 278 {
279 struct KeyEntry *k_tmp = k; 279 struct KeyEntry *k_tmp = k;
@@ -374,7 +374,7 @@ fail_union_operation (struct OperationState *eo)
374 374
375 375
376/** 376/**
377 * Derive the IBF key from a hash code and 377 * Derive the IBF key from a hash code and
378 * a salt. 378 * a salt.
379 * 379 *
380 * @param src the hash code 380 * @param src the hash code
@@ -788,7 +788,7 @@ decode_and_send (struct OperationState *eo)
788 prepare_ibf (eo, eo->remote_ibf->size); 788 prepare_ibf (eo, eo->remote_ibf->size);
789 diff_ibf = ibf_dup (eo->local_ibf); 789 diff_ibf = ibf_dup (eo->local_ibf);
790 ibf_subtract (diff_ibf, eo->remote_ibf); 790 ibf_subtract (diff_ibf, eo->remote_ibf);
791 791
792 ibf_destroy (eo->remote_ibf); 792 ibf_destroy (eo->remote_ibf);
793 eo->remote_ibf = NULL; 793 eo->remote_ibf = NULL;
794 794
@@ -826,14 +826,14 @@ decode_and_send (struct OperationState *eo)
826 next_order++; 826 next_order++;
827 if (next_order <= MAX_IBF_ORDER) 827 if (next_order <= MAX_IBF_ORDER)
828 { 828 {
829 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 829 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
830 "decoding failed, sending larger ibf (size %u)\n", 830 "decoding failed, sending larger ibf (size %u)\n",
831 1<<next_order); 831 1<<next_order);
832 send_ibf (eo, next_order); 832 send_ibf (eo, next_order);
833 } 833 }
834 else 834 else
835 { 835 {
836 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 836 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
837 "set union failed: reached ibf limit\n"); 837 "set union failed: reached ibf limit\n");
838 } 838 }
839 break; 839 break;
@@ -862,7 +862,7 @@ decode_and_send (struct OperationState *eo)
862 * so that we don't request it again with the next ibf if decoding fails */ 862 * so that we don't request it again with the next ibf if decoding fails */
863 ev = GNUNET_MQ_msg_header_extra (msg, sizeof (struct IBF_Key), 863 ev = GNUNET_MQ_msg_header_extra (msg, sizeof (struct IBF_Key),
864 GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS); 864 GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS);
865 865
866 *(struct IBF_Key *) &msg[1] = key; 866 *(struct IBF_Key *) &msg[1] = key;
867 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending element request\n"); 867 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending element request\n");
868 GNUNET_MQ_send (eo->mq, ev); 868 GNUNET_MQ_send (eo->mq, ev);
@@ -930,7 +930,7 @@ handle_p2p_ibf (void *cls, const struct GNUNET_MessageHeader *mh)
930 fail_union_operation (eo); 930 fail_union_operation (eo);
931 return; 931 return;
932 } 932 }
933 933
934 ibf_read_slice (&msg[1], eo->ibf_buckets_received, buckets_in_message, eo->remote_ibf); 934 ibf_read_slice (&msg[1], eo->ibf_buckets_received, buckets_in_message, eo->remote_ibf);
935 eo->ibf_buckets_received += buckets_in_message; 935 eo->ibf_buckets_received += buckets_in_message;
936 936
@@ -1080,7 +1080,7 @@ handle_p2p_element_requests (void *cls, const struct GNUNET_MessageHeader *mh)
1080 1080
1081/** 1081/**
1082 * Handle a done message from a remote peer 1082 * Handle a done message from a remote peer
1083 * 1083 *
1084 * @param cls the union operation 1084 * @param cls the union operation
1085 * @param mh the message 1085 * @param mh the message
1086 */ 1086 */
@@ -1139,8 +1139,8 @@ union_evaluate (struct OperationSpecification *spec,
1139 eo->tunnel = tunnel; 1139 eo->tunnel = tunnel;
1140 eo->mq = GNUNET_MESH_mq_create (tunnel); 1140 eo->mq = GNUNET_MESH_mq_create (tunnel);
1141 1141
1142 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1142 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1143 "evaluating union operation, (app %s)\n", 1143 "evaluating union operation, (app %s)\n",
1144 GNUNET_h2s (&eo->spec->app_id)); 1144 GNUNET_h2s (&eo->spec->app_id));
1145 1145
1146 /* we started the operation, thus we have to send the operation request */ 1146 /* we started the operation, thus we have to send the operation request */
@@ -1201,10 +1201,10 @@ union_set_create (void)
1201 struct SetState *set_state; 1201 struct SetState *set_state;
1202 1202
1203 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "union set created\n"); 1203 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "union set created\n");
1204 1204
1205 set_state = GNUNET_new (struct SetState); 1205 set_state = GNUNET_new (struct SetState);
1206 set_state->se = strata_estimator_create (SE_STRATA_COUNT, 1206 set_state->se = strata_estimator_create (SE_STRATA_COUNT,
1207 SE_IBF_SIZE, SE_IBF_HASH_NUM); 1207 SE_IBF_SIZE, SE_IBF_HASH_NUM);
1208 return set_state; 1208 return set_state;
1209} 1209}
1210 1210
diff --git a/src/set/gnunet-set-ibf-profiler.c b/src/set/gnunet-set-ibf-profiler.c
index c3a16d165..577c78cf2 100644
--- a/src/set/gnunet-set-ibf-profiler.c
+++ b/src/set/gnunet-set-ibf-profiler.c
@@ -181,7 +181,7 @@ run (void *cls, char *const *args, const char *cfgfile,
181 for (i = 0; i <= asize + bsize; i++) 181 for (i = 0; i <= asize + bsize; i++)
182 { 182 {
183 res = ibf_decode (ibf_a, &side, &ibf_key); 183 res = ibf_decode (ibf_a, &side, &ibf_key);
184 if (GNUNET_SYSERR == res) 184 if (GNUNET_SYSERR == res)
185 { 185 {
186 printf ("decode failed, %u/%u elements left\n", 186 printf ("decode failed, %u/%u elements left\n",
187 GNUNET_CONTAINER_multihashmap_size (set_a) + GNUNET_CONTAINER_multihashmap_size (set_b), 187 GNUNET_CONTAINER_multihashmap_size (set_a) + GNUNET_CONTAINER_multihashmap_size (set_b),
diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c
index 20ff5dd0a..f6fdc25cf 100644
--- a/src/set/gnunet-set-profiler.c
+++ b/src/set/gnunet-set-profiler.c
@@ -226,7 +226,7 @@ run (void *cls, char *const *args, const char *cfgfile,
226 226
227 info1.id = "a"; 227 info1.id = "a";
228 info2.id = "b"; 228 info2.id = "b";
229 229
230 info1.sent = GNUNET_CONTAINER_multihashmap_create (num_a+1, GNUNET_NO); 230 info1.sent = GNUNET_CONTAINER_multihashmap_create (num_a+1, GNUNET_NO);
231 info2.sent = GNUNET_CONTAINER_multihashmap_create (num_b+1, GNUNET_NO); 231 info2.sent = GNUNET_CONTAINER_multihashmap_create (num_b+1, GNUNET_NO);
232 common_sent = GNUNET_CONTAINER_multihashmap_create (num_c+1, GNUNET_NO); 232 common_sent = GNUNET_CONTAINER_multihashmap_create (num_c+1, GNUNET_NO);
diff --git a/src/set/ibf.c b/src/set/ibf.c
index 6fe57d11a..3b28e15e1 100644
--- a/src/set/ibf.c
+++ b/src/set/ibf.c
@@ -236,7 +236,7 @@ ibf_decode (struct InvertibleBloomFilter *ibf,
236/** 236/**
237 * Write buckets from an ibf to a buffer. 237 * Write buckets from an ibf to a buffer.
238 * Exactly (IBF_BUCKET_SIZE*ibf->size) bytes are written to buf. 238 * Exactly (IBF_BUCKET_SIZE*ibf->size) bytes are written to buf.
239 * 239 *
240 * @param ibf the ibf to write 240 * @param ibf the ibf to write
241 * @param start with which bucket to start 241 * @param start with which bucket to start
242 * @param count how many buckets to write 242 * @param count how many buckets to write
diff --git a/src/set/ibf.h b/src/set/ibf.h
index a020c713f..1099f6aa2 100644
--- a/src/set/ibf.h
+++ b/src/set/ibf.h
@@ -103,7 +103,7 @@ struct InvertibleBloomFilter
103/** 103/**
104 * Write buckets from an ibf to a buffer. 104 * Write buckets from an ibf to a buffer.
105 * Exactly (IBF_BUCKET_SIZE*ibf->size) bytes are written to buf. 105 * Exactly (IBF_BUCKET_SIZE*ibf->size) bytes are written to buf.
106 * 106 *
107 * @param ibf the ibf to write 107 * @param ibf the ibf to write
108 * @param start with which bucket to start 108 * @param start with which bucket to start
109 * @param count how many buckets to write 109 * @param count how many buckets to write
diff --git a/src/set/set_api.c b/src/set/set_api.c
index 267fe3fc6..cf64e5680 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -599,7 +599,7 @@ listen_connect (void *cls,
599 599
600/** 600/**
601 * Wait for set operation requests for the given application id 601 * Wait for set operation requests for the given application id
602 * 602 *
603 * @param cfg configuration to use for connecting to 603 * @param cfg configuration to use for connecting to
604 * the set service, needs to be valid for the lifetime of the listen handle 604 * the set service, needs to be valid for the lifetime of the listen handle
605 * @param operation operation we want to listen for 605 * @param operation operation we want to listen for
@@ -650,7 +650,7 @@ GNUNET_SET_listen_cancel (struct GNUNET_SET_ListenHandle *lh)
650 * #GNUNET_SET_listen, as the 'struct GNUNET_SET_Request' becomes invalid 650 * #GNUNET_SET_listen, as the 'struct GNUNET_SET_Request' becomes invalid
651 * afterwards. 651 * afterwards.
652 * Call #GNUNET_SET_conclude to provide the local set to use for the operation, 652 * Call #GNUNET_SET_conclude to provide the local set to use for the operation,
653 * and to begin the exchange with the remote peer. 653 * and to begin the exchange with the remote peer.
654 * 654 *
655 * @param request request to accept 655 * @param request request to accept
656 * @param result_mode specified how results will be returned, 656 * @param result_mode specified how results will be returned,
@@ -729,7 +729,7 @@ GNUNET_SET_operation_cancel (struct GNUNET_SET_OperationHandle *oh)
729 * set information and call the result callback with the 729 * set information and call the result callback with the
730 * result information. 730 * result information.
731 * 731 *
732 * @param oh handle to the set operation 732 * @param oh handle to the set operation
733 * @param set the set to use for the operation 733 * @param set the set to use for the operation
734 * @return #GNUNET_OK on success, #GNUNET_SYSERR if the 734 * @return #GNUNET_OK on success, #GNUNET_SYSERR if the
735 * set is invalid (e.g. the set service crashed) 735 * set is invalid (e.g. the set service crashed)
diff --git a/src/set/test_set_api.c b/src/set/test_set_api.c
index 95334f856..ec5226d50 100644
--- a/src/set/test_set_api.c
+++ b/src/set/test_set_api.c
@@ -216,7 +216,7 @@ test_iter ()
216/** 216/**
217 * Signature of the 'main' function for a (single-peer) testcase that 217 * Signature of the 'main' function for a (single-peer) testcase that
218 * is run using 'GNUNET_TESTING_peer_run'. 218 * is run using 'GNUNET_TESTING_peer_run'.
219 * 219 *
220 * @param cls closure 220 * @param cls closure
221 * @param cfg configuration of the peer that was started 221 * @param cfg configuration of the peer that was started
222 * @param peer identity of the peer that was created 222 * @param peer identity of the peer that was created