aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/test_quota_compliance.c17
-rw-r--r--src/transport/test_transport_api_reliability.c8
-rw-r--r--src/transport/test_transport_api_unreliability.c8
-rw-r--r--src/transport/transport_api.c15
4 files changed, 14 insertions, 34 deletions
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index d8ac5eab3..1f4d21fc8 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -516,18 +516,13 @@ static void measure (unsigned long long quota_p1, unsigned long long quota_p2 )
516 516
517#endif 517#endif
518 GNUNET_TRANSPORT_set_quota (p1.th, 518 GNUNET_TRANSPORT_set_quota (p1.th,
519 &p2.id, 519 &p2.id,
520 GNUNET_BANDWIDTH_value_init (current_quota_p1 ), 520 GNUNET_BANDWIDTH_value_init (current_quota_p1),
521 GNUNET_BANDWIDTH_value_init (current_quota_p1 ), 521 GNUNET_BANDWIDTH_value_init (current_quota_p1));
522 GNUNET_TIME_UNIT_FOREVER_REL,
523 NULL, NULL);
524 GNUNET_TRANSPORT_set_quota (p2.th, 522 GNUNET_TRANSPORT_set_quota (p2.th,
525 &p1.id, 523 &p1.id,
526 GNUNET_BANDWIDTH_value_init (current_quota_p2), 524 GNUNET_BANDWIDTH_value_init (current_quota_p2),
527 GNUNET_BANDWIDTH_value_init (current_quota_p2), 525 GNUNET_BANDWIDTH_value_init (current_quota_p2));
528 GNUNET_TIME_UNIT_FOREVER_REL,
529 NULL, NULL);
530
531 GNUNET_SCHEDULER_cancel (die_task); 526 GNUNET_SCHEDULER_cancel (die_task);
532 die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, 527 die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
533 &end_badly, 528 &end_badly,
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index 17007ab88..2d44167d4 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -341,9 +341,7 @@ notify_connect (void *cls,
341 GNUNET_TRANSPORT_set_quota (p1.th, 341 GNUNET_TRANSPORT_set_quota (p1.th,
342 &p2.id, 342 &p2.id,
343 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024), 343 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024),
344 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024), 344 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024));
345 GNUNET_TIME_UNIT_FOREVER_REL,
346 NULL, NULL);
347 start_time = GNUNET_TIME_absolute_get (); 345 start_time = GNUNET_TIME_absolute_get ();
348 connected++; 346 connected++;
349 } 347 }
@@ -352,9 +350,7 @@ notify_connect (void *cls,
352 GNUNET_TRANSPORT_set_quota (p2.th, 350 GNUNET_TRANSPORT_set_quota (p2.th,
353 &p1.id, 351 &p1.id,
354 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024), 352 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024),
355 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024), 353 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024));
356 GNUNET_TIME_UNIT_FOREVER_REL,
357 NULL, NULL);
358 connected++; 354 connected++;
359 } 355 }
360 356
diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c
index 929e88b1c..d27a5193e 100644
--- a/src/transport/test_transport_api_unreliability.c
+++ b/src/transport/test_transport_api_unreliability.c
@@ -438,9 +438,7 @@ notify_connect (void *cls,
438 GNUNET_TRANSPORT_set_quota (p1.th, 438 GNUNET_TRANSPORT_set_quota (p1.th,
439 &p2.id, 439 &p2.id,
440 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024), 440 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024),
441 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024), 441 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024));
442 GNUNET_TIME_UNIT_FOREVER_REL,
443 NULL, NULL);
444 start_time = GNUNET_TIME_absolute_get (); 442 start_time = GNUNET_TIME_absolute_get ();
445 connected++; 443 connected++;
446 } 444 }
@@ -449,9 +447,7 @@ notify_connect (void *cls,
449 GNUNET_TRANSPORT_set_quota (p2.th, 447 GNUNET_TRANSPORT_set_quota (p2.th,
450 &p1.id, 448 &p1.id,
451 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024), 449 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024),
452 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024), 450 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024));
453 GNUNET_TIME_UNIT_FOREVER_REL,
454 NULL, NULL);
455 connected++; 451 connected++;
456 } 452 }
457 453
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 0fc1bb8ef..ef846c147 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -925,19 +925,12 @@ send_set_quota (void *cls, size_t size, void *buf)
925 * @param target who's bandwidth quota is being changed 925 * @param target who's bandwidth quota is being changed
926 * @param quota_in incoming bandwidth quota in bytes per ms 926 * @param quota_in incoming bandwidth quota in bytes per ms
927 * @param quota_out outgoing bandwidth quota in bytes per ms 927 * @param quota_out outgoing bandwidth quota in bytes per ms
928 * @param timeout how long to wait until signaling failure if
929 * we can not communicate the quota change
930 * @param cont continuation to call when done, will be called
931 * either with reason "TIMEOUT" or with reason "PREREQ_DONE"
932 * @param cont_cls closure for continuation
933 */ 928 */
934void 929void
935GNUNET_TRANSPORT_set_quota (struct GNUNET_TRANSPORT_Handle *handle, 930GNUNET_TRANSPORT_set_quota (struct GNUNET_TRANSPORT_Handle *handle,
936 const struct GNUNET_PeerIdentity *target, 931 const struct GNUNET_PeerIdentity *target,
937 struct GNUNET_BANDWIDTH_Value32NBO quota_in, 932 struct GNUNET_BANDWIDTH_Value32NBO quota_in,
938 struct GNUNET_BANDWIDTH_Value32NBO quota_out, 933 struct GNUNET_BANDWIDTH_Value32NBO quota_out)
939 struct GNUNET_TIME_Relative timeout,
940 GNUNET_SCHEDULER_Task cont, void *cont_cls)
941{ 934{
942 struct NeighbourList *n; 935 struct NeighbourList *n;
943 struct SetQuotaContext *sqc; 936 struct SetQuotaContext *sqc;
@@ -973,9 +966,9 @@ GNUNET_TRANSPORT_set_quota (struct GNUNET_TRANSPORT_Handle *handle,
973 sqc = GNUNET_malloc (sizeof (struct SetQuotaContext)); 966 sqc = GNUNET_malloc (sizeof (struct SetQuotaContext));
974 sqc->handle = handle; 967 sqc->handle = handle;
975 sqc->target = *target; 968 sqc->target = *target;
976 sqc->cont = cont; 969 sqc->cont = NULL;
977 sqc->cont_cls = cont_cls; 970 sqc->cont_cls = NULL;
978 sqc->timeout = GNUNET_TIME_relative_to_absolute (timeout); 971 sqc->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_FOREVER_REL);
979 sqc->quota_in = quota_in; 972 sqc->quota_in = quota_in;
980 schedule_control_transmit (handle, 973 schedule_control_transmit (handle,
981 sizeof (struct QuotaSetMessage), 974 sizeof (struct QuotaSetMessage),