[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12680 - gnunet/src/dht
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r12680 - gnunet/src/dht |
|
Date: |
Thu, 19 Aug 2010 17:57:37 +0200 |
Author: nevans
Date: 2010-08-19 17:57:37 +0200 (Thu, 19 Aug 2010)
New Revision: 12680
Modified:
gnunet/src/dht/dht.h
gnunet/src/dht/dhtlog.h
gnunet/src/dht/gnunet-dht-driver.c
gnunet/src/dht/gnunet-service-dht.c
gnunet/src/dht/plugin_dhtlog_dummy.c
gnunet/src/dht/plugin_dhtlog_mysql.c
gnunet/src/dht/plugin_dhtlog_mysql_dump.c
gnunet/src/dht/test_dhtlog.c
Log:
dht changes i don't want to have only on my machine
Modified: gnunet/src/dht/dht.h
===================================================================
--- gnunet/src/dht/dht.h 2010-08-19 15:08:54 UTC (rev 12679)
+++ gnunet/src/dht/dht.h 2010-08-19 15:57:37 UTC (rev 12680)
@@ -43,6 +43,7 @@
#define STAT_ROUTES "# DHT ROUTE Requests Seen"
#define STAT_ROUTE_FORWARDS "# DHT ROUTE Requests Forwarded"
+#define STAT_ROUTE_FORWARDS_CLOSEST "# DHT ROUTE Requests Forwarded to Closest
Known Peer"
#define STAT_RESULTS "# DHT ROUTE RESULT Requests Seen"
#define STAT_RESULTS_TO_CLIENT "# DHT ROUTE RESULT Sent to Client"
#define STAT_RESULT_FORWARDS "# DHT ROUTE RESULT Requests Forwarded"
@@ -57,6 +58,8 @@
#define STAT_GET_REPLY "# DHT GET Responses Received"
#define STAT_FIND_PEER_ANSWER "# DHT FIND_PEER Responses Initiated"
#define STAT_GET_RESPONSE_START "# DHT GET Responses Initiated"
+#define STAT_HELLOS_PROVIDED "# HELLO Messages given to transport"
+#define STAT_DISCONNECTS "# Disconnects received"
typedef void (*GNUNET_DHT_MessageReceivedHandler) (void *cls,
const struct
GNUNET_MessageHeader
Modified: gnunet/src/dht/dhtlog.h
===================================================================
--- gnunet/src/dht/dhtlog.h 2010-08-19 15:08:54 UTC (rev 12679)
+++ gnunet/src/dht/dhtlog.h 2010-08-19 15:57:37 UTC (rev 12680)
@@ -178,6 +178,16 @@
unsigned int gets_succeeded);
/*
+ * Update dhttests.nodes table setting the identified
+ * node as a malicious dropper.
+ *
+ * @param peer the peer that was set to be malicious
+ *
+ * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
+ */
+ int (*set_malicious) (struct GNUNET_PeerIdentity *peer);
+
+ /*
* Records the current topology (number of connections, time, trial)
*
* @param num_connections how many connections are in the topology
@@ -197,6 +207,21 @@
int (*insert_extended_topology) (const struct GNUNET_PeerIdentity *first,
const struct GNUNET_PeerIdentity *second);
/*
+ * Inserts the specified stats into the dhttests.generic_stats table
+ *
+ * @param peer the peer inserting the statistic
+ * @param name the name of the statistic
+ * @param section the section of the statistic
+ * @param value the value of the statistic
+ *
+ * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ */
+ int
+ (*add_generic_stat) (const struct GNUNET_PeerIdentity *peer,
+ const char *name,
+ const char *section, uint64_t value);
+
+ /*
* Update dhttests.trials table with total connections information
*
* @param trialuid the trialuid to update
Modified: gnunet/src/dht/gnunet-dht-driver.c
===================================================================
--- gnunet/src/dht/gnunet-dht-driver.c 2010-08-19 15:08:54 UTC (rev 12679)
+++ gnunet/src/dht/gnunet-dht-driver.c 2010-08-19 15:57:37 UTC (rev 12680)
@@ -639,6 +639,8 @@
{
struct StatisticsIteratorContext *stats_ctx;
+ if (dhtlog_handle != NULL)
+ dhtlog_handle->add_generic_stat(peer, name, subsystem, value);
if (GNUNET_CONTAINER_multihashmap_contains(stats_map, &peer->hashPubKey))
{
stats_ctx = GNUNET_CONTAINER_multihashmap_get(stats_map,
&peer->hashPubKey);
@@ -1345,10 +1347,7 @@
expected_connections = GNUNET_TESTING_connect_topology (pg,
connect_topology, connect_topology_option, connect_topology_option_modifier);
peer_connect_meter = create_meter(expected_connections, "Peer
connection ", GNUNET_YES);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Have %d expected connections\n", expected_connections);
-#endif
+ fprintf(stderr, "Have %d expected connections\n",
expected_connections);
}
if (expected_connections == GNUNET_SYSERR)
Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2010-08-19 15:08:54 UTC (rev 12679)
+++ gnunet/src/dht/gnunet-service-dht.c 2010-08-19 15:57:37 UTC (rev 12680)
@@ -44,7 +44,7 @@
#define PRINT_TABLES GNUNET_NO
-#define EXTRA_CHECKS GNUNET_YES
+#define EXTRA_CHECKS GNUNET_NO
/**
* How many buckets will we allow total.
*/
@@ -58,7 +58,7 @@
/**
* What is the maximum number of peers in a given bucket.
*/
-#define DEFAULT_BUCKET_SIZE 8
+#define DEFAULT_BUCKET_SIZE 4
/**
* Minimum number of peers we need for "good" routing,
@@ -67,17 +67,56 @@
*/
#define MINIMUM_PEER_THRESHOLD 20
-#define DHT_DEFAULT_FIND_PEER_REPLICATION 10
+
#define DHT_MAX_RECENT 100
+/**
+ * Default time to wait to send messages on behalf of other peers.
+ */
+#define DHT_DEFAULT_P2P_TIMEOUT GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10);
+
+/**
+ * Default importance for handling messages on behalf of other peers.
+ */
+#define DHT_DEFAULT_P2P_IMPORTANCE 0
+
+/**
+ * Default time to wait to send find peer messages sent by the dht service.
+ */
+#define DHT_DEFAULT_FIND_PEER_TIMEOUT GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 30);
+
+/**
+ * Default importance for find peer messages sent by the dht service.
+ */
+#define DHT_DEFAULT_FIND_PEER_IMPORTANCE 8
+
+/**
+ * Default replication parameter for find peer messages sent by the dht
service.
+ */
+#define DHT_DEFAULT_FIND_PEER_REPLICATION 10
+
+/**
+ * Default options for find peer requests sent by the dht service.
+ */
#define DHT_DEFAULT_FIND_PEER_OPTIONS GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE
-#define DHT_MINIMUM_FIND_PEER_INTERVAL
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 1)
+/**
+ * How long at least to wait before sending another find peer request.
+ */
+#define DHT_MINIMUM_FIND_PEER_INTERVAL
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 2)
+/**
+ * How long at most to wait before sending another find peer request.
+ */
#define DHT_MAXIMUM_FIND_PEER_INTERVAL
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)
/**
+ * How often to update our preference levels for peers in our routing tables.
+ */
+#define DHT_DEFAULT_PREFERENCE_INTERVAL
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 2)
+
+/**
* How many initial requests to send out (in true Kademlia fashion)
*/
#define DHT_KADEMLIA_REPLICATION 3
@@ -174,6 +213,16 @@
GNUNET_SCHEDULER_TaskIdentifier send_task;
/**
+ * Task for scheduling preference updates
+ */
+ GNUNET_SCHEDULER_TaskIdentifier preference_task;
+
+ /**
+ * Preference update context
+ */
+ struct GNUNET_CORE_InformationRequestContext *info_ctx;
+
+ /**
* What is the average latency for replies received?
*/
struct GNUNET_TIME_Relative latency;
@@ -334,6 +383,16 @@
uint32_t hop_count;
/**
+ * How important is this message?
+ */
+ unsigned int importance;
+
+ /**
+ * How long should we wait to transmit this request?
+ */
+ struct GNUNET_TIME_Relative timeout;
+
+ /**
* Bloomfilter for this routing request.
*/
struct GNUNET_CONTAINER_BloomFilter *bloom;
@@ -488,6 +547,12 @@
static int stop_on_found;
/**
+ * How many peers have we added since we sent out our last
+ * find peer request?
+ */
+static unsigned int newly_found_peers;
+
+/**
* Container of active queries we should remember
*/
static struct DHTResults forward_list;
@@ -913,6 +978,7 @@
return actual_bucket;
}
+#if EXTRA_CHECKS
/**
* Find a routing table entry from a peer identity
*
@@ -939,6 +1005,7 @@
return GNUNET_SYSERR; /* No such peer. */
}
+#endif
#if PRINT_TABLES
/**
@@ -999,7 +1066,61 @@
return NULL; /* No such peer. */
}
+/* Forward declaration */
+static void
+update_core_preference (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc);
/**
+ * Function called with statistics about the given peer.
+ *
+ * @param cls closure
+ * @param peer identifies the peer
+ * @param bpm_in set to the current bandwidth limit (receiving) for this peer
+ * @param bpm_out set to the current bandwidth limit (sending) for this peer
+ * @param latency current latency estimate, "FOREVER" if we have been
+ * disconnected
+ * @param amount set to the amount that was actually reserved or unreserved;
+ * either the full requested amount or zero (no partial
reservations)
+ * @param preference current traffic preference for the given peer
+ */
+static void
+update_core_preference_finish (void *cls,
+ const struct
+ GNUNET_PeerIdentity * peer,
+ struct GNUNET_BANDWIDTH_Value32NBO bpm_in,
+ struct GNUNET_BANDWIDTH_Value32NBO bpm_out,
+ int amount,
+ uint64_t preference)
+{
+ struct PeerInfo *peer_info = cls;
+ peer_info->info_ctx = NULL;
+ GNUNET_SCHEDULER_add_delayed(sched, DHT_DEFAULT_PREFERENCE_INTERVAL,
&update_core_preference, peer_info);
+}
+
+static void
+update_core_preference (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct PeerInfo *peer = cls;
+ uint64_t preference;
+
+ if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ {
+ return;
+ }
+
+ preference = 2 << matching_bits(&my_identity.hashPubKey,
&peer->id.hashPubKey);
+ peer->info_ctx = GNUNET_CORE_peer_change_preference (sched, cfg,
+ &peer->id,
+
GNUNET_TIME_relative_get_forever(),
+
GNUNET_BANDWIDTH_value_init (UINT32_MAX),
+ 0,
+ preference,
+
&update_core_preference_finish,
+ peer);
+}
+
+/**
* Really add a peer to a bucket (only do assertions
* on size, etc.)
*
@@ -1023,6 +1144,7 @@
new_peer = GNUNET_malloc(sizeof(struct PeerInfo));
new_peer->latency = latency;
new_peer->distance = distance;
+
memcpy(&new_peer->id, peer, sizeof(struct GNUNET_PeerIdentity));
GNUNET_CONTAINER_DLL_insert_after(k_buckets[bucket].head,
@@ -1031,6 +1153,11 @@
new_peer);
k_buckets[bucket].peers_size++;
+ if ((matching_bits(&my_identity.hashPubKey, &peer->hashPubKey) > 0) &&
(k_buckets[bucket].peers_size <= bucket_size))
+ {
+ new_peer->preference_task = GNUNET_SCHEDULER_add_now(sched,
&update_core_preference, new_peer);
+ }
+
return new_peer;
}
@@ -1166,6 +1293,50 @@
}
/**
+ * Find the closest peer in our routing table to the
+ * given hashcode.
+ *
+ * @return The closest peer in our routing table to the
+ * key, or NULL on error.
+ */
+static struct PeerInfo *
+find_closest_peer (const GNUNET_HashCode *hc)
+{
+ struct PeerInfo *pos;
+ struct PeerInfo *current_closest;
+ unsigned int lowest_distance;
+ unsigned int temp_distance;
+ int bucket;
+ int count;
+
+ lowest_distance = -1;
+
+ if (k_buckets[lowest_bucket].peers_size == 0)
+ return NULL;
+
+ current_closest = NULL;
+ for (bucket = lowest_bucket; bucket < MAX_BUCKETS; bucket++)
+ {
+ pos = k_buckets[bucket].head;
+ count = 0;
+ while ((pos != NULL) && (count < bucket_size))
+ {
+ temp_distance = distance(&pos->id.hashPubKey, hc);
+ if (temp_distance <= lowest_distance)
+ {
+ lowest_distance = temp_distance;
+ current_closest = pos;
+ }
+ pos = pos->next;
+ count++;
+ }
+ }
+ GNUNET_assert(current_closest != NULL);
+ return current_closest;
+}
+
+
+/**
* Function called to send a request out to another peer.
* Called both for locally initiated requests and those
* received from other peers.
@@ -1186,13 +1357,17 @@
size_t psize;
increment_stats(STAT_ROUTE_FORWARDS);
+
+ if ((msg_ctx->closest != GNUNET_YES) && (peer ==
find_closest_peer(msg_ctx->key)))
+ increment_stats(STAT_ROUTE_FORWARDS_CLOSEST);
+
msize = sizeof (struct GNUNET_DHT_P2PRouteMessage) + ntohs(msg->size);
GNUNET_assert(msize <= GNUNET_SERVER_MAX_MESSAGE_SIZE);
psize = sizeof(struct P2PPendingMessage) + msize;
pending = GNUNET_malloc(psize);
pending->msg = (struct GNUNET_MessageHeader *)&pending[1];
- pending->importance = DHT_SEND_PRIORITY;
- pending->timeout = GNUNET_TIME_relative_get_forever();
+ pending->importance = msg_ctx->importance;
+ pending->timeout = msg_ctx->timeout;
route_message = (struct GNUNET_DHT_P2PRouteMessage *)pending->msg;
route_message->header.size = htons(msize);
route_message->header.type = htons(GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE);
@@ -1447,7 +1622,7 @@
{
int bucket;
- if (GNUNET_CONTAINER_multihashmap_contains(all_known_peers,
&peer->hashPubKey))
+ if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains(all_known_peers,
&peer->hashPubKey))
return GNUNET_NO; /* We already know this peer (are connected even!) */
bucket = find_current_bucket(&peer->hashPubKey);
if ((k_buckets[bucket].peers_size < bucket_size) || ((bucket ==
lowest_bucket) && (lowest_bucket > 0)))
@@ -1495,6 +1670,7 @@
increment_stats(STAT_FIND_PEER_REPLY);
if (GNUNET_YES == consider_peer(&new_peer))
{
+ increment_stats(STAT_HELLOS_PROVIDED);
GNUNET_TRANSPORT_offer_hello(transport_handle, hello_msg);
/* GNUNET_CORE_peer_request_connect(sched, cfg,
GNUNET_TIME_UNIT_FOREVER_REL, &new_peer, NULL, NULL); */
/* peer_request_connect call causes service to segfault */
@@ -1648,6 +1824,8 @@
new_msg_ctx->peer = &my_identity;
new_msg_ctx->bloom = GNUNET_CONTAINER_bloomfilter_init (NULL,
DHT_BLOOM_SIZE, DHT_BLOOM_K);
new_msg_ctx->hop_count = 0;
+ new_msg_ctx->importance = DHT_DEFAULT_P2P_IMPORTANCE * 2; /* Make result
routing a higher priority */
+ new_msg_ctx->timeout = DHT_DEFAULT_P2P_TIMEOUT;
increment_stats(STAT_GET_RESPONSE_START);
route_result_message(cls, &get_result->header, new_msg_ctx);
GNUNET_free(new_msg_ctx);
@@ -1776,6 +1954,11 @@
#endif
return;
}
+
+
+ if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test(message_context->bloom,
&my_identity.hashPubKey))
+ return; /* We match the bloomfilter, do not send a response to this peer
(they likely already know us!)*/
+
/* Simplistic find_peer functionality, always return our hello */
hello_size = ntohs(my_hello->size);
tsize = hello_size + sizeof (struct GNUNET_MessageHeader);
@@ -1800,6 +1983,8 @@
new_msg_ctx->peer = &my_identity;
new_msg_ctx->bloom = GNUNET_CONTAINER_bloomfilter_init (NULL,
DHT_BLOOM_SIZE, DHT_BLOOM_K);
new_msg_ctx->hop_count = 0;
+ new_msg_ctx->importance = DHT_DEFAULT_P2P_IMPORTANCE * 2; /* Make find peer
requests a higher priority */
+ new_msg_ctx->timeout = DHT_DEFAULT_P2P_TIMEOUT;
increment_stats(STAT_FIND_PEER_ANSWER);
route_result_message(cls, find_peer_result, new_msg_ctx);
GNUNET_free(new_msg_ctx);
@@ -1978,49 +2163,6 @@
return target_value;
}
-/**
- * Find the closest peer in our routing table to the
- * given hashcode.
- *
- * @return The closest peer in our routing table to the
- * key, or NULL on error.
- */
-static struct PeerInfo *
-find_closest_peer (const GNUNET_HashCode *hc)
-{
- struct PeerInfo *pos;
- struct PeerInfo *current_closest;
- unsigned int lowest_distance;
- unsigned int temp_distance;
- int bucket;
- int count;
-
- lowest_distance = -1;
-
- if (k_buckets[lowest_bucket].peers_size == 0)
- return NULL;
-
- current_closest = NULL;
- for (bucket = lowest_bucket; bucket < MAX_BUCKETS; bucket++)
- {
- pos = k_buckets[bucket].head;
- count = 0;
- while ((pos != NULL) && (count < bucket_size))
- {
- temp_distance = distance(&pos->id.hashPubKey, hc);
- if (temp_distance <= lowest_distance)
- {
- lowest_distance = temp_distance;
- current_closest = pos;
- }
- pos = pos->next;
- count++;
- }
- }
- GNUNET_assert(current_closest != NULL);
- return current_closest;
-}
-
/*
* Check whether my identity is closer than any known peers.
*
@@ -2090,7 +2232,6 @@
}
-
/**
* Select a peer from the routing table that would be a good routing
* destination for sending a message for "target". The resulting peer
@@ -2357,8 +2498,6 @@
return 0;
}
-
-
increment_stats(STAT_ROUTES);
message_context->closest = am_closest_peer(message_context->key);
forward_count = get_forward_count(message_context->hop_count,
message_context->replication);
@@ -2368,8 +2507,8 @@
message_context->bloom = GNUNET_CONTAINER_bloomfilter_init (NULL,
DHT_BLOOM_SIZE, DHT_BLOOM_K);
GNUNET_CONTAINER_bloomfilter_add (message_context->bloom,
&my_identity.hashPubKey);
- if (((stop_on_closest == GNUNET_YES) && (message_context->closest ==
GNUNET_YES) && (ntohs(msg->type) == GNUNET_MESSAGE_TYPE_DHT_PUT))
- || ((strict_kademlia == GNUNET_YES) && (message_context->closest ==
GNUNET_YES)))
+ if ((stop_on_closest == GNUNET_YES) && (message_context->closest ==
GNUNET_YES) && (ntohs(msg->type) == GNUNET_MESSAGE_TYPE_DHT_PUT))
+/* || ((strict_kademlia == GNUNET_YES) && (message_context->closest ==
GNUNET_YES))) */
forward_count = 0;
#if DEBUG_DHT_ROUTING
@@ -2542,7 +2681,7 @@
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
return;
- put_message.header.size = htons(sizeof(struct GNUNET_DHT_GetMessage));
+ put_message.header.size = htons(sizeof(struct GNUNET_DHT_PutMessage));
put_message.header.type = htons(GNUNET_MESSAGE_TYPE_DHT_PUT);
put_message.type = htons(DHT_MALICIOUS_MESSAGE_TYPE);
put_message.expiration =
GNUNET_TIME_absolute_hton(GNUNET_TIME_absolute_get_forever());
@@ -2557,7 +2696,8 @@
message_context.msg_options = ntohl (0);
message_context.network_size = estimate_diameter();
message_context.peer = &my_identity;
-
+ message_context.importance = DHT_DEFAULT_P2P_IMPORTANCE; /* Make result
routing a higher priority */
+ message_context.timeout = DHT_DEFAULT_P2P_TIMEOUT;
if (dhtlog_handle != NULL)
dhtlog_handle->insert_dhtkey(NULL, &key);
increment_stats(STAT_PUT_START);
@@ -2599,7 +2739,8 @@
message_context.msg_options = ntohl (0);
message_context.network_size = estimate_diameter();
message_context.peer = &my_identity;
-
+ message_context.importance = DHT_DEFAULT_P2P_IMPORTANCE; /* Make result
routing a higher priority */
+ message_context.timeout = DHT_DEFAULT_P2P_TIMEOUT;
if (dhtlog_handle != NULL)
dhtlog_handle->insert_dhtkey(NULL, &key);
increment_stats(STAT_GET_START);
@@ -2608,7 +2749,30 @@
GNUNET_SCHEDULER_add_delayed(sched,
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS,
malicious_get_frequency), &malicious_get_task, NULL);
}
+#if DO_FIND_PEER
+
+
/**
+ * Iterator over hash map entries.
+ *
+ * @param cls closure
+ * @param key current key code
+ * @param value value in the hash map
+ * @return GNUNET_YES if we should continue to
+ * iterate,
+ * GNUNET_NO if not.
+ */
+static int
+add_known_to_bloom (void *cls,
+ const GNUNET_HashCode * key,
+ void *value)
+{
+ struct GNUNET_CONTAINER_BloomFilter *bloom = cls;
+ GNUNET_CONTAINER_bloomfilter_add (bloom, key);
+ return GNUNET_YES;
+}
+
+/**
* Task to send a find peer message for our own peer identifier
* so that we can find the closest peers in the network to ourselves
* and attempt to connect to them.
@@ -2639,19 +2803,36 @@
message_context.msg_options = ntohl (DHT_DEFAULT_FIND_PEER_OPTIONS);
message_context.network_size = estimate_diameter();
message_context.peer = &my_identity;
+ message_context.importance = DHT_DEFAULT_FIND_PEER_IMPORTANCE;
+ message_context.timeout = DHT_DEFAULT_FIND_PEER_TIMEOUT;
+ message_context.bloom = GNUNET_CONTAINER_bloomfilter_init (NULL,
DHT_BLOOM_SIZE, DHT_BLOOM_K);
+ GNUNET_CONTAINER_multihashmap_iterate(all_known_peers, &add_known_to_bloom,
message_context.bloom);
+ /*GNUNET_CONTAINER_bloomfilter_add (message_context->bloom,
&my_identity.hashPubKey);*/
+
ret = route_message(NULL, find_peer_msg, &message_context);
GNUNET_free(find_peer_msg);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"`%s:%s': Sent `%s' request to %d peers\n", my_short_id, "DHT",
"FIND PEER", ret);
- next_send_time.value = DHT_MINIMUM_FIND_PEER_INTERVAL.value +
- GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_STRONG,
-
DHT_MAXIMUM_FIND_PEER_INTERVAL.value - DHT_MINIMUM_FIND_PEER_INTERVAL.value);
+ if (newly_found_peers < bucket_size)
+ {
+ next_send_time.value = (DHT_MAXIMUM_FIND_PEER_INTERVAL.value / 2) +
+
GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_STRONG,
+
DHT_MAXIMUM_FIND_PEER_INTERVAL.value / 2);
+ }
+ else
+ {
+ next_send_time.value = DHT_MINIMUM_FIND_PEER_INTERVAL.value +
+
GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_STRONG,
+
DHT_MAXIMUM_FIND_PEER_INTERVAL.value - DHT_MINIMUM_FIND_PEER_INTERVAL.value);
+ }
+ newly_found_peers = 0;
GNUNET_SCHEDULER_add_delayed (sched,
next_send_time,
&send_find_peer_message, NULL);
}
+#endif
/**
* Handler for any generic DHT messages, calls the appropriate handler
@@ -2692,7 +2873,8 @@
message_context.msg_options = ntohl (dht_msg->options);
message_context.network_size = estimate_diameter();
message_context.peer = &my_identity;
-
+ message_context.importance = DHT_DEFAULT_P2P_IMPORTANCE * 4; /* Make local
routing a higher priority */
+ message_context.timeout = DHT_DEFAULT_P2P_TIMEOUT;
if (ntohs(enc_msg->type) == GNUNET_MESSAGE_TYPE_DHT_GET)
increment_stats(STAT_GET_START);
else if (ntohs(enc_msg->type) == GNUNET_MESSAGE_TYPE_DHT_PUT)
@@ -2750,6 +2932,8 @@
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s:%s Initiating malicious PUT
behavior, frequency %d\n", my_short_id, "DHT", malicious_put_frequency);
break;
case GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_DROP:
+ if ((malicious_dropper != GNUNET_YES) && (dhtlog_handle != NULL))
+ dhtlog_handle->set_malicious(&my_identity);
malicious_dropper = GNUNET_YES;
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s:%s Initiating malicious DROP
behavior\n", my_short_id, "DHT");
break;
@@ -2848,6 +3032,8 @@
message_context->msg_options = ntohl(incoming->options);
message_context->network_size = ntohl(incoming->network_size);
message_context->peer = peer;
+ message_context->importance = DHT_DEFAULT_P2P_IMPORTANCE;
+ message_context->timeout = DHT_DEFAULT_P2P_TIMEOUT;
route_message(cls, enc_msg, message_context);
GNUNET_free(message_context);
return GNUNET_YES;
@@ -2885,6 +3071,8 @@
message_context.msg_options = ntohl(incoming->options);
message_context.hop_count = ntohl(incoming->hop_count);
message_context.peer = peer;
+ message_context.importance = DHT_DEFAULT_P2P_IMPORTANCE * 2; /* Make result
routing a higher priority */
+ message_context.timeout = DHT_DEFAULT_P2P_TIMEOUT;
route_result_message(cls, enc_msg, &message_context);
return GNUNET_YES;
}
@@ -3065,6 +3253,7 @@
distance);
if (ret != NULL)
{
+ newly_found_peers++;
GNUNET_CONTAINER_multihashmap_put(all_known_peers, &peer->hashPubKey,
ret, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
}
#if DEBUG_DHT
@@ -3093,6 +3282,7 @@
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s:%s: do not have peer `%s' in RT,
can't disconnect!\n", my_short_id, "DHT", GNUNET_i2s(peer));
return;
}
+ increment_stats(STAT_DISCONNECTS);
GNUNET_assert(GNUNET_CONTAINER_multihashmap_contains(all_known_peers,
&peer->hashPubKey));
to_remove = GNUNET_CONTAINER_multihashmap_get(all_known_peers,
&peer->hashPubKey);
GNUNET_assert(0 == memcmp(peer, &to_remove->id, sizeof(struct
GNUNET_PeerIdentity)));
@@ -3114,7 +3304,9 @@
struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *c)
{
- int random_seconds;
+#if DO_FIND_PEER
+ struct GNUNET_TIME_Relative next_send_time;
+#endif
sched = scheduler;
cfg = c;
datacache = GNUNET_DATACACHE_create (sched, cfg, "dhtcache");
@@ -3242,9 +3434,11 @@
GNUNET_STATISTICS_set(stats, STAT_GET_RESPONSE_START, 0, GNUNET_NO);
}
#if DO_FIND_PEER
- random_seconds = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 180);
+ next_send_time.value = DHT_MINIMUM_FIND_PEER_INTERVAL.value +
+ GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_STRONG,
+
(DHT_MAXIMUM_FIND_PEER_INTERVAL.value / 2) -
DHT_MINIMUM_FIND_PEER_INTERVAL.value);
GNUNET_SCHEDULER_add_delayed (sched,
-
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, random_seconds),
+ next_send_time,
&send_find_peer_message, NULL);
#endif
Modified: gnunet/src/dht/plugin_dhtlog_dummy.c
===================================================================
--- gnunet/src/dht/plugin_dhtlog_dummy.c 2010-08-19 15:08:54 UTC (rev
12679)
+++ gnunet/src/dht/plugin_dhtlog_dummy.c 2010-08-19 15:57:37 UTC (rev
12680)
@@ -126,6 +126,24 @@
/*
+ * Inserts the specified stats into the dhttests.generic_stats table
+ *
+ * @param peer the peer inserting the statistic
+ * @param name the name of the statistic
+ * @param section the section of the statistic
+ * @param value the value of the statistic
+ *
+ * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ */
+int
+add_generic_stat (const struct GNUNET_PeerIdentity *peer,
+ const char *name,
+ const char *section, uint64_t value)
+{
+ return GNUNET_OK;
+}
+
+/*
* Update dhttests.trials table with total connections information
*
* @param trialuid the trialuid to update
@@ -245,6 +263,7 @@
#endif
GNUNET_assert(plugin->dhtlog_api == NULL);
plugin->dhtlog_api = GNUNET_malloc(sizeof(struct GNUNET_DHTLOG_Handle));
+ plugin->dhtlog_api->add_generic_stat = &add_generic_stat;
plugin->dhtlog_api->insert_trial = &add_trial;
plugin->dhtlog_api->insert_query = &add_query;
plugin->dhtlog_api->update_trial = &update_trials;
Modified: gnunet/src/dht/plugin_dhtlog_mysql.c
===================================================================
--- gnunet/src/dht/plugin_dhtlog_mysql.c 2010-08-19 15:08:54 UTC (rev
12679)
+++ gnunet/src/dht/plugin_dhtlog_mysql.c 2010-08-19 15:57:37 UTC (rev
12680)
@@ -127,6 +127,11 @@
static struct StatementHandle *insert_stat;
+#define INSERT_GENERIC_STAT_STMT "INSERT INTO generic_stats" \
+ "(trialuid, nodeuid, section, name, value)"\
+ "VALUES (?, ?, ?, ?, ?)"
+static struct StatementHandle *insert_generic_stat;
+
#define INSERT_DHTKEY_STMT "INSERT INTO dhtkeys (dhtkey, trialuid, keybits) "\
"VALUES (?, ?, ?)"
static struct StatementHandle *insert_dhtkey;
@@ -157,6 +162,9 @@
"VALUES (?, ?, ?)"
static struct StatementHandle *extend_topology;
+#define SET_MALICIOUS_STMT "update nodes set malicious_dropper = 1 where
trialuid = ? and nodeid = ?"
+static struct StatementHandle *update_node_malicious;
+
#define UPDATE_TOPOLOGY_STMT "update topology set connections = ? where
topology_uid = ?"
static struct StatementHandle *update_topology;
@@ -433,6 +441,7 @@
PINIT (insert_route, INSERT_ROUTES_STMT) ||
PINIT (insert_trial, INSERT_TRIALS_STMT) ||
PINIT (insert_stat, INSERT_STAT_STMT) ||
+ PINIT (insert_generic_stat, INSERT_GENERIC_STAT_STMT) ||
PINIT (insert_node, INSERT_NODES_STMT) ||
PINIT (insert_dhtkey, INSERT_DHTKEY_STMT) ||
PINIT (update_trial, UPDATE_TRIALS_STMT) ||
@@ -441,9 +450,10 @@
PINIT (update_connection, UPDATE_CONNECTIONS_STMT) ||
PINIT (get_trial, GET_TRIAL_STMT) ||
PINIT (get_topology, GET_TOPOLOGY_STMT) ||
- PINIT (insert_topology, INSERT_TOPOLOGY_STMT)||
- PINIT (update_topology, UPDATE_TOPOLOGY_STMT)||
- PINIT (extend_topology, EXTEND_TOPOLOGY_STMT))
+ PINIT (insert_topology, INSERT_TOPOLOGY_STMT) ||
+ PINIT (update_topology, UPDATE_TOPOLOGY_STMT) ||
+ PINIT (extend_topology, EXTEND_TOPOLOGY_STMT) ||
+ PINIT (update_node_malicious, SET_MALICIOUS_STMT) )
{
return GNUNET_SYSERR;
}
@@ -975,6 +985,54 @@
}
/*
+ * Inserts the specified stats into the dhttests.generic_stats table
+ *
+ * @param peer the peer inserting the statistic
+ * @param name the name of the statistic
+ * @param section the section of the statistic
+ * @param value the value of the statistic
+ *
+ * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ */
+int
+add_generic_stat (const struct GNUNET_PeerIdentity *peer,
+ const char *name,
+ const char *section, uint64_t value)
+{
+ unsigned long long peer_uid;
+ unsigned long long section_len;
+ unsigned long long name_len;
+ int ret;
+ if (peer == NULL)
+ return GNUNET_SYSERR;
+
+ if (GNUNET_OK != get_node_uid (&peer_uid, &peer->hashPubKey))
+ {
+ return GNUNET_SYSERR;
+ }
+
+ section_len = strlen(section);
+ name_len = strlen(name);
+
+ if (GNUNET_OK !=
+ (ret = prepared_statement_run (insert_generic_stat,
+ NULL,
+ MYSQL_TYPE_LONGLONG, ¤t_trial,
GNUNET_YES,
+ MYSQL_TYPE_LONGLONG, &peer_uid,
GNUNET_YES,
+ MYSQL_TYPE_VAR_STRING, §ion,
max_varchar_len, §ion_len,
+ MYSQL_TYPE_VAR_STRING, &name,
max_varchar_len, &name_len,
+ MYSQL_TYPE_LONGLONG, &value, GNUNET_YES,
+ -1)))
+ {
+ if (ret == GNUNET_SYSERR)
+ {
+ return GNUNET_SYSERR;
+ }
+ }
+ return GNUNET_OK;
+}
+
+/*
* Inserts the specified dhtkey into the dhttests.dhtkeys table,
* stores return value of dhttests.dhtkeys.dhtkeyuid into dhtkeyuid
*
@@ -1054,18 +1112,11 @@
h_len = sizeof (GNUNET_HashCode);
if (GNUNET_OK !=
(ret = prepared_statement_run (insert_node,
- nodeuid,
- MYSQL_TYPE_LONGLONG,
- ¤t_trial,
- GNUNET_YES,
- MYSQL_TYPE_VAR_STRING,
- &encPeer,
- max_varchar_len,
- &p_len,
- MYSQL_TYPE_BLOB,
- &node->hashPubKey,
- sizeof (GNUNET_HashCode),
- &h_len, -1)))
+ nodeuid,
+ MYSQL_TYPE_LONGLONG, ¤t_trial,
GNUNET_YES,
+ MYSQL_TYPE_VAR_STRING, &encPeer,
max_varchar_len, &p_len,
+ MYSQL_TYPE_BLOB, &node->hashPubKey,
sizeof (GNUNET_HashCode),
+ &h_len, -1)))
{
if (ret == GNUNET_SYSERR)
{
@@ -1109,6 +1160,39 @@
/*
+ * Update dhttests.nodes table setting the identified
+ * node as a malicious dropper.
+ *
+ * @param peer the peer that was set to be malicious
+ *
+ * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
+ */
+int set_malicious (struct GNUNET_PeerIdentity *peer)
+{
+ unsigned long long p_len;
+ int ret;
+ char *temp_str;
+
+ temp_str = GNUNET_strdup(GNUNET_h2s_full(&peer->hashPubKey));
+ p_len = strlen(temp_str);
+
+ if (GNUNET_OK !=
+ (ret = prepared_statement_run (update_node_malicious,
+ NULL,
+ MYSQL_TYPE_LONGLONG, ¤t_trial,
GNUNET_YES,
+ MYSQL_TYPE_VAR_STRING, temp_str,
max_varchar_len, &p_len,
+ -1)))
+ {
+ if (ret == GNUNET_SYSERR)
+ {
+ return GNUNET_SYSERR;
+ }
+ }
+ return GNUNET_OK;
+}
+
+
+/*
* Update dhttests.trials table with total connections information
*
* @param trialuid the trialuid to update
@@ -1469,6 +1553,7 @@
plugin->dhtlog_api = GNUNET_malloc(sizeof(struct GNUNET_DHTLOG_Handle));
plugin->dhtlog_api->insert_trial = &add_trial;
plugin->dhtlog_api->insert_stat = &add_stat;
+ plugin->dhtlog_api->add_generic_stat = &add_generic_stat;
plugin->dhtlog_api->insert_query = &add_query;
plugin->dhtlog_api->update_trial = &update_trials;
plugin->dhtlog_api->insert_route = &add_route;
@@ -1478,6 +1563,8 @@
plugin->dhtlog_api->insert_topology = &add_topology;
plugin->dhtlog_api->update_topology = &update_current_topology;
plugin->dhtlog_api->insert_extended_topology = &add_extended_topology;
+ plugin->dhtlog_api->set_malicious = &set_malicious;
+ plugin->dhtlog_api->add_generic_stat = &add_generic_stat;
get_current_trial (¤t_trial);
return plugin;
@@ -1508,6 +1595,7 @@
prepared_statement_close(insert_topology);
prepared_statement_close(update_topology);
prepared_statement_close(extend_topology);
+ prepared_statement_close(update_node_malicious);
if (conn != NULL)
mysql_close (conn);
Modified: gnunet/src/dht/plugin_dhtlog_mysql_dump.c
===================================================================
--- gnunet/src/dht/plugin_dhtlog_mysql_dump.c 2010-08-19 15:08:54 UTC (rev
12679)
+++ gnunet/src/dht/plugin_dhtlog_mysql_dump.c 2010-08-19 15:57:37 UTC (rev
12680)
@@ -57,7 +57,7 @@
#define INSERT_ROUTES_STMT "prepare insert_route from 'INSERT INTO routes
(trialuid, querytype, hops, dhtkeyuid, dhtqueryid, succeeded, nodeuid,
from_node, to_node) "\
"VALUES (@temp_trial, ?, ?, ?, ?, ?, ?, ?, ?)'"
-#define INSERT_NODES_STMT "prepare insert_node from 'INSERT INTO nodes
(trialuid, nodeid) "\
+#define INSERT_NODES_STMT "prepare insert_node from 'INSERT ignore INTO nodes
(trialuid, nodeid) "\
"VALUES (@temp_trial, ?)'"
#define INSERT_TOPOLOGY_STMT "prepare insert_topology from 'INSERT INTO
topology (trialuid, date, connections) "\
@@ -68,6 +68,8 @@
#define UPDATE_TOPOLOGY_STMT "prepare update_topology from 'update topology
set connections = ? where topology_uid = @temp_topology'"
+#define SET_MALICIOUS_STMT "prepare set_malicious from 'update nodes set
malicious_dropper = 1 where trialuid = @temp_trial and nodeid = @temp_node'"
+
#define INSERT_TRIALS_STMT "prepare insert_trial from 'INSERT INTO trials"\
"(starttime, numnodes, topology,"\
"topology_percentage, topology_probability,"\
@@ -79,6 +81,10 @@
"gets_succeeded, message) "\
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'"
+#define INSERT_GENERIC_STAT_STMT "prepare insert_generic_stat from 'INSERT
INTO generic_stats" \
+ "(trialuid, nodeuid, section, name, value)"\
+ "VALUES (@temp_trial, @temp_node,
@temp_section, @temp_stat, @temp_value)'"
+
#define INSERT_STAT_STMT "prepare insert_stat from 'INSERT INTO
node_statistics"\
"(trialuid, nodeuid, route_requests,"\
"route_forwards, result_requests,"\
@@ -153,6 +159,8 @@
if (PINIT (INSERT_QUERIES_STMT) ||
PINIT (INSERT_ROUTES_STMT) ||
PINIT (INSERT_TRIALS_STMT) ||
+ PINIT (SET_MALICIOUS_STMT) ||
+ PINIT (INSERT_GENERIC_STAT_STMT) ||
PINIT (INSERT_STAT_STMT) ||
PINIT (INSERT_NODES_STMT) ||
PINIT (INSERT_DHTKEY_STMT) ||
@@ -324,7 +332,44 @@
return GNUNET_SYSERR;
}
+
/*
+ * Inserts the specified stats into the dhttests.generic_stats table
+ *
+ * @param peer the peer inserting the statistic
+ * @param name the name of the statistic
+ * @param section the section of the statistic
+ * @param value the value of the statistic
+ *
+ * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ */
+int
+add_generic_stat (const struct GNUNET_PeerIdentity *peer,
+ const char *name,
+ const char *section, uint64_t value)
+{
+ int ret;
+ if (outfile == NULL)
+ return GNUNET_SYSERR;
+
+ if (peer != NULL)
+ ret = fprintf(outfile, "select nodeuid from nodes where trialuid =
@temp_trial and nodeid = \"%s\" into @temp_node;\n",
GNUNET_h2s_full(&peer->hashPubKey));
+ else
+ ret = fprintf(outfile, "set @temp_node = 0;\n");
+
+ ret = fprintf(outfile, "set @temp_section = \"%s\", @temp_stat = \"%s\",
@temp_value = %llu;\n",
+ section, name, (unsigned long long)value);
+
+ if (ret < 0)
+ return GNUNET_SYSERR;
+
+ ret = fprintf(outfile, "execute insert_generic_stat;\n");
+
+ return GNUNET_OK;
+}
+
+
+/*
* Inserts the specified stats into the dhttests.node_statistics table
*
* @param peer the peer inserting the statistic
@@ -495,6 +540,36 @@
/*
+ * Update dhttests.nodes table setting the identified
+ * node as a malicious dropper.
+ *
+ * @param peer the peer that was set to be malicious
+ *
+ * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
+ */
+int
+set_malicious (struct GNUNET_PeerIdentity *peer)
+{
+ int ret;
+
+ if (outfile == NULL)
+ return GNUNET_SYSERR;
+
+ ret = fprintf(outfile, "set @temp_node = \"%s\";\n",
GNUNET_h2s_full(&peer->hashPubKey));
+
+ if (ret < 0)
+ return GNUNET_SYSERR;
+
+ ret = fprintf(outfile, "execute set_malicious;\n");
+
+ if (ret >= 0)
+ return GNUNET_OK;
+ else
+ return GNUNET_SYSERR;
+}
+
+
+/*
* Update dhttests.trials table with total connections information
*
* @param trialuid the trialuid to update
@@ -744,6 +819,8 @@
plugin->dhtlog_api->insert_topology = &add_topology;
plugin->dhtlog_api->insert_extended_topology = &add_extended_topology;
plugin->dhtlog_api->update_topology = &update_topology;
+ plugin->dhtlog_api->set_malicious = &set_malicious;
+ plugin->dhtlog_api->add_generic_stat = &add_generic_stat;
return plugin;
}
Modified: gnunet/src/dht/test_dhtlog.c
===================================================================
--- gnunet/src/dht/test_dhtlog.c 2010-08-19 15:08:54 UTC (rev 12679)
+++ gnunet/src/dht/test_dhtlog.c 2010-08-19 15:57:37 UTC (rev 12680)
@@ -75,6 +75,7 @@
ret = api->insert_node (&nodeuid, &p2);
ret = api->insert_node (&nodeuid, &p3);
ret = api->insert_node (&nodeuid, &p4);
+ ret = api->set_malicious(&p1);
CHECK(ret);
ret = api->insert_topology(0);
ret = api->insert_extended_topology(&p1, &p2);
@@ -102,6 +103,7 @@
ret = api->insert_stat(&p2, 12, 23, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27);
CHECK(ret);
ret = api->update_trial (trialuid, 787);
+ ret = api->add_generic_stat (&p2, "nonsense", "section", 77765);
CHECK(ret);
return 0;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12680 - gnunet/src/dht,
gnunet <=