diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-09-13 10:45:23 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-09-13 10:45:23 +0000 |
commit | 485e370d56f978a7261138d2fdca32be1bcbcd8c (patch) | |
tree | e086519b44f4be46de9ca80ce3d0e657b4b2c7cc /src/dht/gnunet-service-dht.c | |
parent | 557ce21ea3103d59cb6c483a5413951e8eb1f1d2 (diff) | |
download | gnunet-485e370d56f978a7261138d2fdca32be1bcbcd8c.tar.gz gnunet-485e370d56f978a7261138d2fdca32be1bcbcd8c.zip |
use time api
Diffstat (limited to 'src/dht/gnunet-service-dht.c')
-rw-r--r-- | src/dht/gnunet-service-dht.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c index 22b4c995a..1921063b7 100644 --- a/src/dht/gnunet-service-dht.c +++ b/src/dht/gnunet-service-dht.c | |||
@@ -155,12 +155,12 @@ | |||
155 | /** | 155 | /** |
156 | * Default frequency for sending malicious get messages | 156 | * Default frequency for sending malicious get messages |
157 | */ | 157 | */ |
158 | #define DEFAULT_MALICIOUS_GET_FREQUENCY 1000 /* Number of milliseconds */ | 158 | #define DEFAULT_MALICIOUS_GET_FREQUENCY GNUNET_TIME_UNIT_SECONDS |
159 | 159 | ||
160 | /** | 160 | /** |
161 | * Default frequency for sending malicious put messages | 161 | * Default frequency for sending malicious put messages |
162 | */ | 162 | */ |
163 | #define DEFAULT_MALICIOUS_PUT_FREQUENCY 1000 /* Default is in milliseconds */ | 163 | #define DEFAULT_MALICIOUS_PUT_FREQUENCY GNUNET_TIME_UNIT_SECONDS |
164 | 164 | ||
165 | 165 | ||
166 | #define DHT_DEFAULT_PING_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 1) | 166 | #define DHT_DEFAULT_PING_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 1) |
@@ -823,12 +823,12 @@ static unsigned int malicious_putter; | |||
823 | /** | 823 | /** |
824 | * Frequency for malicious get requests. | 824 | * Frequency for malicious get requests. |
825 | */ | 825 | */ |
826 | static unsigned long long malicious_get_frequency; | 826 | static struct GNUNET_TIME_Relative malicious_get_frequency; |
827 | 827 | ||
828 | /** | 828 | /** |
829 | * Frequency for malicious put requests. | 829 | * Frequency for malicious put requests. |
830 | */ | 830 | */ |
831 | static unsigned long long malicious_put_frequency; | 831 | static struct GNUNET_TIME_Relative malicious_put_frequency; |
832 | 832 | ||
833 | /** | 833 | /** |
834 | * Kademlia replication | 834 | * Kademlia replication |
@@ -3839,10 +3839,8 @@ malicious_get_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
3839 | "%s:%s Sending malicious GET message with hash %s\n", my_short_id, | 3839 | "%s:%s Sending malicious GET message with hash %s\n", my_short_id, |
3840 | "DHT", GNUNET_h2s (&key)); | 3840 | "DHT", GNUNET_h2s (&key)); |
3841 | demultiplex_message (&get_message.header, &msg_ctx); | 3841 | demultiplex_message (&get_message.header, &msg_ctx); |
3842 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 3842 | GNUNET_SCHEDULER_add_delayed (malicious_get_frequency, |
3843 | (GNUNET_TIME_UNIT_MILLISECONDS, | 3843 | &malicious_get_task, NULL); |
3844 | malicious_get_frequency), &malicious_get_task, | ||
3845 | NULL); | ||
3846 | } | 3844 | } |
3847 | #endif | 3845 | #endif |
3848 | 3846 | ||
@@ -4113,15 +4111,15 @@ handle_dht_control_message (void *cls, struct GNUNET_SERVER_Client *client, | |||
4113 | #if HAVE_MALICIOUS | 4111 | #if HAVE_MALICIOUS |
4114 | case GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_GET: | 4112 | case GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_GET: |
4115 | if (ntohs (dht_control_msg->variable) > 0) | 4113 | if (ntohs (dht_control_msg->variable) > 0) |
4116 | malicious_get_frequency = ntohs (dht_control_msg->variable); | 4114 | malicious_get_frequency.value = ntohs (dht_control_msg->variable); |
4117 | if (malicious_get_frequency == 0) | 4115 | if (malicious_get_frequency == 0) |
4118 | malicious_get_frequency = DEFAULT_MALICIOUS_GET_FREQUENCY; | 4116 | malicious_get_frequency = DEFAULT_MALICIOUS_GET_FREQUENCY; |
4119 | if (malicious_getter != GNUNET_YES) | 4117 | if (malicious_getter != GNUNET_YES) |
4120 | GNUNET_SCHEDULER_add_now (&malicious_get_task, NULL); | 4118 | GNUNET_SCHEDULER_add_now (&malicious_get_task, NULL); |
4121 | malicious_getter = GNUNET_YES; | 4119 | malicious_getter = GNUNET_YES; |
4122 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 4120 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
4123 | "%s:%s Initiating malicious GET behavior, frequency %d\n", | 4121 | "%s:%s Initiating malicious GET behavior, frequency %llu\n", |
4124 | my_short_id, "DHT", malicious_get_frequency); | 4122 | my_short_id, "DHT", malicious_get_frequency.value); |
4125 | break; | 4123 | break; |
4126 | case GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_PUT: | 4124 | case GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_PUT: |
4127 | if (ntohs (dht_control_msg->variable) > 0) | 4125 | if (ntohs (dht_control_msg->variable) > 0) |
@@ -4827,9 +4825,9 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
4827 | { | 4825 | { |
4828 | malicious_getter = GNUNET_YES; | 4826 | malicious_getter = GNUNET_YES; |
4829 | if (GNUNET_NO == | 4827 | if (GNUNET_NO == |
4830 | GNUNET_CONFIGURATION_get_value_number (cfg, "DHT", | 4828 | GNUNET_CONFIGURATION_get_value_time (cfg, "DHT", |
4831 | "MALICIOUS_GET_FREQUENCY", | 4829 | "MALICIOUS_GET_FREQUENCY", |
4832 | &malicious_get_frequency)) | 4830 | &malicious_get_frequency)) |
4833 | malicious_get_frequency = DEFAULT_MALICIOUS_GET_FREQUENCY; | 4831 | malicious_get_frequency = DEFAULT_MALICIOUS_GET_FREQUENCY; |
4834 | } | 4832 | } |
4835 | 4833 | ||
@@ -4838,9 +4836,9 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
4838 | { | 4836 | { |
4839 | malicious_putter = GNUNET_YES; | 4837 | malicious_putter = GNUNET_YES; |
4840 | if (GNUNET_NO == | 4838 | if (GNUNET_NO == |
4841 | GNUNET_CONFIGURATION_get_value_number (cfg, "DHT", | 4839 | GNUNET_CONFIGURATION_get_value_time (cfg, "DHT", |
4842 | "MALICIOUS_PUT_FREQUENCY", | 4840 | "MALICIOUS_PUT_FREQUENCY", |
4843 | &malicious_put_frequency)) | 4841 | &malicious_put_frequency)) |
4844 | malicious_put_frequency = DEFAULT_MALICIOUS_PUT_FREQUENCY; | 4842 | malicious_put_frequency = DEFAULT_MALICIOUS_PUT_FREQUENCY; |
4845 | } | 4843 | } |
4846 | 4844 | ||