diff options
Diffstat (limited to 'src/mesh/gnunet-service-mesh-enc.c')
-rw-r--r-- | src/mesh/gnunet-service-mesh-enc.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mesh/gnunet-service-mesh-enc.c b/src/mesh/gnunet-service-mesh-enc.c index 18b6460b7..be72963c3 100644 --- a/src/mesh/gnunet-service-mesh-enc.c +++ b/src/mesh/gnunet-service-mesh-enc.c | |||
@@ -33,7 +33,7 @@ | |||
33 | * - relay corking down to core | 33 | * - relay corking down to core |
34 | * - set ttl relative to path length | 34 | * - set ttl relative to path length |
35 | * TODO END | 35 | * TODO END |
36 | * | 36 | * |
37 | * Dictionary: | 37 | * Dictionary: |
38 | * - peer: other mesh instance. If there is direct connection it's a neighbor. | 38 | * - peer: other mesh instance. If there is direct connection it's a neighbor. |
39 | * - tunnel: encrypted connection to a peer, neighbor or not. | 39 | * - tunnel: encrypted connection to a peer, neighbor or not. |
@@ -409,7 +409,7 @@ tunnel_notify_connection_broken (struct MeshTunnel2 *t, | |||
409 | * @brief Use the given path for the tunnel. | 409 | * @brief Use the given path for the tunnel. |
410 | * Update the next and prev hops (and RCs). | 410 | * Update the next and prev hops (and RCs). |
411 | * (Re)start the path refresh in case the tunnel is locally owned. | 411 | * (Re)start the path refresh in case the tunnel is locally owned. |
412 | * | 412 | * |
413 | * @param t Tunnel to update. | 413 | * @param t Tunnel to update. |
414 | * @param p Path to use. | 414 | * @param p Path to use. |
415 | * | 415 | * |
@@ -420,10 +420,10 @@ tunnel_use_path (struct MeshTunnel2 *t, struct MeshPeerPath *p); | |||
420 | 420 | ||
421 | /** | 421 | /** |
422 | * Tunnel is empty: destroy it. | 422 | * Tunnel is empty: destroy it. |
423 | * | 423 | * |
424 | * Notifies all participants (peers, cleints) about the destruction. | 424 | * Notifies all participants (peers, cleints) about the destruction. |
425 | * | 425 | * |
426 | * @param t Tunnel to destroy. | 426 | * @param t Tunnel to destroy. |
427 | */ | 427 | */ |
428 | static void | 428 | static void |
429 | tunnel_destroy_empty (struct MeshTunnel2 *t); | 429 | tunnel_destroy_empty (struct MeshTunnel2 *t); |
@@ -469,7 +469,7 @@ __mesh_divider______________________________________________________________(); | |||
469 | * | 469 | * |
470 | * @param s Tunnel state. | 470 | * @param s Tunnel state. |
471 | * | 471 | * |
472 | * @return String representation. | 472 | * @return String representation. |
473 | */ | 473 | */ |
474 | static const char * | 474 | static const char * |
475 | GNUNET_MESH_DEBUG_TS2S (enum MeshTunnelState s) | 475 | GNUNET_MESH_DEBUG_TS2S (enum MeshTunnelState s) |
@@ -640,7 +640,7 @@ tunnel_get_buffer (struct MeshTunnel2 *t, int fwd) | |||
640 | 640 | ||
641 | 641 | ||
642 | /** | 642 | /** |
643 | * FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME | 643 | * FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME |
644 | * Encrypt data with the tunnel key. | 644 | * Encrypt data with the tunnel key. |
645 | * | 645 | * |
646 | * @param t Tunnel whose key to use. | 646 | * @param t Tunnel whose key to use. |
@@ -660,7 +660,7 @@ tunnel_encrypt (struct MeshTunnel2 *t, | |||
660 | 660 | ||
661 | 661 | ||
662 | /** | 662 | /** |
663 | * FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME | 663 | * FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME |
664 | * Decrypt data with the tunnel key. | 664 | * Decrypt data with the tunnel key. |
665 | * | 665 | * |
666 | * @param t Tunnel whose key to use. | 666 | * @param t Tunnel whose key to use. |
@@ -763,7 +763,7 @@ send_connection_create (struct MeshConnection *connection) | |||
763 | * @param fwd Is this a fwd ACK? (First is bck (SYNACK), second is fwd (ACK)) | 763 | * @param fwd Is this a fwd ACK? (First is bck (SYNACK), second is fwd (ACK)) |
764 | */ | 764 | */ |
765 | static void | 765 | static void |
766 | send_connection_ack (struct MeshConnection *connection, int fwd) | 766 | send_connection_ack (struct MeshConnection *connection, int fwd) |
767 | { | 767 | { |
768 | struct MeshTunnel2 *t; | 768 | struct MeshTunnel2 *t; |
769 | 769 | ||
@@ -938,7 +938,7 @@ connection_debug (struct MeshConnection *c) | |||
938 | } | 938 | } |
939 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connection %s:%X\n", | 939 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connection %s:%X\n", |
940 | peer2s (c->t->peer), GNUNET_h2s (&c->id)); | 940 | peer2s (c->t->peer), GNUNET_h2s (&c->id)); |
941 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " state: %u, pending msgs: %u\n", | 941 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " state: %u, pending msgs: %u\n", |
942 | c->state, c->pending_messages); | 942 | c->state, c->pending_messages); |
943 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " FWD FC\n"); | 943 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " FWD FC\n"); |
944 | fc_debug (&c->fwd_fc); | 944 | fc_debug (&c->fwd_fc); |
@@ -1099,8 +1099,8 @@ tunnel_use_path (struct MeshTunnel2 *t, struct MeshPeerPath *p) | |||
1099 | * some of its peers. Sends a notification towards the root of the tree. | 1099 | * some of its peers. Sends a notification towards the root of the tree. |
1100 | * In case the peer is the owner of the tree, notifies the client that owns | 1100 | * In case the peer is the owner of the tree, notifies the client that owns |
1101 | * the tunnel and tries to reconnect. | 1101 | * the tunnel and tries to reconnect. |
1102 | * | 1102 | * |
1103 | * FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME | 1103 | * FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME |
1104 | * | 1104 | * |
1105 | * @param t Tunnel affected. | 1105 | * @param t Tunnel affected. |
1106 | * @param p1 Peer that got disconnected from p2. | 1106 | * @param p1 Peer that got disconnected from p2. |
@@ -1117,13 +1117,13 @@ tunnel_notify_connection_broken (struct MeshTunnel2* t, | |||
1117 | // { | 1117 | // { |
1118 | // return; | 1118 | // return; |
1119 | // } | 1119 | // } |
1120 | // | 1120 | // |
1121 | // if (tree_get_predecessor (t->tree) != 0) | 1121 | // if (tree_get_predecessor (t->tree) != 0) |
1122 | // { | 1122 | // { |
1123 | // /* We are the peer still connected, notify owner of the disconnection. */ | 1123 | // /* We are the peer still connected, notify owner of the disconnection. */ |
1124 | // struct GNUNET_MESH_PathBroken msg; | 1124 | // struct GNUNET_MESH_PathBroken msg; |
1125 | // struct GNUNET_PeerIdentity neighbor; | 1125 | // struct GNUNET_PeerIdentity neighbor; |
1126 | // | 1126 | // |
1127 | // msg.header.size = htons (sizeof (msg)); | 1127 | // msg.header.size = htons (sizeof (msg)); |
1128 | // msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN); | 1128 | // msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN); |
1129 | // GNUNET_PEER_resolve (t->id.oid, &msg.oid); | 1129 | // GNUNET_PEER_resolve (t->id.oid, &msg.oid); |
@@ -1184,7 +1184,7 @@ send_ack (struct MeshConnection *c, struct MeshChannel *ch, int fwd) | |||
1184 | GNUNET_assert (NULL != ch); | 1184 | GNUNET_assert (NULL != ch); |
1185 | channel_send_connections_ack (ch, buffer, fwd); | 1185 | channel_send_connections_ack (ch, buffer, fwd); |
1186 | } | 1186 | } |
1187 | else | 1187 | else |
1188 | { | 1188 | { |
1189 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " sending on connection\n"); | 1189 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " sending on connection\n"); |
1190 | connection_send_ack (c, buffer, fwd); | 1190 | connection_send_ack (c, buffer, fwd); |
@@ -1358,7 +1358,7 @@ tunnel_destroy (struct MeshTunnel2 *t) | |||
1358 | * | 1358 | * |
1359 | * Notifies all connections about the destruction. | 1359 | * Notifies all connections about the destruction. |
1360 | * | 1360 | * |
1361 | * @param t Tunnel to destroy. | 1361 | * @param t Tunnel to destroy. |
1362 | */ | 1362 | */ |
1363 | static void | 1363 | static void |
1364 | tunnel_destroy_empty (struct MeshTunnel2 *t) | 1364 | tunnel_destroy_empty (struct MeshTunnel2 *t) |
@@ -1910,7 +1910,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
1910 | pk = GNUNET_CRYPTO_ecc_key_create_from_configuration (c); | 1910 | pk = GNUNET_CRYPTO_ecc_key_create_from_configuration (c); |
1911 | GNUNET_assert (NULL != pk); | 1911 | GNUNET_assert (NULL != pk); |
1912 | my_private_key = pk; | 1912 | my_private_key = pk; |
1913 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (my_private_key, | 1913 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (my_private_key, |
1914 | &my_full_id.public_key); | 1914 | &my_full_id.public_key); |
1915 | myid = GNUNET_PEER_intern (&my_full_id); | 1915 | myid = GNUNET_PEER_intern (&my_full_id); |
1916 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 1916 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |