diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-04-19 15:22:23 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-04-19 15:22:23 +0000 |
commit | 44b9867d329a7046a4c9c3ac5628847e174abb9d (patch) | |
tree | f422a77a07f76d7d1675218af8071e365a38b188 /src/dht | |
parent | adf272d3c8a1620dbf6e49b1c57f5c0400487426 (diff) | |
download | gnunet-44b9867d329a7046a4c9c3ac5628847e174abb9d.tar.gz gnunet-44b9867d329a7046a4c9c3ac5628847e174abb9d.zip |
- Add local DHT request to the monitoring results
Diffstat (limited to 'src/dht')
-rw-r--r-- | src/dht/gnunet-service-dht_clients.c | 11 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht_neighbours.c | 12 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht_neighbours.h | 9 |
3 files changed, 32 insertions, 0 deletions
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c index fad2d1483..2046f4990 100644 --- a/src/dht/gnunet-service-dht_clients.c +++ b/src/dht/gnunet-service-dht_clients.c | |||
@@ -490,6 +490,12 @@ handle_dht_local_put (void *cls, struct GNUNET_SERVER_Client *client, | |||
490 | peer_bf, &dht_msg->key, 0, NULL, &dht_msg[1], | 490 | peer_bf, &dht_msg->key, 0, NULL, &dht_msg[1], |
491 | size - | 491 | size - |
492 | sizeof (struct GNUNET_DHT_ClientPutMessage)); | 492 | sizeof (struct GNUNET_DHT_ClientPutMessage)); |
493 | GDS_CLIENTS_process_monitor (GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT, | ||
494 | GNUNET_TIME_absolute_ntoh (dht_msg->expiration), &dht_msg->key, | ||
495 | 1, GDS_NEIGHBOURS_get_id(), 0, NULL, | ||
496 | ntohl (dht_msg->desired_replication_level), | ||
497 | ntohl (dht_msg->type), &(dht_msg[1].header), | ||
498 | size - sizeof (struct GNUNET_DHT_ClientPutMessage)); | ||
493 | GNUNET_CONTAINER_bloomfilter_free (peer_bf); | 499 | GNUNET_CONTAINER_bloomfilter_free (peer_bf); |
494 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 500 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
495 | } | 501 | } |
@@ -548,6 +554,11 @@ handle_dht_local_get (void *cls, struct GNUNET_SERVER_Client *client, | |||
548 | cqr->type = ntohl (get->type); | 554 | cqr->type = ntohl (get->type); |
549 | GNUNET_CONTAINER_multihashmap_put (forward_map, &get->key, cqr, | 555 | GNUNET_CONTAINER_multihashmap_put (forward_map, &get->key, cqr, |
550 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); | 556 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); |
557 | GDS_CLIENTS_process_monitor (GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET, | ||
558 | GNUNET_TIME_UNIT_FOREVER_ABS, &get->key, | ||
559 | 0, NULL, 1, GDS_NEIGHBOURS_get_id(), | ||
560 | ntohl (get->desired_replication_level), | ||
561 | ntohl (get->type), NULL, 0); | ||
551 | /* start remote requests */ | 562 | /* start remote requests */ |
552 | if (GNUNET_SCHEDULER_NO_TASK != retry_task) | 563 | if (GNUNET_SCHEDULER_NO_TASK != retry_task) |
553 | GNUNET_SCHEDULER_cancel (retry_task); | 564 | GNUNET_SCHEDULER_cancel (retry_task); |
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index 4ea5dd6f4..e7c1fbee3 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c | |||
@@ -1826,6 +1826,7 @@ handle_dht_p2p_get (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
1826 | 1, GNUNET_NO); | 1826 | 1, GNUNET_NO); |
1827 | } | 1827 | } |
1828 | 1828 | ||
1829 | /* FIXME Path */ | ||
1829 | GDS_CLIENTS_process_monitor (GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET, | 1830 | GDS_CLIENTS_process_monitor (GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET, |
1830 | GNUNET_TIME_UNIT_FOREVER_ABS, &get->key, 0, NULL, 0, NULL, | 1831 | GNUNET_TIME_UNIT_FOREVER_ABS, &get->key, 0, NULL, 0, NULL, |
1831 | ntohl (get->desired_replication_level), type, NULL, 0); | 1832 | ntohl (get->desired_replication_level), type, NULL, 0); |
@@ -2025,5 +2026,16 @@ GDS_NEIGHBOURS_done () | |||
2025 | } | 2026 | } |
2026 | } | 2027 | } |
2027 | 2028 | ||
2029 | /** | ||
2030 | * Get the ID of the local node. | ||
2031 | * | ||
2032 | * @return identity of the local node | ||
2033 | */ | ||
2034 | struct GNUNET_PeerIdentity * | ||
2035 | GDS_NEIGHBOURS_get_id () | ||
2036 | { | ||
2037 | return &my_identity; | ||
2038 | } | ||
2039 | |||
2028 | 2040 | ||
2029 | /* end of gnunet-service-dht_neighbours.c */ | 2041 | /* end of gnunet-service-dht_neighbours.c */ |
diff --git a/src/dht/gnunet-service-dht_neighbours.h b/src/dht/gnunet-service-dht_neighbours.h index b6e0f0ec0..329763846 100644 --- a/src/dht/gnunet-service-dht_neighbours.h +++ b/src/dht/gnunet-service-dht_neighbours.h | |||
@@ -135,4 +135,13 @@ void | |||
135 | GDS_NEIGHBOURS_done (void); | 135 | GDS_NEIGHBOURS_done (void); |
136 | 136 | ||
137 | 137 | ||
138 | /** | ||
139 | * Get the ID of the local node. | ||
140 | * | ||
141 | * @return identity of the local node | ||
142 | */ | ||
143 | struct GNUNET_PeerIdentity * | ||
144 | GDS_NEIGHBOURS_get_id (); | ||
145 | |||
146 | |||
138 | #endif | 147 | #endif |