diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-09-14 07:58:07 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-09-14 07:58:07 +0000 |
commit | a2515339500e44d5f5b991c610d884c8b9dc43a9 (patch) | |
tree | 2d2e91f88d1bea031922dc4c9e11a925b18f16b0 /src/dht/gnunet-service-dht.c | |
parent | 231346d57e400b78d329899e556bfe24316863e8 (diff) | |
download | gnunet-a2515339500e44d5f5b991c610d884c8b9dc43a9.tar.gz gnunet-a2515339500e44d5f5b991c610d884c8b9dc43a9.zip |
fix
Diffstat (limited to 'src/dht/gnunet-service-dht.c')
-rw-r--r-- | src/dht/gnunet-service-dht.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c index 23192b86b..b26662920 100644 --- a/src/dht/gnunet-service-dht.c +++ b/src/dht/gnunet-service-dht.c | |||
@@ -3591,10 +3591,8 @@ malicious_put_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
3591 | "%s:%s Sending malicious PUT message with hash %s\n", my_short_id, | 3591 | "%s:%s Sending malicious PUT message with hash %s\n", my_short_id, |
3592 | "DHT", GNUNET_h2s (&key)); | 3592 | "DHT", GNUNET_h2s (&key)); |
3593 | demultiplex_message (&put_message.header, &msg_ctx); | 3593 | demultiplex_message (&put_message.header, &msg_ctx); |
3594 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 3594 | GNUNET_SCHEDULER_add_delayed (mlicious_put_frequency, |
3595 | (GNUNET_TIME_UNIT_MILLISECONDS, | 3595 | &malicious_put_task, NULL); |
3596 | malicious_put_frequency), &malicious_put_task, | ||
3597 | NULL); | ||
3598 | } | 3596 | } |
3599 | 3597 | ||
3600 | 3598 | ||
@@ -3890,20 +3888,20 @@ handle_dht_control_message (void *cls, struct GNUNET_SERVER_Client *client, | |||
3890 | #if HAVE_MALICIOUS | 3888 | #if HAVE_MALICIOUS |
3891 | case GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_GET: | 3889 | case GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_GET: |
3892 | if (ntohs (dht_control_msg->variable) > 0) | 3890 | if (ntohs (dht_control_msg->variable) > 0) |
3893 | malicious_get_frequency.value = ntohs (dht_control_msg->variable); | 3891 | malicious_get_frequency.rel_value = ntohs (dht_control_msg->variable); |
3894 | if (malicious_get_frequency == 0) | 3892 | if (malicious_get_frequency.rel_value == 0) |
3895 | malicious_get_frequency = DEFAULT_MALICIOUS_GET_FREQUENCY; | 3893 | malicious_get_frequency = DEFAULT_MALICIOUS_GET_FREQUENCY; |
3896 | if (malicious_getter != GNUNET_YES) | 3894 | if (malicious_getter != GNUNET_YES) |
3897 | GNUNET_SCHEDULER_add_now (&malicious_get_task, NULL); | 3895 | GNUNET_SCHEDULER_add_now (&malicious_get_task, NULL); |
3898 | malicious_getter = GNUNET_YES; | 3896 | malicious_getter = GNUNET_YES; |
3899 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 3897 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
3900 | "%s:%s Initiating malicious GET behavior, frequency %llu\n", | 3898 | "%s:%s Initiating malicious GET behavior, frequency %llu\n", |
3901 | my_short_id, "DHT", malicious_get_frequency.value); | 3899 | my_short_id, "DHT", malicious_get_frequency.rel_value); |
3902 | break; | 3900 | break; |
3903 | case GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_PUT: | 3901 | case GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_PUT: |
3904 | if (ntohs (dht_control_msg->variable) > 0) | 3902 | if (ntohs (dht_control_msg->variable) > 0) |
3905 | malicious_put_frequency = ntohs (dht_control_msg->variable); | 3903 | malicious_put_frequency.rel_value = ntohs (dht_control_msg->variable); |
3906 | if (malicious_put_frequency == 0) | 3904 | if (malicious_put_frequency.rel_value == 0) |
3907 | malicious_put_frequency = DEFAULT_MALICIOUS_PUT_FREQUENCY; | 3905 | malicious_put_frequency = DEFAULT_MALICIOUS_PUT_FREQUENCY; |
3908 | if (malicious_putter != GNUNET_YES) | 3906 | if (malicious_putter != GNUNET_YES) |
3909 | GNUNET_SCHEDULER_add_now (&malicious_put_task, NULL); | 3907 | GNUNET_SCHEDULER_add_now (&malicious_put_task, NULL); |