diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-07-21 08:47:55 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-07-21 08:47:55 +0000 |
commit | 32a1336441006bd6cce4ed7168c37679e78e06b6 (patch) | |
tree | 2fb47a72e80d6074512f0de2586c63773d493c70 /src/dht | |
parent | ce4b5dc202a1d6297980f9036308b83f59e93cc0 (diff) | |
download | gnunet-32a1336441006bd6cce4ed7168c37679e78e06b6.tar.gz gnunet-32a1336441006bd6cce4ed7168c37679e78e06b6.zip |
renaming
Diffstat (limited to 'src/dht')
-rw-r--r-- | src/dht/dht.h | 12 | ||||
-rw-r--r-- | src/dht/dht_api.c | 4 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht.c | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/dht/dht.h b/src/dht/dht.h index 6f22a566a..82554dbaf 100644 --- a/src/dht/dht.h +++ b/src/dht/dht.h | |||
@@ -82,7 +82,7 @@ struct GNUNET_DHT_StopMessage | |||
82 | struct GNUNET_DHT_RouteMessage | 82 | struct GNUNET_DHT_RouteMessage |
83 | { | 83 | { |
84 | /** | 84 | /** |
85 | * Type: GNUNET_MESSAGE_TYPE_LOCAL_DHT_ROUTE | 85 | * Type: GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE |
86 | */ | 86 | */ |
87 | struct GNUNET_MessageHeader header; | 87 | struct GNUNET_MessageHeader header; |
88 | 88 | ||
@@ -118,7 +118,7 @@ struct GNUNET_DHT_RouteMessage | |||
118 | struct GNUNET_DHT_RouteResultMessage | 118 | struct GNUNET_DHT_RouteResultMessage |
119 | { | 119 | { |
120 | /** | 120 | /** |
121 | * Type: GNUNET_MESSAGE_TYPE_LOCAL_DHT_ROUTE_RESULT | 121 | * Type: GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_RESULT |
122 | */ | 122 | */ |
123 | struct GNUNET_MessageHeader header; | 123 | struct GNUNET_MessageHeader header; |
124 | 124 | ||
@@ -147,7 +147,7 @@ struct GNUNET_DHT_RouteResultMessage | |||
147 | struct GNUNET_DHT_P2PRouteMessage | 147 | struct GNUNET_DHT_P2PRouteMessage |
148 | { | 148 | { |
149 | /** | 149 | /** |
150 | * Type: GNUNET_MESSAGE_TYPE_P2P_DHT_ROUTE | 150 | * Type: GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE |
151 | */ | 151 | */ |
152 | struct GNUNET_MessageHeader header; | 152 | struct GNUNET_MessageHeader header; |
153 | 153 | ||
@@ -219,7 +219,7 @@ struct GNUNET_DHT_P2PRouteMessage | |||
219 | struct GNUNET_DHT_P2PRouteResultMessage | 219 | struct GNUNET_DHT_P2PRouteResultMessage |
220 | { | 220 | { |
221 | /** | 221 | /** |
222 | * Type: GNUNET_MESSAGE_TYPE_P2P_DHT_ROUTE_RESULT | 222 | * Type: GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE_RESULT |
223 | */ | 223 | */ |
224 | struct GNUNET_MessageHeader header; | 224 | struct GNUNET_MessageHeader header; |
225 | 225 | ||
@@ -267,7 +267,7 @@ struct GNUNET_DHT_P2PRouteResultMessage | |||
267 | struct GNUNET_DHT_PutMessage | 267 | struct GNUNET_DHT_PutMessage |
268 | { | 268 | { |
269 | /** | 269 | /** |
270 | * Type: GNUNET_MESSAGE_TYPE_DHT_PUT / GNUNET_MESSAGE_TYPE_P2P_DHT_PUT | 270 | * Type: GNUNET_MESSAGE_TYPE_DHT_PUT / GNUNET_MESSAGE_TYPE_DHT_P2P_PUT |
271 | */ | 271 | */ |
272 | struct GNUNET_MessageHeader header; | 272 | struct GNUNET_MessageHeader header; |
273 | 273 | ||
@@ -298,7 +298,7 @@ struct GNUNET_DHT_PutMessage | |||
298 | struct GNUNET_DHT_GetMessage | 298 | struct GNUNET_DHT_GetMessage |
299 | { | 299 | { |
300 | /** | 300 | /** |
301 | * Type: GNUNET_MESSAGE_TYPE_DHT_GET / GNUNET_MESSAGE_TYPE_P2P_DHT_GET | 301 | * Type: GNUNET_MESSAGE_TYPE_DHT_GET / GNUNET_MESSAGE_TYPE_DHT_P2P_GET |
302 | */ | 302 | */ |
303 | struct GNUNET_MessageHeader header; | 303 | struct GNUNET_MessageHeader header; |
304 | 304 | ||
diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c index 14c3a9a3f..7bec36d5b 100644 --- a/src/dht/dht_api.c +++ b/src/dht/dht_api.c | |||
@@ -585,7 +585,7 @@ service_message_handler (void *cls, | |||
585 | 585 | ||
586 | switch (ntohs (msg->type)) | 586 | switch (ntohs (msg->type)) |
587 | { | 587 | { |
588 | case GNUNET_MESSAGE_TYPE_LOCAL_DHT_ROUTE_RESULT: | 588 | case GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_RESULT: |
589 | { | 589 | { |
590 | dht_msg = (struct GNUNET_DHT_RouteResultMessage *) msg; | 590 | dht_msg = (struct GNUNET_DHT_RouteResultMessage *) msg; |
591 | uid = GNUNET_ntohll (dht_msg->unique_id); | 591 | uid = GNUNET_ntohll (dht_msg->unique_id); |
@@ -885,7 +885,7 @@ GNUNET_DHT_route_start (struct GNUNET_DHT_Handle *handle, | |||
885 | msize = sizeof (struct GNUNET_DHT_RouteMessage) + ntohs (enc->size); | 885 | msize = sizeof (struct GNUNET_DHT_RouteMessage) + ntohs (enc->size); |
886 | message = GNUNET_malloc (msize); | 886 | message = GNUNET_malloc (msize); |
887 | message->header.size = htons (msize); | 887 | message->header.size = htons (msize); |
888 | message->header.type = htons (GNUNET_MESSAGE_TYPE_LOCAL_DHT_ROUTE); | 888 | message->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE); |
889 | memcpy (&message->key, key, sizeof (GNUNET_HashCode)); | 889 | memcpy (&message->key, key, sizeof (GNUNET_HashCode)); |
890 | message->options = htonl (options); | 890 | message->options = htonl (options); |
891 | message->desired_replication_level = htonl (options); | 891 | message->desired_replication_level = htonl (options); |
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c index 6fe910ecd..dee6e15f9 100644 --- a/src/dht/gnunet-service-dht.c +++ b/src/dht/gnunet-service-dht.c | |||
@@ -565,7 +565,7 @@ static void forward_result_message (void *cls, | |||
565 | pending->timeout = GNUNET_TIME_relative_get_forever(); | 565 | pending->timeout = GNUNET_TIME_relative_get_forever(); |
566 | result_message = (struct GNUNET_DHT_P2PRouteResultMessage *)pending->msg; | 566 | result_message = (struct GNUNET_DHT_P2PRouteResultMessage *)pending->msg; |
567 | result_message->header.size = htons(msize); | 567 | result_message->header.size = htons(msize); |
568 | result_message->header.type = htons(GNUNET_MESSAGE_TYPE_P2P_DHT_ROUTE_RESULT); | 568 | result_message->header.type = htons(GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE_RESULT); |
569 | result_message->options = htonl(msg_ctx->msg_options); | 569 | result_message->options = htonl(msg_ctx->msg_options); |
570 | result_message->hop_count = htonl(msg_ctx->hop_count + 1); | 570 | result_message->hop_count = htonl(msg_ctx->hop_count + 1); |
571 | GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_bloomfilter_get_raw_data(msg_ctx->bloom, result_message->bloomfilter, DHT_BLOOM_SIZE)); | 571 | GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_bloomfilter_get_raw_data(msg_ctx->bloom, result_message->bloomfilter, DHT_BLOOM_SIZE)); |
@@ -1096,7 +1096,7 @@ send_reply_to_client (struct ClientList *client, | |||
1096 | pending_message = GNUNET_malloc (sizeof (struct PendingMessage) + tsize); | 1096 | pending_message = GNUNET_malloc (sizeof (struct PendingMessage) + tsize); |
1097 | pending_message->msg = (struct GNUNET_MessageHeader *)&pending_message[1]; | 1097 | pending_message->msg = (struct GNUNET_MessageHeader *)&pending_message[1]; |
1098 | reply = (struct GNUNET_DHT_RouteResultMessage *)&pending_message[1]; | 1098 | reply = (struct GNUNET_DHT_RouteResultMessage *)&pending_message[1]; |
1099 | reply->header.type = htons (GNUNET_MESSAGE_TYPE_LOCAL_DHT_ROUTE_RESULT); | 1099 | reply->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_RESULT); |
1100 | reply->header.size = htons (tsize); | 1100 | reply->header.size = htons (tsize); |
1101 | reply->unique_id = GNUNET_htonll (uid); | 1101 | reply->unique_id = GNUNET_htonll (uid); |
1102 | memcpy (&reply[1], message, msize); | 1102 | memcpy (&reply[1], message, msize); |
@@ -1795,7 +1795,7 @@ static void forward_message (void *cls, | |||
1795 | pending->timeout = GNUNET_TIME_relative_get_forever(); | 1795 | pending->timeout = GNUNET_TIME_relative_get_forever(); |
1796 | route_message = (struct GNUNET_DHT_P2PRouteMessage *)pending->msg; | 1796 | route_message = (struct GNUNET_DHT_P2PRouteMessage *)pending->msg; |
1797 | route_message->header.size = htons(msize); | 1797 | route_message->header.size = htons(msize); |
1798 | route_message->header.type = htons(GNUNET_MESSAGE_TYPE_P2P_DHT_ROUTE); | 1798 | route_message->header.type = htons(GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE); |
1799 | route_message->options = htonl(msg_ctx->msg_options); | 1799 | route_message->options = htonl(msg_ctx->msg_options); |
1800 | route_message->hop_count = htonl(msg_ctx->hop_count + 1); | 1800 | route_message->hop_count = htonl(msg_ctx->hop_count + 1); |
1801 | route_message->network_size = htonl(msg_ctx->network_size); | 1801 | route_message->network_size = htonl(msg_ctx->network_size); |
@@ -2368,15 +2368,15 @@ core_init (void *cls, | |||
2368 | 2368 | ||
2369 | 2369 | ||
2370 | static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = { | 2370 | static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = { |
2371 | {&handle_dht_local_route_request, NULL, GNUNET_MESSAGE_TYPE_LOCAL_DHT_ROUTE, 0}, | 2371 | {&handle_dht_local_route_request, NULL, GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE, 0}, |
2372 | {&handle_dht_local_route_stop, NULL, GNUNET_MESSAGE_TYPE_DHT_ROUTE_STOP, 0}, | 2372 | {&handle_dht_local_route_stop, NULL, GNUNET_MESSAGE_TYPE_DHT_ROUTE_STOP, 0}, |
2373 | {NULL, NULL, 0, 0} | 2373 | {NULL, NULL, 0, 0} |
2374 | }; | 2374 | }; |
2375 | 2375 | ||
2376 | 2376 | ||
2377 | static struct GNUNET_CORE_MessageHandler core_handlers[] = { | 2377 | static struct GNUNET_CORE_MessageHandler core_handlers[] = { |
2378 | {&handle_dht_p2p_route_request, GNUNET_MESSAGE_TYPE_P2P_DHT_ROUTE, 0}, | 2378 | {&handle_dht_p2p_route_request, GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE, 0}, |
2379 | {&handle_dht_p2p_route_result, GNUNET_MESSAGE_TYPE_P2P_DHT_ROUTE_RESULT, 0}, | 2379 | {&handle_dht_p2p_route_result, GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE_RESULT, 0}, |
2380 | {NULL, 0, 0} | 2380 | {NULL, 0, 0} |
2381 | }; | 2381 | }; |
2382 | 2382 | ||