more dead and duplicate code elimination

4 files changed, 1 insertions, 108 deletions

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 3746f0597..336925f4f 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -576,8 +576,6 @@ GST_receive_callback (void *cls,
                               gettext_noop ("# bytes payload received"),
                               ntohs (message->size),
                               GNUNET_NO);
-    GST_neighbours_notify_payload_recv (address,
-                                        message);
     ret = process_payload (address,
                            session,
                            message);
diff --git a/src/transport/gnunet-service-transport_clients.c b/src/transport/gnunet-service-transport_clients.c
index 0aef9f97e..8e0b3fe68 100644
--- a/src/transport/gnunet-service-transport_clients.c
+++ b/src/transport/gnunet-service-transport_clients.c
@@ -700,9 +700,6 @@ handle_send_transmit_continuation (void *cls,
   struct SendTransmitContinuationContext *stcc = cls;
   struct SendOkMessage send_ok_msg;
 
-  if (GNUNET_OK == success)
-    GST_neighbours_notify_payload_sent (&stcc->target,
-                                        bytes_payload);
   send_ok_msg.header.size = htons (sizeof (send_ok_msg));
   send_ok_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK);
   send_ok_msg.bytes_msg = htonl (bytes_payload);
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 750e1a793..15bb0bdab 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -415,16 +415,6 @@ struct NeighbourMapEntry
   /**
    * Tracking utilization of outbound bandwidth
    */
-  uint32_t util_payload_bytes_sent;
-
-  /**
-   * Tracking utilization of inbound bandwidth
-   */
-  uint32_t util_payload_bytes_recv;
-
-  /**
-   * Tracking utilization of outbound bandwidth
-   */
   uint32_t util_total_bytes_sent;
 
   /**
@@ -2840,8 +2830,6 @@ send_utilization_data (void *cls,
 {
   struct NeighbourMapEntry *n = value;
   struct GNUNET_ATS_Information atsi[4];
-  uint32_t bps_pl_in;
-  uint32_t bps_pl_out;
   uint32_t bps_in;
   uint32_t bps_out;
   struct GNUNET_TIME_Relative delta;
@@ -2850,19 +2838,6 @@ send_utilization_data (void *cls,
     return GNUNET_OK;
   delta = GNUNET_TIME_absolute_get_difference (n->last_util_transmission,
                                                GNUNET_TIME_absolute_get ());
-
-  bps_pl_in = 0;
-
-  if ((0 != n->util_payload_bytes_recv) && (0 != delta.rel_value_us))
-    bps_pl_in =  (1000LL * 1000LL *  n->util_payload_bytes_recv) / (delta.rel_value_us);
-  bps_pl_out = 0;
-  if ((0 != n->util_payload_bytes_sent) && (0 != delta.rel_value_us))
-    bps_pl_out = (1000LL * 1000LL * n->util_payload_bytes_sent) / delta.rel_value_us;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s' payload: received %u Bytes/s, sent %u Bytes/s\n",
-              GNUNET_i2s (key),
-              bps_pl_in,
-              bps_pl_out);
   bps_in = 0;
   if ((0 != n->util_total_bytes_recv) && (0 != delta.rel_value_us))
     bps_in =  (1000LL * 1000LL *  n->util_total_bytes_recv) / (delta.rel_value_us);
@@ -2880,17 +2855,9 @@ send_utilization_data (void *cls,
   atsi[0].value = htonl (bps_out);
   atsi[1].type = htonl (GNUNET_ATS_UTILIZATION_IN);
   atsi[1].value = htonl (bps_in);
-
-  atsi[2].type = htonl (GNUNET_ATS_UTILIZATION_PAYLOAD_OUT);
-  atsi[2].value = htonl (bps_pl_out);
-  atsi[3].type = htonl (GNUNET_ATS_UTILIZATION_PAYLOAD_IN);
-  atsi[3].value = htonl (bps_pl_in);
-
   GST_ats_update_metrics (n->primary_address.address,
                           n->primary_address.session,
-                          atsi, 4);
-  n->util_payload_bytes_recv = 0;
-  n->util_payload_bytes_sent = 0;
+                          atsi, 2);
   n->util_total_bytes_recv = 0;
   n->util_total_bytes_sent = 0;
   n->last_util_transmission = GNUNET_TIME_absolute_get ();
@@ -2941,27 +2908,6 @@ GST_neighbours_notify_data_recv (const struct GNUNET_HELLO_Address *address,
 
 
 /**
- * Track information about payload (useful data) we received from the
- * given address (used to notify ATS about our utilization of
- * allocated resources).
- *
- * @param address the address we got data from
- * @param message the message we received (really only the size is used)
- */
-void
-GST_neighbours_notify_payload_recv (const struct GNUNET_HELLO_Address *address,
-                                    const struct GNUNET_MessageHeader *message)
-{
-  struct NeighbourMapEntry *n;
-
-  n = lookup_neighbour (&address->peer);
-  if (NULL == n)
-    return;
-  n->util_payload_bytes_recv += ntohs (message->size);
-}
-
-
-/**
  * Track information about data we transmitted using the given @a
  * address and @a session (used to notify ATS about our utilization of
  * allocated resources).
@@ -2987,27 +2933,6 @@ GST_neighbours_notify_data_sent (const struct GNUNET_HELLO_Address *address,
 
 
 /**
- * Track information about payload (useful data) we transmitted using the
- * given address (used to notify ATS about our utilization of
- * allocated resources).
- *
- * @param address the address we transmitted data to
- * @param message the message we sent (really only the size is used)
- */
-void
-GST_neighbours_notify_payload_sent (const struct GNUNET_PeerIdentity *peer,
-                                    size_t size)
-{
-  struct NeighbourMapEntry *n;
-
-  n = lookup_neighbour (peer);
-  if (NULL == n)
-    return;
-  n->util_payload_bytes_sent += size;
-}
-
-
-/**
  * Master task run for every neighbour.  Performs all of the time-related
  * activities (keep alive, send next message, disconnect if idle, finish
  * clean up after disconnect).
diff --git a/src/transport/gnunet-service-transport_neighbours.h b/src/transport/gnunet-service-transport_neighbours.h
index 637e7609b..070ee01a9 100644
--- a/src/transport/gnunet-service-transport_neighbours.h
+++ b/src/transport/gnunet-service-transport_neighbours.h
@@ -222,19 +222,6 @@ GST_neighbours_notify_data_recv (const struct GNUNET_HELLO_Address *address,
 
 
 /**
- * Track information about payload (useful data) we received from the
- * given address (used to notify ATS about our utilization of
- * allocated resources).
- *
- * @param address the address we got data from
- * @param message the message we received (really only the size is used)
- */
-void
-GST_neighbours_notify_payload_recv (const struct GNUNET_HELLO_Address *address,
-                                    const struct GNUNET_MessageHeader *message);
-
-
-/**
  * Track information about data we transmitted using the given @a
  * address and @a session (used to notify ATS about our utilization of
  * allocated resources).
@@ -250,20 +237,6 @@ GST_neighbours_notify_data_sent (const struct GNUNET_HELLO_Address *address,
 
 
 /**
- * Track information about payload (useful data) we transmitted using the
- * given address (used to notify ATS about our utilization of
- * allocated resources).
- *
- * @param address the address we transmitted data to
- * @param message the message we sent (really only the size is used)
- */
-void
-GST_neighbours_notify_payload_sent (const struct GNUNET_PeerIdentity *peer,
-                                    size_t size);
-
-
-
-/**
  * For an existing neighbour record, set the active connection to
  * use the given address.
  *