[GNUnet-SVN] r15409 - in gnunet/src: core transport

[gnunet]

Author: grothoff
Date: 2011-06-03 22:43:37 +0200 (Fri, 03 Jun 2011)
New Revision: 15409

Modified:
   gnunet/src/core/gnunet-service-core.c
   gnunet/src/transport/test_quota_compliance.c
   gnunet/src/transport/test_transport_api_reliability.c
   gnunet/src/transport/test_transport_api_unreliability.c
   gnunet/src/transport/transport_api.c
Log:
simplify api

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2011-06-03 16:51:27 UTC (rev 
15408)
+++ gnunet/src/core/gnunet-service-core.c       2011-06-03 20:43:37 UTC (rev 
15409)
@@ -1611,9 +1611,7 @@
              GNUNET_TRANSPORT_set_quota (transport,
                                          &n->peer,
                                          n->bw_in,
-                                         n->bw_out,
-                                         GNUNET_TIME_UNIT_FOREVER_REL,
-                                         NULL, NULL); 
+                                         n->bw_out);
              handle_peer_status_change (n);
            }
        }
@@ -3704,9 +3702,7 @@
          GNUNET_TRANSPORT_set_quota (transport,
                                      &n->peer,
                                      n->bw_in,
-                                     n->bw_out,
-                                     GNUNET_TIME_UNIT_FOREVER_REL,
-                                     NULL, NULL); 
+                                     n->bw_out);
        }
 #if DEBUG_CORE
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -4226,9 +4222,7 @@
       GNUNET_TRANSPORT_set_quota (transport,
                                  &n->peer,
                                  n->bw_in,
-                                 n->bw_out,
-                                 GNUNET_TIME_UNIT_FOREVER_REL,
-                                 NULL, NULL); 
+                                 n->bw_out);
     }
   n->last_activity = GNUNET_TIME_absolute_get ();
   if (n->keep_alive_task != GNUNET_SCHEDULER_NO_TASK)
@@ -4509,9 +4503,7 @@
        GNUNET_TRANSPORT_set_quota (transport,
                                    &n->peer,
                                    n->bw_in,
-                                   n->bw_out,
-                                   GNUNET_TIME_UNIT_FOREVER_REL,
-                                   NULL, NULL);
+                                   n->bw_out);
       handle_peer_status_change (n);
     }
   schedule_quota_update (n);
@@ -4574,9 +4566,7 @@
   GNUNET_TRANSPORT_set_quota (transport,
                              &n->peer,
                              n->bw_in,
-                             n->bw_out,
-                             GNUNET_TIME_UNIT_FOREVER_REL,
-                             NULL, NULL);
+                             n->bw_out);
   send_key (n); 
 }
 

Modified: gnunet/src/transport/test_quota_compliance.c
===================================================================
--- gnunet/src/transport/test_quota_compliance.c        2011-06-03 16:51:27 UTC 
(rev 15408)
+++ gnunet/src/transport/test_quota_compliance.c        2011-06-03 20:43:37 UTC 
(rev 15409)
@@ -516,18 +516,13 @@
 
 #endif
                GNUNET_TRANSPORT_set_quota (p1.th,
-                         &p2.id,
-                         GNUNET_BANDWIDTH_value_init (current_quota_p1 ),
-                         GNUNET_BANDWIDTH_value_init (current_quota_p1 ),
-                         GNUNET_TIME_UNIT_FOREVER_REL,
-                         NULL, NULL);
+                                           &p2.id,
+                                           GNUNET_BANDWIDTH_value_init 
(current_quota_p1),
+                                           GNUNET_BANDWIDTH_value_init 
(current_quota_p1));
                GNUNET_TRANSPORT_set_quota (p2.th,
-                         &p1.id,
-                         GNUNET_BANDWIDTH_value_init (current_quota_p2),
-                         GNUNET_BANDWIDTH_value_init (current_quota_p2),
-                         GNUNET_TIME_UNIT_FOREVER_REL,
-                         NULL, NULL);
-
+                                           &p1.id,
+                                           GNUNET_BANDWIDTH_value_init 
(current_quota_p2),
+                                           GNUNET_BANDWIDTH_value_init 
(current_quota_p2));
                GNUNET_SCHEDULER_cancel (die_task);
                die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
                                                   &end_badly,

Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c       2011-06-03 
16:51:27 UTC (rev 15408)
+++ gnunet/src/transport/test_transport_api_reliability.c       2011-06-03 
20:43:37 UTC (rev 15409)
@@ -341,9 +341,7 @@
       GNUNET_TRANSPORT_set_quota (p1.th,
                                  &p2.id,
                                  GNUNET_BANDWIDTH_value_init (1024 * 1024 * 
1024),
-                                 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 
1024),
-                                 GNUNET_TIME_UNIT_FOREVER_REL,
-                                 NULL, NULL);
+                                 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 
1024));
       start_time = GNUNET_TIME_absolute_get ();
       connected++;
     }
