summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-12-10 08:41:52 +0000
committerChristian Grothoff <christian@grothoff.org>2013-12-10 08:41:52 +0000
commitecde9b6b2202126151e34998991b6f35e6d7d149 (patch)
treed467a4ccc1b52d1f6e8a2c3f7d2fd688d63477b2
parentefc7f31d917eca457bf2e22ebd70d06e4e21421c (diff)
downloadgnunet-ecde9b6b2202126151e34998991b6f35e6d7d149.tar.gz
gnunet-ecde9b6b2202126151e34998991b6f35e6d7d149.zip
-doxygen fixes
-rwxr-xr-xsrc/ats/plugin_ats_ril.c10
-rw-r--r--src/set/gnunet-service-set_intersection.c28
-rw-r--r--src/transport/gnunet-service-transport_neighbours.c2
3 files changed, 21 insertions, 19 deletions
diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c
index ee7795638..88120d517 100755
--- a/src/ats/plugin_ats_ril.c
+++ b/src/ats/plugin_ats_ril.c
@@ -565,13 +565,14 @@ agent_update_weights (struct RIL_Peer_Agent *agent, double reward, double *s_nex
565 565
566/** 566/**
567 * Changes the eligibility trace vector e in various manners: 567 * Changes the eligibility trace vector e in various manners:
568 * RIL_E_ACCUMULATE - adds 1 to each component as in accumulating eligibility traces 568 * #RIL_E_ACCUMULATE - adds @a f to each component as in accumulating eligibility traces
569 * RIL_E_REPLACE - resets each component to 1 as in replacing traces 569 * #RIL_E_REPLACE - resets each component to @f as in replacing traces
570 * RIL_E_SET - multiplies e with discount factor and lambda as in the update rule 570 * #RIL_E_SET - multiplies e with discount factor and lambda as in the update rule
571 * RIL_E_ZERO - sets e to 0 as in Watkin's Q-learning algorithm when exploring and when initializing 571 * #RIL_E_ZERO - sets e to 0 as in Watkin's Q-learning algorithm when exploring and when initializing
572 * 572 *
573 * @param agent the agent handle 573 * @param agent the agent handle
574 * @param mod the kind of modification 574 * @param mod the kind of modification
575 * @param f how much to change
575 */ 576 */
576static void 577static void
577agent_modify_eligibility (struct RIL_Peer_Agent *agent, enum RIL_E_Modification mod, double *f) 578agent_modify_eligibility (struct RIL_Peer_Agent *agent, enum RIL_E_Modification mod, double *f)
@@ -599,6 +600,7 @@ agent_modify_eligibility (struct RIL_Peer_Agent *agent, enum RIL_E_Modification
599 } 600 }
600} 601}
601 602
603
602static void 604static void
603ril_inform (struct GAS_RIL_Handle *solver, 605ril_inform (struct GAS_RIL_Handle *solver,
604 enum GAS_Solver_Operation op, 606 enum GAS_Solver_Operation op,
diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c
index 9fa51e4f1..f2dfb1759 100644
--- a/src/set/gnunet-service-set_intersection.c
+++ b/src/set/gnunet-service-set_intersection.c
@@ -76,12 +76,12 @@ struct OperationState
76 * BF of the set's element. 76 * BF of the set's element.
77 */ 77 */
78 struct GNUNET_CONTAINER_BloomFilter *local_bf; 78 struct GNUNET_CONTAINER_BloomFilter *local_bf;
79 79
80 /** 80 /**
81 * for multipart msgs we have to store the bloomfilter-data until we fully sent it. 81 * for multipart msgs we have to store the bloomfilter-data until we fully sent it.
82 */ 82 */
83 char * local_bf_data; 83 char * local_bf_data;
84 84
85 /** 85 /**
86 * for multipart msgs we have to store the bloomfilter-data until we fully sent it. 86 * for multipart msgs we have to store the bloomfilter-data until we fully sent it.
87 */ 87 */
@@ -304,7 +304,7 @@ fail_intersection_operation (struct Operation *op)
304/** 304/**
305 * Send a request for the evaluate operation to a remote peer 305 * Send a request for the evaluate operation to a remote peer
306 * 306 *
307 * @param eo operation with the other peer 307 * @param op operation with the other peer
308 */ 308 */
309static void 309static void
310send_operation_request (struct Operation *op) 310send_operation_request (struct Operation *op)
@@ -348,13 +348,13 @@ send_bloomfilter_multipart (struct Operation *op, uint32_t offset)
348 struct BFMessage *msg; 348 struct BFMessage *msg;
349 uint32_t chunk_size = (GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof(struct BFMessage)); 349 uint32_t chunk_size = (GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof(struct BFMessage));
350 uint32_t todo_size = op->state->local_bf_data_size - offset; 350 uint32_t todo_size = op->state->local_bf_data_size - offset;
351 351
352 if (todo_size < chunk_size) 352 if (todo_size < chunk_size)
353 // we probably need many chunks, thus we assume a maximum packet size by default 353 // we probably need many chunks, thus we assume a maximum packet size by default
354 chunk_size = todo_size; 354 chunk_size = todo_size;
355 355
356 ev = GNUNET_MQ_msg_extra (msg, chunk_size, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF); 356 ev = GNUNET_MQ_msg_extra (msg, chunk_size, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF);
357 357
358 msg->reserved = 0; 358 msg->reserved = 0;
359 msg->bloomfilter_total_length = htonl (op->state->local_bf_data_size); 359 msg->bloomfilter_total_length = htonl (op->state->local_bf_data_size);
360 msg->bloomfilter_length = htonl (chunk_size); 360 msg->bloomfilter_length = htonl (chunk_size);
@@ -362,7 +362,7 @@ send_bloomfilter_multipart (struct Operation *op, uint32_t offset)
362 memcpy(&msg[1], op->state->local_bf, chunk_size); 362 memcpy(&msg[1], op->state->local_bf, chunk_size);
363 363
364 GNUNET_MQ_send (op->mq, ev); 364 GNUNET_MQ_send (op->mq, ev);
365 365
366 if (op->state->local_bf_data_size == offset + chunk_size) 366 if (op->state->local_bf_data_size == offset + chunk_size)
367 { 367 {
368 // done 368 // done
@@ -372,7 +372,7 @@ send_bloomfilter_multipart (struct Operation *op, uint32_t offset)
372 op->state->local_bf = NULL; 372 op->state->local_bf = NULL;
373 return; 373 return;
374 } 374 }
375 375
376 send_bloomfilter_multipart (op, offset + chunk_size); 376 send_bloomfilter_multipart (op, offset + chunk_size);
377} 377}
378 378
@@ -382,7 +382,7 @@ send_bloomfilter_multipart (struct Operation *op, uint32_t offset)
382 * After the result done message has been sent to the client, 382 * After the result done message has been sent to the client,
383 * destroy the evaluate operation. 383 * destroy the evaluate operation.
384 * 384 *
385 * @param eo intersection operation 385 * @param op intersection operation
386 */ 386 */
387static void 387static void
388send_bloomfilter (struct Operation *op) 388send_bloomfilter (struct Operation *op)
@@ -399,10 +399,10 @@ send_bloomfilter (struct Operation *op)
399 { 399 {
400 // singlepart 400 // singlepart
401 ev = GNUNET_MQ_msg_extra (msg, bf_size, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF); 401 ev = GNUNET_MQ_msg_extra (msg, bf_size, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF);
402 402
403 GNUNET_CONTAINER_bloomfilter_free (op->state->local_bf); 403 GNUNET_CONTAINER_bloomfilter_free (op->state->local_bf);
404 op->state->local_bf = NULL; 404 op->state->local_bf = NULL;
405 405
406 msg->reserved = 0; 406 msg->reserved = 0;
407 msg->sender_element_count = htonl (op->state->my_element_count); 407 msg->sender_element_count = htonl (op->state->my_element_count);
408 msg->bloomfilter_length = htonl (bf_size); 408 msg->bloomfilter_length = htonl (bf_size);
@@ -487,7 +487,7 @@ send_remaining_elements (void *cls)
487/** 487/**
488 * Inform the peer that this operation is complete. 488 * Inform the peer that this operation is complete.
489 * 489 *
490 * @param eo the intersection operation to fail 490 * @param op the intersection operation to fail
491 */ 491 */
492static void 492static void
493send_peer_done (struct Operation *op) 493send_peer_done (struct Operation *op)
@@ -617,7 +617,7 @@ handle_p2p_element_info (void *cls, const struct GNUNET_MessageHeader *mh)
617/** 617/**
618 * Send our element to the peer, in case our element count is lower than his 618 * Send our element to the peer, in case our element count is lower than his
619 * 619 *
620 * @param eo intersection operation 620 * @param op intersection operation
621 */ 621 */
622static void 622static void
623send_element_count (struct Operation *op) 623send_element_count (struct Operation *op)
@@ -804,7 +804,7 @@ intersection_remove (struct SetState *set_state,
804/** 804/**
805 * Dispatch messages for a intersection operation. 805 * Dispatch messages for a intersection operation.
806 * 806 *
807 * @param eo the state of the intersection evaluate operation 807 * @param op the state of the intersection evaluate operation
808 * @param mh the received message 808 * @param mh the received message
809 * @return #GNUNET_SYSERR if the tunnel should be disconnected, 809 * @return #GNUNET_SYSERR if the tunnel should be disconnected,
810 * #GNUNET_OK otherwise 810 * #GNUNET_OK otherwise
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 21d40d9be..4d83c716d 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -250,7 +250,7 @@ struct MessageQueue
250 * have a new address, we go to #S_RECONNECT_BLACKLIST to check the new 250 * have a new address, we go to #S_RECONNECT_BLACKLIST to check the new
251 * address against the blacklist. If the blacklist approves, we enter 251 * address against the blacklist. If the blacklist approves, we enter
252 * #S_RECONNECT_SENT and send a CONNECT message. If we receive a 252 * #S_RECONNECT_SENT and send a CONNECT message. If we receive a
253 * #CONNECT_ACK, we go to #S_CONNECTED and nobody noticed that we had 253 * CONNECT_ACK, we go to #S_CONNECTED and nobody noticed that we had
254 * trouble; we also send a SESSION_ACK at this time just in case. If 254 * trouble; we also send a SESSION_ACK at this time just in case. If
255 * the operation times out, we go to S_DISCONNECT (and notify everyone 255 * the operation times out, we go to S_DISCONNECT (and notify everyone
256 * about the lost connection). 256 * about the lost connection).