aboutsummaryrefslogtreecommitdiff
path: root/src/cadet
diff options
context:
space:
mode:
Diffstat (limited to 'src/cadet')
-rw-r--r--src/cadet/cadet_api.c12
-rw-r--r--src/cadet/gnunet-cadet-profiler.c14
-rw-r--r--src/cadet/gnunet-service-cadet_channel.c2
-rw-r--r--src/cadet/gnunet-service-cadet_connection.c6
-rw-r--r--src/cadet/gnunet-service-cadet_dht.c2
-rw-r--r--src/cadet/gnunet-service-cadet_paths.c4
-rw-r--r--src/cadet/gnunet-service-cadet_peer.c12
-rw-r--r--src/cadet/gnunet-service-cadet_tunnels.c12
-rw-r--r--src/cadet/test_cadet.c6
-rw-r--r--src/cadet/test_cadet_flow.c6
10 files changed, 38 insertions, 38 deletions
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index 45cc508a6..c9f0722d5 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -230,7 +230,7 @@ destroy_channel (struct GNUNET_CADET_Channel *ch)
230 230
231 231
232/** 232/**
233 * Reconnect to the service, retransmit all infomation to try to restore the 233 * Reconnect to the service, retransmit all information to try to restore the
234 * original state. 234 * original state.
235 * 235 *
236 * @param h handle to the cadet 236 * @param h handle to the cadet
@@ -265,8 +265,8 @@ open_port_cb (void *cls, const struct GNUNET_HashCode *id, void *value)
265 265
266 266
267/** 267/**
268 * Reconnect callback: tries to reconnect again after a failer previous 268 * Reconnect callback: tries to reconnect again after a failed previous
269 * reconnecttion 269 * connection
270 * 270 *
271 * @param cls closure (cadet handle) 271 * @param cls closure (cadet handle)
272 */ 272 */
@@ -706,7 +706,7 @@ handle_mq_error (void *cls, enum GNUNET_MQ_Error error)
706 706
707 707
708/** 708/**
709 * Reconnect to the service, retransmit all infomation to try to restore the 709 * Reconnect to the service, retransmit all information to try to restore the
710 * original state. 710 * original state.
711 * 711 *
712 * @param h handle to the cadet 712 * @param h handle to the cadet
@@ -858,7 +858,7 @@ GNUNET_CADET_channel_destroy (struct GNUNET_CADET_Channel *channel)
858 * 858 *
859 * @param channel Channel handle. 859 * @param channel Channel handle.
860 * @param option Query (GNUNET_CADET_OPTION_*). 860 * @param option Query (GNUNET_CADET_OPTION_*).
861 * @param ... dependant on option, currently not used 861 * @param ... dependent on option, currently not used
862 * 862 *
863 * @return Union with an answer to the query. 863 * @return Union with an answer to the query.
864 */ 864 */
@@ -955,7 +955,7 @@ return_agpl (void *cls, const struct GNUNET_MessageHeader *msg)
955 955
956 956
957/** 957/**
958 * Open a port to receive incomming MQ-based channels. 958 * Open a port to receive incoming MQ-based channels.
959 * 959 *
960 * @param h CADET handle. 960 * @param h CADET handle.
961 * @param port Hash identifying the port. 961 * @param port Hash identifying the port.
diff --git a/src/cadet/gnunet-cadet-profiler.c b/src/cadet/gnunet-cadet-profiler.c
index c3a19a399..e61053f94 100644
--- a/src/cadet/gnunet-cadet-profiler.c
+++ b/src/cadet/gnunet-cadet-profiler.c
@@ -250,9 +250,9 @@ static struct GNUNET_SCHEDULER_Task *round_task;
250 * START THE TEST ITSELF, AS WE ARE CONNECTED TO THE CADET SERVICES. 250 * START THE TEST ITSELF, AS WE ARE CONNECTED TO THE CADET SERVICES.
251 * 251 *
252 * Testcase continues when the root receives confirmation of connected peers, 252 * Testcase continues when the root receives confirmation of connected peers,
253 * on callback funtion ch. 253 * on callback function ch.
254 * 254 *
255 * @param cls Closure (unsued). 255 * @param cls Closure (unused).
256 */ 256 */
257static void 257static void
258start_test (void *cls); 258start_test (void *cls);
@@ -290,7 +290,7 @@ get_index (struct CadetPeer *peer)
290 290
291 291
292/** 292/**
293 * Show the results of the test (banwidth acheived) and log them to GAUGER 293 * Show the results of the test (banwidth achieved) and log them to GAUGER
294 */ 294 */
295static void 295static void
296show_end_data (void) 296show_end_data (void)
@@ -594,7 +594,7 @@ next_rnd (void *cls)
594 * Transmit ping callback. 594 * Transmit ping callback.
595 * 595 *
596 * @param cls Closure (peer for PING, NULL for PONG). 596 * @param cls Closure (peer for PING, NULL for PONG).
597 * @param size Size of the tranmist buffer. 597 * @param size Size of the transmit buffer.
598 * @param buf Pointer to the beginning of the buffer. 598 * @param buf Pointer to the beginning of the buffer.
599 * 599 *
600 * @return Number of bytes written to buf. 600 * @return Number of bytes written to buf.
@@ -911,9 +911,9 @@ select_random_peer (struct CadetPeer *peer)
911 * START THE TEST ITSELF, AS WE ARE CONNECTED TO THE CADET SERVICES. 911 * START THE TEST ITSELF, AS WE ARE CONNECTED TO THE CADET SERVICES.
912 * 912 *
913 * Testcase continues when the root receives confirmation of connected peers, 913 * Testcase continues when the root receives confirmation of connected peers,
914 * on callback funtion ch. 914 * on callback function ch.
915 * 915 *
916 * @param cls Closure (unsued). 916 * @param cls Closure (unused).
917 */ 917 */
918static void 918static void
919start_test (void *cls) 919start_test (void *cls)
@@ -993,7 +993,7 @@ warmup (void)
993 * @param op the operation this callback corresponds to 993 * @param op the operation this callback corresponds to
994 * @param pinfo the result; will be NULL if the operation has failed 994 * @param pinfo the result; will be NULL if the operation has failed
995 * @param emsg error message if the operation has failed; 995 * @param emsg error message if the operation has failed;
996 * NULL if the operation is successfull 996 * NULL if the operation is successful
997 */ 997 */
998static void 998static void
999peer_id_cb (void *cls, 999peer_id_cb (void *cls,
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index ae5d9210f..9a2180cc1 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -382,7 +382,7 @@ struct CadetChannel
382 int destroy; 382 int destroy;
383 383
384 /** 384 /**
385 * Type of message to be droped. See GCT_send. 385 * Type of message to be dropped. See GCT_send.
386 */ 386 */
387 uint16_t type GNUNET_PACKED; 387 uint16_t type GNUNET_PACKED;
388 388
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 3e1f779ad..637e8663b 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -424,7 +424,7 @@ GCC_ack_expected (const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid)
424 424
425 cc = GCC_lookup (cid); 425 cc = GCC_lookup (cid);
426 if (NULL == cc) 426 if (NULL == cc)
427 return; /* whopise, connection alredy down? */ 427 return; /* whopise, connection already down? */
428 cc->metrics.num_acked_transmissions++; 428 cc->metrics.num_acked_transmissions++;
429} 429}
430 430
@@ -444,7 +444,7 @@ GCC_ack_observed (const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid)
444 444
445 cc = GCC_lookup (cid); 445 cc = GCC_lookup (cid);
446 if (NULL == cc) 446 if (NULL == cc)
447 return; /* whopise, connection alredy down? */ 447 return; /* whopise, connection already down? */
448 cc->metrics.num_successes++; 448 cc->metrics.num_successes++;
449} 449}
450 450
@@ -467,7 +467,7 @@ GCC_latency_observed (const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid,
467 467
468 cc = GCC_lookup (cid); 468 cc = GCC_lookup (cid);
469 if (NULL == cc) 469 if (NULL == cc)
470 return; /* whopise, connection alredy down? */ 470 return; /* whopise, connection already down? */
471 GNUNET_STATISTICS_update (stats, "# latencies observed", 1, GNUNET_NO); 471 GNUNET_STATISTICS_update (stats, "# latencies observed", 1, GNUNET_NO);
472 cc->latency_datapoints++; 472 cc->latency_datapoints++;
473 if (cc->latency_datapoints >= 7) 473 if (cc->latency_datapoints >= 7)
diff --git a/src/cadet/gnunet-service-cadet_dht.c b/src/cadet/gnunet-service-cadet_dht.c
index e1bbeb2c3..6caac474d 100644
--- a/src/cadet/gnunet-service-cadet_dht.c
+++ b/src/cadet/gnunet-service-cadet_dht.c
@@ -102,7 +102,7 @@ static struct GNUNET_TIME_Relative announce_delay;
102 * @param exp when will this value expire 102 * @param exp when will this value expire
103 * @param key key of the result 103 * @param key key of the result
104 * @param get_path path of the get request 104 * @param get_path path of the get request
105 * @param get_path_length lenght of @a get_path 105 * @param get_path_length length of @a get_path
106 * @param put_path path of the put request 106 * @param put_path path of the put request
107 * @param put_path_length length of the @a put_path 107 * @param put_path_length length of the @a put_path
108 * @param type type of the result 108 * @param type type of the result
diff --git a/src/cadet/gnunet-service-cadet_paths.c b/src/cadet/gnunet-service-cadet_paths.c
index 087515a5e..2da4e2708 100644
--- a/src/cadet/gnunet-service-cadet_paths.c
+++ b/src/cadet/gnunet-service-cadet_paths.c
@@ -87,7 +87,7 @@ recalculate_path_desirability (struct CadetPeerPath *path)
87/** 87/**
88 * Return how much we like keeping the path. This is an aggregate 88 * Return how much we like keeping the path. This is an aggregate
89 * score based on various factors, including the age of the path 89 * score based on various factors, including the age of the path
90 * (older == better), and the value of this path to all of its ajacent 90 * (older == better), and the value of this path to all of its adjacent
91 * peers. For example, long paths that end at a peer that we have no 91 * peers. For example, long paths that end at a peer that we have no
92 * shorter way to reach are very desirable, while long paths that end 92 * shorter way to reach are very desirable, while long paths that end
93 * at a peer for which we have a shorter way as well are much less 93 * at a peer for which we have a shorter way as well are much less
@@ -462,7 +462,7 @@ extend_path (struct CadetPeerPath *path,
462 * if applicable. 462 * if applicable.
463 * 463 *
464 * @param get_path path of the get request 464 * @param get_path path of the get request
465 * @param get_path_length lenght of @a get_path 465 * @param get_path_length length of @a get_path
466 * @param put_path path of the put request 466 * @param put_path path of the put request
467 * @param put_path_length length of the @a put_path 467 * @param put_path_length length of the @a put_path
468 * @return a path through the network 468 * @return a path through the network
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index 221364c5d..2437a3e1b 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -304,8 +304,8 @@ GCP_get_desirability_of_path (struct CadetPeer *cp,
304#endif 304#endif
305 avg_sum = off_sum * 1.0 / cp->path_dll_length; 305 avg_sum = off_sum * 1.0 / cp->path_dll_length;
306 path_delta = off - avg_sum; 306 path_delta = off - avg_sum;
307 /* path_delta positiv: path off of peer above average (bad path for peer), 307 /* path_delta positive: path off of peer above average (bad path for peer),
308 path_delta negativ: path off of peer below average (good path for peer) */ 308 path_delta negative: path off of peer below average (good path for peer) */
309 if (path_delta <= -1.0) 309 if (path_delta <= -1.0)
310 weight_alts = -num_alts / path_delta; /* discount alternative paths */ 310 weight_alts = -num_alts / path_delta; /* discount alternative paths */
311 else if (path_delta >= 1.0) 311 else if (path_delta >= 1.0)
@@ -405,7 +405,7 @@ consider_peer_activate (struct CadetPeer *cp)
405 (NULL == cp->core_mq) ? "" : " with CORE link"); 405 (NULL == cp->core_mq) ? "" : " with CORE link");
406 if (NULL != cp->destroy_task) 406 if (NULL != cp->destroy_task)
407 { 407 {
408 /* It's active, do not destory! */ 408 /* It's active, do not destroy! */
409 GNUNET_SCHEDULER_cancel (cp->destroy_task); 409 GNUNET_SCHEDULER_cancel (cp->destroy_task);
410 cp->destroy_task = NULL; 410 cp->destroy_task = NULL;
411 } 411 }
@@ -946,7 +946,7 @@ path_heap_cleanup (void *cls)
946 2 * DESIRED_CONNECTIONS_PER_TUNNEL) 946 2 * DESIRED_CONNECTIONS_PER_TUNNEL)
947 { 947 {
948 /* Now we have way too many, drop least desirable UNLESS it is in use! 948 /* Now we have way too many, drop least desirable UNLESS it is in use!
949 (Note that this intentionally keeps highly desireable, but currently 949 (Note that this intentionally keeps highly desirable, but currently
950 unused paths around in the hope that we might be able to switch, even 950 unused paths around in the hope that we might be able to switch, even
951 if the number of paths exceeds the threshold.) */ 951 if the number of paths exceeds the threshold.) */
952 root = GNUNET_CONTAINER_heap_peek (cp->path_heap); 952 root = GNUNET_CONTAINER_heap_peek (cp->path_heap);
@@ -1056,7 +1056,7 @@ GCP_detach_path (struct CadetPeer *cp,
1056 struct GNUNET_CONTAINER_HeapNode *hn) 1056 struct GNUNET_CONTAINER_HeapNode *hn)
1057{ 1057{
1058 LOG (GNUNET_ERROR_TYPE_DEBUG, 1058 LOG (GNUNET_ERROR_TYPE_DEBUG,
1059 "Detatching path %s from peer %s\n", 1059 "Detaching path %s from peer %s\n",
1060 GCPP_2s (path), 1060 GCPP_2s (path),
1061 GCP_2s (cp)); 1061 GCP_2s (cp));
1062 GNUNET_assert (path == 1062 GNUNET_assert (path ==
@@ -1117,7 +1117,7 @@ GCP_remove_connection (struct CadetPeer *cp,
1117 1117
1118 1118
1119/** 1119/**
1120 * Retrieve the CadetPeer stucture associated with the 1120 * Retrieve the CadetPeer structure associated with the
1121 * peer. Optionally create one and insert it in the appropriate 1121 * peer. Optionally create one and insert it in the appropriate
1122 * structures if the peer is not known yet. 1122 * structures if the peer is not known yet.
1123 * 1123 *
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c
index c1c511da1..cabbeed0c 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.c
+++ b/src/cadet/gnunet-service-cadet_tunnels.c
@@ -238,7 +238,7 @@ struct CadetTunnelAxolotl
238 int ratchet_allowed; 238 int ratchet_allowed;
239 239
240 /** 240 /**
241 * Number of messages recieved since our last ratchet advance. 241 * Number of messages received since our last ratchet advance.
242 * 242 *
243 * If this counter = 0, we cannot send a new ratchet key in the next 243 * If this counter = 0, we cannot send a new ratchet key in the next
244 * message. 244 * message.
@@ -1108,7 +1108,7 @@ store_skipped_key (struct CadetTunnelAxolotl *ax,
1108 * @param HKr Header key. 1108 * @param HKr Header key.
1109 * @param Np Received meesage number. 1109 * @param Np Received meesage number.
1110 * @return #GNUNET_OK if keys were stored. 1110 * @return #GNUNET_OK if keys were stored.
1111 * #GNUNET_SYSERR if an error ocurred (@a Np not expected). 1111 * #GNUNET_SYSERR if an error occurred (@a Np not expected).
1112 */ 1112 */
1113static int 1113static int
1114store_ax_keys (struct CadetTunnelAxolotl *ax, 1114store_ax_keys (struct CadetTunnelAxolotl *ax,
@@ -3030,7 +3030,7 @@ GCT_send_channel_destroy (struct CadetTunnel *t,
3030 struct GNUNET_CADET_ChannelDestroyMessage msg; 3030 struct GNUNET_CADET_ChannelDestroyMessage msg;
3031 3031
3032 LOG (GNUNET_ERROR_TYPE_DEBUG, 3032 LOG (GNUNET_ERROR_TYPE_DEBUG,
3033 "Sending DESTORY message for channel ID %u\n", 3033 "Sending DESTROY message for channel ID %u\n",
3034 ntohl (ctn.cn)); 3034 ntohl (ctn.cn));
3035 msg.header.size = htons (sizeof(msg)); 3035 msg.header.size = htons (sizeof(msg));
3036 msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY); 3036 msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY);
@@ -3105,7 +3105,7 @@ handle_plaintext_channel_destroy (void *cls,
3105 /* We don't know about such a channel, might have been destroyed on our 3105 /* We don't know about such a channel, might have been destroyed on our
3106 end in the meantime, or never existed. */ 3106 end in the meantime, or never existed. */
3107 LOG (GNUNET_ERROR_TYPE_DEBUG, 3107 LOG (GNUNET_ERROR_TYPE_DEBUG,
3108 "Received channel DESTORY for unknown channel %u. Ignoring.\n", 3108 "Received channel DESTROY for unknown channel %u. Ignoring.\n",
3109 ntohl (cm->ctn.cn)); 3109 ntohl (cm->ctn.cn));
3110 return; 3110 return;
3111 } 3111 }
@@ -3157,7 +3157,7 @@ decrypted_error_cb (void *cls,
3157 3157
3158 3158
3159/** 3159/**
3160 * Create a tunnel to @a destionation. Must only be called 3160 * Create a tunnel to @a destination. Must only be called
3161 * from within #GCP_get_tunnel(). 3161 * from within #GCP_get_tunnel().
3162 * 3162 *
3163 * @param destination where to create the tunnel to 3163 * @param destination where to create the tunnel to
@@ -3220,7 +3220,7 @@ GCT_create_tunnel (struct CadetPeer *destination)
3220 * Add a @a connection to the @a tunnel. 3220 * Add a @a connection to the @a tunnel.
3221 * 3221 *
3222 * @param t a tunnel 3222 * @param t a tunnel
3223 * @param cid connection identifer to use for the connection 3223 * @param cid connection identifier to use for the connection
3224 * @param options options for the connection 3224 * @param options options for the connection
3225 * @param path path to use for the connection 3225 * @param path path to use for the connection
3226 * @return #GNUNET_OK on success, 3226 * @return #GNUNET_OK on success,
diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c
index 23f2ccbe3..bdf2ac986 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -224,7 +224,7 @@ static struct GNUNET_CADET_Channel *incoming_ch;
224 224
225/** 225/**
226 * Time we started the data transmission (after channel has been established 226 * Time we started the data transmission (after channel has been established
227 * and initilized). 227 * and initialized).
228 */ 228 */
229static struct GNUNET_TIME_Absolute start_time; 229static struct GNUNET_TIME_Absolute start_time;
230 230
@@ -292,7 +292,7 @@ get_target_channel ()
292 292
293 293
294/** 294/**
295 * Show the results of the test (banwidth acheived) and log them to GAUGER 295 * Show the results of the test (banwidth achieved) and log them to GAUGER
296 */ 296 */
297static void 297static void
298show_end_data (void) 298show_end_data (void)
@@ -1311,7 +1311,7 @@ start_test (void *cls)
1311 * @param op the operation this callback corresponds to 1311 * @param op the operation this callback corresponds to
1312 * @param pinfo the result; will be NULL if the operation has failed 1312 * @param pinfo the result; will be NULL if the operation has failed
1313 * @param emsg error message if the operation has failed; 1313 * @param emsg error message if the operation has failed;
1314 * NULL if the operation is successfull 1314 * NULL if the operation is successful
1315 */ 1315 */
1316static void 1316static void
1317pi_cb (void *cls, 1317pi_cb (void *cls,
diff --git a/src/cadet/test_cadet_flow.c b/src/cadet/test_cadet_flow.c
index 2fbdd8d50..9f5a45986 100644
--- a/src/cadet/test_cadet_flow.c
+++ b/src/cadet/test_cadet_flow.c
@@ -176,7 +176,7 @@ static struct GNUNET_CADET_Channel *incoming_ch;
176 176
177/** 177/**
178 * Time we started the data transmission (after channel has been established 178 * Time we started the data transmission (after channel has been established
179 * and initilized). 179 * and initialized).
180 */ 180 */
181static struct GNUNET_TIME_Absolute start_time; 181static struct GNUNET_TIME_Absolute start_time;
182 182
@@ -207,7 +207,7 @@ static unsigned int msg_dropped;
207 207
208 208
209/** 209/**
210 * Show the results of the test (banwidth acheived) and log them to GAUGER 210 * Show the results of the test (banwidth achieved) and log them to GAUGER
211 */ 211 */
212static void 212static void
213show_end_data (void) 213show_end_data (void)
@@ -743,7 +743,7 @@ start_test (void *cls)
743 * @param op the operation this callback corresponds to 743 * @param op the operation this callback corresponds to
744 * @param pinfo the result; will be NULL if the operation has failed 744 * @param pinfo the result; will be NULL if the operation has failed
745 * @param emsg error message if the operation has failed; 745 * @param emsg error message if the operation has failed;
746 * NULL if the operation is successfull 746 * NULL if the operation is successful
747 */ 747 */
748static void 748static void
749pi_cb (void *cls, 749pi_cb (void *cls,