@@ -352,9 +350,7 @@
       GNUNET_TRANSPORT_set_quota (p2.th,
                                  &p1.id,
                                  GNUNET_BANDWIDTH_value_init (1024 * 1024 * 
1024),
-                                 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 
1024),
-                                 GNUNET_TIME_UNIT_FOREVER_REL,
-                                 NULL, NULL);
+                                 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 
1024));
       connected++;
     }
 

Modified: gnunet/src/transport/test_transport_api_unreliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability.c     2011-06-03 
16:51:27 UTC (rev 15408)
+++ gnunet/src/transport/test_transport_api_unreliability.c     2011-06-03 
20:43:37 UTC (rev 15409)
@@ -438,9 +438,7 @@
       GNUNET_TRANSPORT_set_quota (p1.th,
                                  &p2.id,
                                  GNUNET_BANDWIDTH_value_init (1024 * 1024 * 
1024),
-                                 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 
1024),
-                                 GNUNET_TIME_UNIT_FOREVER_REL,
-                                 NULL, NULL);
+                                 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 
1024));
       start_time = GNUNET_TIME_absolute_get ();
       connected++;
     }
@@ -449,9 +447,7 @@
       GNUNET_TRANSPORT_set_quota (p2.th,
                                  &p1.id,
                                  GNUNET_BANDWIDTH_value_init (1024 * 1024 * 
1024),
-                                 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 
1024),
-                                 GNUNET_TIME_UNIT_FOREVER_REL,
-                                 NULL, NULL);
+                                 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 
1024));
       connected++;
     }
 

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2011-06-03 16:51:27 UTC (rev 
15408)
+++ gnunet/src/transport/transport_api.c        2011-06-03 20:43:37 UTC (rev 
15409)
@@ -925,19 +925,12 @@
  * @param target who's bandwidth quota is being changed
  * @param quota_in incoming bandwidth quota in bytes per ms
  * @param quota_out outgoing bandwidth quota in bytes per ms
- * @param timeout how long to wait until signaling failure if
- *        we can not communicate the quota change
- * @param cont continuation to call when done, will be called
- *        either with reason "TIMEOUT" or with reason "PREREQ_DONE"
- * @param cont_cls closure for continuation
  */
 void
 GNUNET_TRANSPORT_set_quota (struct GNUNET_TRANSPORT_Handle *handle,
                             const struct GNUNET_PeerIdentity *target,
                             struct GNUNET_BANDWIDTH_Value32NBO quota_in,
-                            struct GNUNET_BANDWIDTH_Value32NBO quota_out,
-                            struct GNUNET_TIME_Relative timeout,
-                            GNUNET_SCHEDULER_Task cont, void *cont_cls)
+                            struct GNUNET_BANDWIDTH_Value32NBO quota_out)
 {
   struct NeighbourList *n;
   struct SetQuotaContext *sqc;
@@ -973,9 +966,9 @@
   sqc = GNUNET_malloc (sizeof (struct SetQuotaContext));
   sqc->handle = handle;
   sqc->target = *target;
-  sqc->cont = cont;
-  sqc->cont_cls = cont_cls;
-  sqc->timeout = GNUNET_TIME_relative_to_absolute (timeout);
+  sqc->cont = NULL;
+  sqc->cont_cls = NULL;
+  sqc->timeout = GNUNET_TIME_relative_to_absolute 
(GNUNET_TIME_UNIT_FOREVER_REL);
   sqc->quota_in = quota_in;
   schedule_control_transmit (handle,
                              sizeof (struct QuotaSetMessage),