diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-12-12 08:57:45 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-12-12 08:57:45 +0000 |
commit | 635828517904233d350e38c2061cdddfe0a06125 (patch) | |
tree | 3118986ff40725103855f111164ce11b4943ebbb /src/transport | |
parent | d3abc660dcccaf44354a2b7c61605f68795fa885 (diff) | |
download | gnunet-635828517904233d350e38c2061cdddfe0a06125.tar.gz gnunet-635828517904233d350e38c2061cdddfe0a06125.zip |
FIX: add quotas for all networks, transport tests should pass
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/test_quota_compliance.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index 24425e46e..7f0247e50 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c | |||
@@ -25,6 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_transport_service.h" | 27 | #include "gnunet_transport_service.h" |
28 | #include "gnunet_ats_service.h" | ||
28 | #include "gauger.h" | 29 | #include "gauger.h" |
29 | #include "transport-testing.h" | 30 | #include "transport-testing.h" |
30 | 31 | ||
@@ -450,11 +451,10 @@ start_cb (struct PeerContext *p, void *cls) | |||
450 | receiver = p1; | 451 | receiver = p1; |
451 | 452 | ||
452 | char *sender_c = GNUNET_strdup (GNUNET_i2s (&sender->id)); | 453 | char *sender_c = GNUNET_strdup (GNUNET_i2s (&sender->id)); |
453 | |||
454 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 454 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
455 | "Test tries to send from %u (%s) -> peer %u (%s)\n", sender->no, | 455 | "Test tries to send from %u (%s) -> peer %u (%s)\n", sender->no, |
456 | sender_c, receiver->no, GNUNET_i2s (&receiver->id)); | 456 | sender_c, receiver->no, GNUNET_i2s (&receiver->id)); |
457 | 457 | GNUNET_free (sender_c); | |
458 | cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb, | 458 | cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb, |
459 | NULL); | 459 | NULL); |
460 | 460 | ||
@@ -464,16 +464,28 @@ static char * | |||
464 | generate_config (char *cfg_file, unsigned long long quota_in, | 464 | generate_config (char *cfg_file, unsigned long long quota_in, |
465 | unsigned long long quota_out) | 465 | unsigned long long quota_out) |
466 | { | 466 | { |
467 | char *networks[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkTypeString; | ||
468 | char *in_name; | ||
469 | char *out_name; | ||
467 | char *fname = NULL; | 470 | char *fname = NULL; |
468 | struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create (); | 471 | struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create (); |
472 | int c; | ||
469 | 473 | ||
470 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (cfg, cfg_file)); | 474 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (cfg, cfg_file)); |
471 | GNUNET_asprintf (&fname, "q_in_%llu_q_out_%llu_%s", quota_in, quota_out, | 475 | GNUNET_asprintf (&fname, "q_in_%llu_q_out_%llu_%s", quota_in, quota_out, |
472 | cfg_file); | 476 | cfg_file); |
477 | |||
473 | GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "DEFAULTCONFIG", fname); | 478 | GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "DEFAULTCONFIG", fname); |
474 | GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "WAN_QUOTA_IN", quota_in); | 479 | |
475 | GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "WAN_QUOTA_OUT", | 480 | for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++) |
476 | quota_out); | 481 | { |
482 | GNUNET_asprintf (&in_name, "%s_QUOTA_IN", networks[c]); | ||
483 | GNUNET_asprintf (&out_name, "%s_QUOTA_OUT", networks[c]); | ||
484 | GNUNET_CONFIGURATION_set_value_number (cfg, "ats", in_name, quota_in); | ||
485 | GNUNET_CONFIGURATION_set_value_number (cfg, "ats", out_name, quota_out); | ||
486 | GNUNET_free (in_name); | ||
487 | GNUNET_free (out_name); | ||
488 | } | ||
477 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write (cfg, fname)); | 489 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write (cfg, fname)); |
478 | GNUNET_CONFIGURATION_destroy (cfg); | 490 | GNUNET_CONFIGURATION_destroy (cfg); |
479 | return fname; | 491 | return fname; |