undo 17914, 915, 916

4 files changed, 2 insertions, 14 deletions

diff --git a/src/fragmentation/defragmentation.c b/src/fragmentation/defragmentation.c
index d080f54da..b07f20407 100644
--- a/src/fragmentation/defragmentation.c
+++ b/src/fragmentation/defragmentation.c
@@ -536,8 +536,6 @@ GNUNET_DEFRAGMENT_process_fragment (struct GNUNET_DEFRAGMENT_Context *dc,
   {
     delay = GNUNET_TIME_UNIT_ZERO;
   }
-  if (NULL != getenv ("infinitebandwidth"))
-    delay = GNUNET_TIME_UNIT_ZERO;
   if (GNUNET_SCHEDULER_NO_TASK != mc->ack_task)
     GNUNET_SCHEDULER_cancel (mc->ack_task);
   mc->ack_task = GNUNET_SCHEDULER_add_delayed (delay, &send_ack, mc);
diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c
index fc69b8a3a..ef3a57a87 100644
--- a/src/fragmentation/fragmentation.c
+++ b/src/fragmentation/fragmentation.c
@@ -160,8 +160,6 @@ transmit_next (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     delay = GNUNET_BANDWIDTH_tracker_get_delay (fc->tracker, fsize);
   else
     delay = GNUNET_TIME_UNIT_ZERO;
-  if (NULL != getenv ("infinitebandwidth"))
-    delay = GNUNET_TIME_UNIT_ZERO;
   if (delay.rel_value > 0)
   {
     fc->task = GNUNET_SCHEDULER_add_delayed (delay, &transmit_next, fc);
@@ -210,8 +208,6 @@ transmit_next (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     fc->last_round = GNUNET_TIME_absolute_get ();
     fc->wack = GNUNET_YES;
   }
-  if (NULL != getenv ("infinitebandwidth"))
-    delay = GNUNET_TIME_UNIT_ZERO;
   fc->proc_busy = GNUNET_YES;
   fc->delay_until = GNUNET_TIME_relative_to_absolute (delay);
   fc->proc (fc->proc_cls, &fh->header);
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 0f35afc0c..a1ce1364f 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -1583,11 +1583,6 @@ GST_neighbours_calculate_receive_delay (const struct GNUNET_PeerIdentity
   struct NeighbourMapEntry *n;
   struct GNUNET_TIME_Relative ret;
 
-  if (NULL != getenv ("infinitebandwidth"))
-    {
-      *do_forward = GNUNET_YES;
-      return GNUNET_TIME_UNIT_ZERO;
-    }
   GNUNET_assert (neighbours != NULL);
 
   n = lookup_neighbour (sender);
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 894618986..2ececc10d 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -681,7 +681,7 @@ transport_notify_ready (void *cls, size_t size, void *buf)
     }
     th = n->th;
     if (th->notify_size + sizeof (struct OutboundMessage) > size)
-      break;                    /* does not fit */    
+      break;                    /* does not fit */
     if (GNUNET_BANDWIDTH_tracker_get_delay
         (&n->out_tracker, th->notify_size).rel_value > 0)
       break;                    /* too early */
@@ -708,8 +708,7 @@ transport_notify_ready (void *cls, size_t size, void *buf)
       memcpy (&cbuf[ret], &obm, sizeof (struct OutboundMessage));
       ret += (mret + sizeof (struct OutboundMessage));
       size -= (mret + sizeof (struct OutboundMessage));
-      if (NULL == getenv ("infinitebandwidth"))
-        GNUNET_BANDWIDTH_tracker_consume (&n->out_tracker, mret);
+      GNUNET_BANDWIDTH_tracker_consume (&n->out_tracker, mret);
     }
     GNUNET_free (th);
   }