aboutsummaryrefslogtreecommitdiff
path: root/src/mesh
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-10-17 07:55:41 +0000
committerChristian Grothoff <christian@grothoff.org>2011-10-17 07:55:41 +0000
commita2d9b4434076254811584a4a0ffa8881d0903db8 (patch)
tree4f5a2ee5daaabdedb45aa5e7e1d03e3c0f28ed0e /src/mesh
parent4b5e8dcb8d6f0d29fffb823e600c73be404d9b39 (diff)
downloadgnunet-a2d9b4434076254811584a4a0ffa8881d0903db8.tar.gz
gnunet-a2d9b4434076254811584a4a0ffa8881d0903db8.zip
move GNUNET_TRANSPORT_ATS_ to GNUNET_ATS_
Diffstat (limited to 'src/mesh')
-rw-r--r--src/mesh/gnunet-service-mesh.c12
-rw-r--r--src/mesh/mesh_api.c10
-rw-r--r--src/mesh/mesh_api_new.c6
-rw-r--r--src/mesh/test_mesh_api.c2
-rw-r--r--src/mesh/test_mesh_local_1.c6
-rw-r--r--src/mesh/test_mesh_local_2.c6
-rw-r--r--src/mesh/test_mesh_small.c2
-rw-r--r--src/mesh/test_mesh_small_unicast.c6
-rw-r--r--src/mesh/test_mesh_small_unicast_far.c4
9 files changed, 27 insertions, 27 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index 45d5d2cfd..434e448af 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -2015,7 +2015,7 @@ send_p2p_tunnel_destroy (void *cls, size_t size, void *buf)
2015static int 2015static int
2016handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, 2016handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer,
2017 const struct GNUNET_MessageHeader *message, 2017 const struct GNUNET_MessageHeader *message,
2018 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 2018 const struct GNUNET_ATS_Information *atsi)
2019{ 2019{
2020 unsigned int own_pos; 2020 unsigned int own_pos;
2021 uint16_t size; 2021 uint16_t size;
@@ -2205,7 +2205,7 @@ handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer,
2205static int 2205static int
2206handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer, 2206handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer,
2207 const struct GNUNET_MessageHeader *message, 2207 const struct GNUNET_MessageHeader *message,
2208 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 2208 const struct GNUNET_ATS_Information *atsi)
2209{ 2209{
2210 struct GNUNET_MESH_Unicast *msg; 2210 struct GNUNET_MESH_Unicast *msg;
2211 struct MeshTunnel *t; 2211 struct MeshTunnel *t;
@@ -2270,7 +2270,7 @@ handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer,
2270static int 2270static int
2271handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer, 2271handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer,
2272 const struct GNUNET_MessageHeader *message, 2272 const struct GNUNET_MessageHeader *message,
2273 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 2273 const struct GNUNET_ATS_Information *atsi)
2274{ 2274{
2275 struct GNUNET_MESH_Multicast *msg; 2275 struct GNUNET_MESH_Multicast *msg;
2276 struct GNUNET_PeerIdentity *id; 2276 struct GNUNET_PeerIdentity *id;
@@ -2364,7 +2364,7 @@ handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer,
2364static int 2364static int
2365handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, 2365handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer,
2366 const struct GNUNET_MessageHeader *message, 2366 const struct GNUNET_MessageHeader *message,
2367 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 2367 const struct GNUNET_ATS_Information *atsi)
2368{ 2368{
2369 struct GNUNET_MESH_ToOrigin *msg; 2369 struct GNUNET_MESH_ToOrigin *msg;
2370 struct GNUNET_PeerIdentity id; 2370 struct GNUNET_PeerIdentity id;
@@ -2455,7 +2455,7 @@ handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer,
2455static int 2455static int
2456handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer, 2456handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer,
2457 const struct GNUNET_MessageHeader *message, 2457 const struct GNUNET_MessageHeader *message,
2458 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 2458 const struct GNUNET_ATS_Information *atsi)
2459{ 2459{
2460 struct GNUNET_MESH_PathACK *msg; 2460 struct GNUNET_MESH_PathACK *msg;
2461 struct GNUNET_PeerIdentity id; 2461 struct GNUNET_PeerIdentity id;
@@ -3612,7 +3612,7 @@ core_init (void *cls, struct GNUNET_CORE_Handle *server,
3612 */ 3612 */
3613static void 3613static void
3614core_connect (void *cls, const struct GNUNET_PeerIdentity *peer, 3614core_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
3615 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 3615 const struct GNUNET_ATS_Information *atsi)
3616{ 3616{
3617 struct MeshPeerInfo *peer_info; 3617 struct MeshPeerInfo *peer_info;
3618 struct MeshPeerPath *path; 3618 struct MeshPeerPath *path;
diff --git a/src/mesh/mesh_api.c b/src/mesh/mesh_api.c
index 871318755..2067b7b6c 100644
--- a/src/mesh/mesh_api.c
+++ b/src/mesh/mesh_api.c
@@ -113,7 +113,7 @@ struct peer_list_element
113 /* list of application-types */ 113 /* list of application-types */
114 struct type_list_element *type_head, *type_tail; 114 struct type_list_element *type_head, *type_tail;
115 115
116 struct GNUNET_TRANSPORT_ATS_Information atsi; 116 struct GNUNET_ATS_Information atsi;
117 struct peer_list_element *next, *prev; 117 struct peer_list_element *next, *prev;
118 118
119 /* The handle that sends the hellos to this peer */ 119 /* The handle that sends the hellos to this peer */
@@ -254,7 +254,7 @@ schedule_hello_message (void *cls,
254 */ 254 */
255static void 255static void
256core_connect (void *cls, const struct GNUNET_PeerIdentity *peer, 256core_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
257 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 257 const struct GNUNET_ATS_Information *atsi)
258{ 258{
259 struct GNUNET_MESH_Handle *handle = cls; 259 struct GNUNET_MESH_Handle *handle = cls;
260 260
@@ -272,7 +272,7 @@ core_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
272 272
273 if (NULL != atsi) 273 if (NULL != atsi)
274 memcpy (&element->atsi, atsi, 274 memcpy (&element->atsi, atsi,
275 sizeof (struct GNUNET_TRANSPORT_ATS_Information)); 275 sizeof (struct GNUNET_ATS_Information));
276 276
277 GNUNET_CONTAINER_DLL_insert_after (handle->connected_peers.head, 277 GNUNET_CONTAINER_DLL_insert_after (handle->connected_peers.head,
278 handle->connected_peers.tail, 278 handle->connected_peers.tail,
@@ -383,7 +383,7 @@ core_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
383static int 383static int
384receive_hello (void *cls, const struct GNUNET_PeerIdentity *other, 384receive_hello (void *cls, const struct GNUNET_PeerIdentity *other,
385 const struct GNUNET_MessageHeader *message, 385 const struct GNUNET_MessageHeader *message,
386 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 386 const struct GNUNET_ATS_Information *atsi)
387{ 387{
388 struct GNUNET_MESH_Handle *handle = cls; 388 struct GNUNET_MESH_Handle *handle = cls;
389 uint16_t *num = (uint16_t *) (message + 1); 389 uint16_t *num = (uint16_t *) (message + 1);
@@ -469,7 +469,7 @@ receive_hello (void *cls, const struct GNUNET_PeerIdentity *other,
469static int 469static int
470core_receive (void *cls, const struct GNUNET_PeerIdentity *other, 470core_receive (void *cls, const struct GNUNET_PeerIdentity *other,
471 const struct GNUNET_MessageHeader *message, 471 const struct GNUNET_MessageHeader *message,
472 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 472 const struct GNUNET_ATS_Information *atsi)
473{ 473{
474 struct GNUNET_MESH_Handle *handle = cls; 474 struct GNUNET_MESH_Handle *handle = cls;
475 struct tunnel_message *tmessage = (struct tunnel_message *) message; 475 struct tunnel_message *tmessage = (struct tunnel_message *) message;
diff --git a/src/mesh/mesh_api_new.c b/src/mesh/mesh_api_new.c
index a85173e54..fda4e916f 100644
--- a/src/mesh/mesh_api_new.c
+++ b/src/mesh/mesh_api_new.c
@@ -749,7 +749,7 @@ process_tunnel_created (struct GNUNET_MESH_Handle *h,
749 const struct GNUNET_MESH_TunnelNotification *msg) 749 const struct GNUNET_MESH_TunnelNotification *msg)
750{ 750{
751 struct GNUNET_MESH_Tunnel *t; 751 struct GNUNET_MESH_Tunnel *t;
752 struct GNUNET_TRANSPORT_ATS_Information atsi; 752 struct GNUNET_ATS_Information atsi;
753 MESH_TunnelNumber tid; 753 MESH_TunnelNumber tid;
754 754
755 tid = ntohl (msg->tunnel_id); 755 tid = ntohl (msg->tunnel_id);
@@ -821,7 +821,7 @@ process_peer_event (struct GNUNET_MESH_Handle *h,
821{ 821{
822 struct GNUNET_MESH_Tunnel *t; 822 struct GNUNET_MESH_Tunnel *t;
823 struct GNUNET_MESH_Peer *p; 823 struct GNUNET_MESH_Peer *p;
824 struct GNUNET_TRANSPORT_ATS_Information atsi; 824 struct GNUNET_ATS_Information atsi;
825 GNUNET_PEER_Id id; 825 GNUNET_PEER_Id id;
826 uint16_t size; 826 uint16_t size;
827 827
@@ -928,7 +928,7 @@ process_incoming_data (struct GNUNET_MESH_Handle *h,
928 handler = &h->message_handlers[i]; 928 handler = &h->message_handlers[i];
929 if (handler->type == type) 929 if (handler->type == type)
930 { 930 {
931 struct GNUNET_TRANSPORT_ATS_Information atsi; 931 struct GNUNET_ATS_Information atsi;
932 932
933 atsi.type = 0; 933 atsi.type = 0;
934 atsi.value = 0; 934 atsi.value = 0;
diff --git a/src/mesh/test_mesh_api.c b/src/mesh/test_mesh_api.c
index 6821a1ab8..1699097f6 100644
--- a/src/mesh/test_mesh_api.c
+++ b/src/mesh/test_mesh_api.c
@@ -55,7 +55,7 @@ static int
55callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx, 55callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx,
56 const struct GNUNET_PeerIdentity *sender, 56 const struct GNUNET_PeerIdentity *sender,
57 const struct GNUNET_MessageHeader *message, 57 const struct GNUNET_MessageHeader *message,
58 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 58 const struct GNUNET_ATS_Information *atsi)
59{ 59{
60 return GNUNET_OK; 60 return GNUNET_OK;
61} 61}
diff --git a/src/mesh/test_mesh_local_1.c b/src/mesh/test_mesh_local_1.c
index d531dab6f..1c9196bb2 100644
--- a/src/mesh/test_mesh_local_1.c
+++ b/src/mesh/test_mesh_local_1.c
@@ -109,7 +109,7 @@ static int
109data_callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx, 109data_callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx,
110 const struct GNUNET_PeerIdentity *sender, 110 const struct GNUNET_PeerIdentity *sender,
111 const struct GNUNET_MessageHeader *message, 111 const struct GNUNET_MessageHeader *message,
112 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 112 const struct GNUNET_ATS_Information *atsi)
113{ 113{
114 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Data callback\n"); 114 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Data callback\n");
115 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply 115 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
@@ -132,7 +132,7 @@ data_callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx,
132static void * 132static void *
133inbound_tunnel (void *cls, struct GNUNET_MESH_Tunnel *tunnel, 133inbound_tunnel (void *cls, struct GNUNET_MESH_Tunnel *tunnel,
134 const struct GNUNET_PeerIdentity *initiator, 134 const struct GNUNET_PeerIdentity *initiator,
135 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 135 const struct GNUNET_ATS_Information *atsi)
136{ 136{
137 unsigned int id = *(unsigned int *) cls; 137 unsigned int id = *(unsigned int *) cls;
138 138
@@ -180,7 +180,7 @@ inbound_end (void *cls, const struct GNUNET_MESH_Tunnel *tunnel,
180 */ 180 */
181static void 181static void
182peer_conected (void *cls, const struct GNUNET_PeerIdentity *peer, 182peer_conected (void *cls, const struct GNUNET_PeerIdentity *peer,
183 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 183 const struct GNUNET_ATS_Information *atsi)
184{ 184{
185 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer connected\n"); 185 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer connected\n");
186 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_shutdown, NULL); 186 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_shutdown, NULL);
diff --git a/src/mesh/test_mesh_local_2.c b/src/mesh/test_mesh_local_2.c
index 1e42a5e9b..ee1e6c46a 100644
--- a/src/mesh/test_mesh_local_2.c
+++ b/src/mesh/test_mesh_local_2.c
@@ -109,7 +109,7 @@ static int
109data_callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx, 109data_callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx,
110 const struct GNUNET_PeerIdentity *sender, 110 const struct GNUNET_PeerIdentity *sender,
111 const struct GNUNET_MessageHeader *message, 111 const struct GNUNET_MessageHeader *message,
112 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 112 const struct GNUNET_ATS_Information *atsi)
113{ 113{
114 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Data callback\n"); 114 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Data callback\n");
115 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply 115 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
@@ -132,7 +132,7 @@ data_callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx,
132static void * 132static void *
133inbound_tunnel (void *cls, struct GNUNET_MESH_Tunnel *tunnel, 133inbound_tunnel (void *cls, struct GNUNET_MESH_Tunnel *tunnel,
134 const struct GNUNET_PeerIdentity *initiator, 134 const struct GNUNET_PeerIdentity *initiator,
135 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 135 const struct GNUNET_ATS_Information *atsi)
136{ 136{
137 unsigned int id = *(unsigned int *) cls; 137 unsigned int id = *(unsigned int *) cls;
138 138
@@ -180,7 +180,7 @@ inbound_end (void *cls, const struct GNUNET_MESH_Tunnel *tunnel,
180 */ 180 */
181static void 181static void
182peer_conected (void *cls, const struct GNUNET_PeerIdentity *peer, 182peer_conected (void *cls, const struct GNUNET_PeerIdentity *peer,
183 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 183 const struct GNUNET_ATS_Information *atsi)
184{ 184{
185 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer connected\n"); 185 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer connected\n");
186 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_shutdown, NULL); 186 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_shutdown, NULL);
diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c
index 0fd0b9766..a7ea4ee79 100644
--- a/src/mesh/test_mesh_small.c
+++ b/src/mesh/test_mesh_small.c
@@ -219,7 +219,7 @@ dh (void *cls, const struct GNUNET_PeerIdentity *peer)
219 */ 219 */
220static void 220static void
221ch (void *cls, const struct GNUNET_PeerIdentity *peer, 221ch (void *cls, const struct GNUNET_PeerIdentity *peer,
222 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 222 const struct GNUNET_ATS_Information *atsi)
223{ 223{
224 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "peer connected\n"); 224 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "peer connected\n");
225 return; 225 return;
diff --git a/src/mesh/test_mesh_small_unicast.c b/src/mesh/test_mesh_small_unicast.c
index 24db46d49..cc95a34e8 100644
--- a/src/mesh/test_mesh_small_unicast.c
+++ b/src/mesh/test_mesh_small_unicast.c
@@ -231,7 +231,7 @@ data_callback (void *cls,
231 void **tunnel_ctx, 231 void **tunnel_ctx,
232 const struct GNUNET_PeerIdentity *sender, 232 const struct GNUNET_PeerIdentity *sender,
233 const struct GNUNET_MessageHeader *message, 233 const struct GNUNET_MessageHeader *message,
234 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 234 const struct GNUNET_ATS_Information *atsi)
235{ 235{
236 long client = (long) cls; 236 long client = (long) cls;
237 237
@@ -293,7 +293,7 @@ static void *
293incoming_tunnel (void *cls, 293incoming_tunnel (void *cls,
294 struct GNUNET_MESH_Tunnel * tunnel, 294 struct GNUNET_MESH_Tunnel * tunnel,
295 const struct GNUNET_PeerIdentity * initiator, 295 const struct GNUNET_PeerIdentity * initiator,
296 const struct GNUNET_TRANSPORT_ATS_Information * atsi) 296 const struct GNUNET_ATS_Information * atsi)
297{ 297{
298 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 298 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
299 "test: Incoming tunnel from %s\n", 299 "test: Incoming tunnel from %s\n",
@@ -353,7 +353,7 @@ dh (void *cls, const struct GNUNET_PeerIdentity *peer)
353 */ 353 */
354static void 354static void
355ch (void *cls, const struct GNUNET_PeerIdentity *peer, 355ch (void *cls, const struct GNUNET_PeerIdentity *peer,
356 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 356 const struct GNUNET_ATS_Information *atsi)
357{ 357{
358 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 358 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
359 "test: peer %s connected\n", 359 "test: peer %s connected\n",
diff --git a/src/mesh/test_mesh_small_unicast_far.c b/src/mesh/test_mesh_small_unicast_far.c
index 8833ce287..d5a768f98 100644
--- a/src/mesh/test_mesh_small_unicast_far.c
+++ b/src/mesh/test_mesh_small_unicast_far.c
@@ -213,7 +213,7 @@ static void *
213incoming_tunnel (void *cls, 213incoming_tunnel (void *cls,
214 struct GNUNET_MESH_Tunnel * tunnel, 214 struct GNUNET_MESH_Tunnel * tunnel,
215 const struct GNUNET_PeerIdentity * initiator, 215 const struct GNUNET_PeerIdentity * initiator,
216 const struct GNUNET_TRANSPORT_ATS_Information * atsi) 216 const struct GNUNET_ATS_Information * atsi)
217{ 217{
218 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 218 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
219 "test: Incoming tunnel from %s\n", 219 "test: Incoming tunnel from %s\n",
@@ -269,7 +269,7 @@ dh (void *cls, const struct GNUNET_PeerIdentity *peer)
269 */ 269 */
270static void 270static void
271ch (void *cls, const struct GNUNET_PeerIdentity *peer, 271ch (void *cls, const struct GNUNET_PeerIdentity *peer,
272 const struct GNUNET_TRANSPORT_ATS_Information *atsi) 272 const struct GNUNET_ATS_Information *atsi)
273{ 273{
274 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 274 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
275 "test: peer %s connected\n", 275 "test: peer %s connected\n",