diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-09-28 22:51:07 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-09-28 22:51:07 +0000 |
commit | 3477687b451e0b89bff77d1d940ab01dd50220a9 (patch) | |
tree | f456a69a861a3f32fa9c1a081d30ad2b5a442d5b /src | |
parent | 656a75a470c82d40f80e60c8c3cdff86262e0927 (diff) | |
download | gnunet-3477687b451e0b89bff77d1d940ab01dd50220a9.tar.gz gnunet-3477687b451e0b89bff77d1d940ab01dd50220a9.zip |
fix #1796
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/gnunet-service-transport.c | 1 | ||||
-rw-r--r-- | src/transport/test_transport_api_unreliability.c | 30 | ||||
-rw-r--r-- | src/transport/test_transport_api_unreliability_udp_peer1.conf | 2 |
3 files changed, 3 insertions, 30 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 537f99dcf..92f78fec5 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -232,7 +232,6 @@ plugin_env_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
232 | im->ats_count = htonl (0); | 232 | im->ats_count = htonl (0); |
233 | memcpy (&(im->peer), peer, sizeof (struct GNUNET_PeerIdentity)); | 233 | memcpy (&(im->peer), peer, sizeof (struct GNUNET_PeerIdentity)); |
234 | memcpy (&im[1], message, ntohs (message->size)); | 234 | memcpy (&im[1], message, ntohs (message->size)); |
235 | |||
236 | GST_clients_broadcast ((const struct GNUNET_MessageHeader *) im, | 235 | GST_clients_broadcast ((const struct GNUNET_MessageHeader *) im, |
237 | GNUNET_YES); | 236 | GNUNET_YES); |
238 | 237 | ||
diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c index e4e78bb3e..c675e18a0 100644 --- a/src/transport/test_transport_api_unreliability.c +++ b/src/transport/test_transport_api_unreliability.c | |||
@@ -396,40 +396,14 @@ notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
396 | 396 | ||
397 | if (cls == p1) | 397 | if (cls == p1) |
398 | { | 398 | { |
399 | char * sec; | 399 | max_bps_p1 = 1024 * 1024 * 1024; |
400 | long long unsigned int l_bps; | ||
401 | |||
402 | GNUNET_asprintf(&sec, "transport-%s", test_plugin); | ||
403 | if (GNUNET_CONFIGURATION_have_value (p1->cfg, sec, "MAX_BPS")) | ||
404 | { | ||
405 | GNUNET_CONFIGURATION_get_value_number (p1->cfg, sec, "MAX_BPS", | ||
406 | &l_bps); | ||
407 | max_bps_p1 = l_bps; | ||
408 | } | ||
409 | else | ||
410 | max_bps_p1 = 1024 * 1024 * 1024; | ||
411 | GNUNET_free (sec); | ||
412 | |||
413 | GNUNET_TRANSPORT_set_quota (p1->th, &p2->id, | 400 | GNUNET_TRANSPORT_set_quota (p1->th, &p2->id, |
414 | GNUNET_BANDWIDTH_value_init (max_bps_p1), | 401 | GNUNET_BANDWIDTH_value_init (max_bps_p1), |
415 | GNUNET_BANDWIDTH_value_init (max_bps_p1)); | 402 | GNUNET_BANDWIDTH_value_init (max_bps_p1)); |
416 | } | 403 | } |
417 | else if (cls == p2) | 404 | else if (cls == p2) |
418 | { | 405 | { |
419 | char * sec; | 406 | max_bps_p2 = 1024 * 1024 * 1024; |
420 | long long unsigned int l_bps; | ||
421 | |||
422 | GNUNET_asprintf(&sec, "transport-%s", test_plugin); | ||
423 | if (GNUNET_CONFIGURATION_have_value (p2->cfg, sec, "MAX_BPS")) | ||
424 | { | ||
425 | GNUNET_CONFIGURATION_get_value_number (p2->cfg, sec, "MAX_BPS", | ||
426 | &l_bps); | ||
427 | max_bps_p2 = l_bps; | ||
428 | } | ||
429 | else | ||
430 | max_bps_p2 = 1024 * 1024 * 1024; | ||
431 | GNUNET_free (sec); | ||
432 | |||
433 | GNUNET_TRANSPORT_set_quota (p2->th, &p1->id, | 407 | GNUNET_TRANSPORT_set_quota (p2->th, &p1->id, |
434 | GNUNET_BANDWIDTH_value_init (max_bps_p2), | 408 | GNUNET_BANDWIDTH_value_init (max_bps_p2), |
435 | GNUNET_BANDWIDTH_value_init (max_bps_p2)); | 409 | GNUNET_BANDWIDTH_value_init (max_bps_p2)); |
diff --git a/src/transport/test_transport_api_unreliability_udp_peer1.conf b/src/transport/test_transport_api_unreliability_udp_peer1.conf index 6f8c44af4..e36b4ce84 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer1.conf | |||
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_transport_api_udp_peer1.conf | |||
5 | 5 | ||
6 | [transport-udp] | 6 | [transport-udp] |
7 | PORT = 12040 | 7 | PORT = 12040 |
8 | MAX_BPS = 500000 | 8 | MAX_BPS = 5000000 |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12045 | 11 | PORT = 12045 |