send receive delay rescheduling support

1 files changed, 149 insertions, 3 deletions

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 58cb0fbb3..45f1575fe 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -508,6 +508,8 @@ static unsigned long long bytes_in_send_queue;
 static GNUNET_SCHEDULER_TaskIdentifier util_transmission_tk;
 
 
+static struct GNUNET_CONTAINER_MultiPeerMap *registered_quota_notifications;
+
 /**
  * Lookup a neighbour entry in the neighbours hash map.
  *
@@ -1689,13 +1691,152 @@ send_session_connect_ack_message (const struct GNUNET_HELLO_Address *address,
 
 }
 
+struct QuotaNotificationRequest
+{
+  struct GNUNET_PeerIdentity peer;
+  struct Session *session;
+  char *plugin;
+};
+
+struct QNR_LookContext
+{
+  struct GNUNET_PeerIdentity peer;
+  struct Session *session;
+  const char *plugin;
+
+  struct QuotaNotificationRequest *res;
+};
+
+static int
+find_notification_request (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
+{
+  struct QNR_LookContext *qnr_ctx = cls;
+  struct QuotaNotificationRequest *qnr = value;
+
+  if ((qnr->session == qnr_ctx->session) &&
+      (0 == memcmp (&qnr->peer, &qnr_ctx->peer, sizeof (struct GNUNET_PeerIdentity))) &&
+      (0 == strcmp(qnr_ctx->plugin, qnr->plugin)))
+  {
+    qnr_ctx->res = value;
+    return GNUNET_NO;
+  }
+  return GNUNET_YES;
+}
+
+void
+GST_neighbours_register_quota_notification(void *cls,
+    const struct GNUNET_PeerIdentity *peer, const char *plugin,
+    struct Session *session)
+{
+  struct QuotaNotificationRequest *qnr;
+  struct QNR_LookContext qnr_ctx;
+
+  qnr_ctx.peer = (*peer);
+  qnr_ctx.plugin = plugin;
+  qnr_ctx.session = session;
+  qnr_ctx.res = NULL;
+  int res;
+
+  res = GNUNET_CONTAINER_multipeermap_get_multiple (registered_quota_notifications,
+      peer, &find_notification_request, &qnr_ctx);
+  if (NULL != qnr_ctx.res)
+  {
+    GNUNET_break(0);
+    return;
+  }
+
+  qnr = GNUNET_new (struct QuotaNotificationRequest);
+  qnr->peer =  (*peer);
+  qnr->plugin = GNUNET_strdup (plugin);
+  qnr->session = session;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Adding notification for peer `%s' plugin `%s' session %p \n",
+      GNUNET_i2s (peer), plugin, session);
+
+  GNUNET_CONTAINER_multipeermap_put (registered_quota_notifications, peer,
+      qnr, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+}
+
+
+void
+GST_neighbours_unregister_quota_notification(void *cls,
+    const struct GNUNET_PeerIdentity *peer, const char *plugin, struct Session *session)
+{
+  struct QNR_LookContext qnr_ctx;
+  qnr_ctx.peer = (*peer);
+  qnr_ctx.plugin = plugin;
+  qnr_ctx.session = session;
+  qnr_ctx.res = NULL;
+  int res;
+
+  res = GNUNET_CONTAINER_multipeermap_iterate (registered_quota_notifications,
+      &find_notification_request, &qnr_ctx);
+  if (NULL == qnr_ctx.res)
+  {
+    GNUNET_break(0);
+    return;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Removing notification for peer `%s' plugin `%s' session %p \n",
+      GNUNET_i2s (peer), plugin, session);
+
+  GNUNET_CONTAINER_multipeermap_remove (registered_quota_notifications, peer,
+      qnr_ctx.res);
+  GNUNET_free (qnr_ctx.res->plugin);
+  GNUNET_free (qnr_ctx.res);
+}
+
+static int
+notification_cb(void *cls, const struct GNUNET_PeerIdentity *key, void *value)
+{
+  struct NeighbourMapEntry *n = cls;
+  struct QuotaNotificationRequest *qnr = value;
+  struct GNUNET_TRANSPORT_PluginFunctions *papi;
+  struct GNUNET_TIME_Relative delay;
+  int do_forward;
+
+  papi = GST_plugins_find(qnr->plugin);
+  if (NULL == papi)
+  {
+    GNUNET_break (0);
+    return GNUNET_OK;
+  }
+
+  delay = GST_neighbours_calculate_receive_delay (key, 0, &do_forward);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "New inbound delay for peer `%s' is %llu ms\n", GNUNET_i2s (key),
+      delay.rel_value_us / 1000);
+
+  if (NULL != papi->update_inbound_delay)
+    papi->update_inbound_delay (papi->cls, key, qnr->session, delay);
+  return GNUNET_OK;
+}
+
+static
+int
+free_notification_cb(void *cls, const struct GNUNET_PeerIdentity *key,
+    void *value)
+{
+  struct NeighbourMapEntry *n = cls;
+  struct QuotaNotificationRequest *qnr = value;
+
+  GNUNET_CONTAINER_multipeermap_remove (registered_quota_notifications, key,
+      qnr);
+  GNUNET_free(qnr);
+
+  return GNUNET_OK;
+}
+
 static void
-inbound_bw_tracker_update (void *cls)
+inbound_bw_tracker_update(void *cls)
 {
-  struct Neighbour *n = cls;
+  struct NeighbourMapEntry *n = cls;
 
   /* Quota was updated, tell plugins to update the time to receive next */
-
+  GNUNET_CONTAINER_multipeermap_get_multiple (registered_quota_notifications,
+      &n->id, &notification_cb, n);
 }
 
 
@@ -3655,6 +3796,7 @@ GST_neighbours_start (void *cls,
   disconnect_notify_cb = disconnect_cb;
   neighbour_change_cb = peer_address_cb;
   neighbours = GNUNET_CONTAINER_multipeermap_create (NEIGHBOUR_TABLE_SIZE, GNUNET_NO);
+  registered_quota_notifications = GNUNET_CONTAINER_multipeermap_create (NEIGHBOUR_TABLE_SIZE, GNUNET_NO);
   util_transmission_tk = GNUNET_SCHEDULER_add_delayed (UTIL_TRANSMISSION_INTERVAL,
       utilization_transmission, NULL);
 }
@@ -3723,6 +3865,10 @@ GST_neighbours_stop ()
     GNUNET_free (cur);
   }
 
+  GNUNET_CONTAINER_multipeermap_iterate (registered_quota_notifications,
+      &free_notification_cb, NULL);
+  GNUNET_CONTAINER_multipeermap_destroy (registered_quota_notifications);
+
   neighbours = NULL;
   callback_cls = NULL;
   connect_notify_cb = NULL;