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/gnunet-service-dht.c | |
parent | ce4b5dc202a1d6297980f9036308b83f59e93cc0 (diff) | |
download | gnunet-32a1336441006bd6cce4ed7168c37679e78e06b6.tar.gz gnunet-32a1336441006bd6cce4ed7168c37679e78e06b6.zip |
renaming
Diffstat (limited to 'src/dht/gnunet-service-dht.c')
-rw-r--r-- | src/dht/gnunet-service-dht.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 | ||