-more work on DHTU integration

2 files changed, 13 insertions, 5 deletions

diff --git a/src/dhtu/plugin_dhtu_gnunet.c b/src/dhtu/plugin_dhtu_gnunet.c
index a75c47ce3..5cf47a850 100644
--- a/src/dhtu/plugin_dhtu_gnunet.c
+++ b/src/dhtu/plugin_dhtu_gnunet.c
@@ -235,7 +235,7 @@ hello_offered_cb (void *cls)
  */
 static void
 ip_try_connect (void *cls,
-                struct GNUNET_PeerIdentity *pid,
+                const struct GNUNET_PeerIdentity *pid,
                 const char *address)
 {
   struct Plugin *plugin = cls;
@@ -349,6 +349,17 @@ ip_send (void *cls,
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *cmsg;
 
+  if (GNUNET_MQ_get_length (target->mq) >= MAXIMUM_PENDING_PER_PEER)
+  {
+    /* skip */
+#if FIXME_STATS
+    GNUNET_STATISTICS_update (GDS_stats,
+                              "# P2P messages dropped due to full queue",
+                              1,
+                              GNUNET_NO);
+#endif
+    return;
+  }
   env = GNUNET_MQ_msg_extra (cmsg,
                              msg_size,
                              GNUNET_MESSAGE_TYPE_DHT_CORE);
diff --git a/src/dhtu/plugin_dhtu_ip.c b/src/dhtu/plugin_dhtu_ip.c
index 7c01e5baf..998a7903b 100644
--- a/src/dhtu/plugin_dhtu_ip.c
+++ b/src/dhtu/plugin_dhtu_ip.c
@@ -354,7 +354,7 @@ find_target (struct Plugin *plugin,
  */
 static void
 ip_try_connect (void *cls,
-                struct GNUNET_PeerIdentity *pid,
+                const struct GNUNET_PeerIdentity *pid,
                 const char *address)
 {
   struct Plugin *plugin = cls;
@@ -365,7 +365,6 @@ ip_try_connect (void *cls,
     .ai_flags = AI_NUMERICHOST | AI_NUMERICSERV
   };
   struct addrinfo *result = NULL;
-  char *epid;
 
   if (0 !=
       strncmp (address,
@@ -507,7 +506,6 @@ create_source (struct Plugin *plugin,
                socklen_t addrlen)
 {
   struct GNUNET_DHTU_Source *src;
-  char *pid;
 
   src = GNUNET_new (struct GNUNET_DHTU_Source);
   src->addrlen = addrlen;
@@ -549,7 +547,6 @@ create_source (struct Plugin *plugin,
     break;
   default:
     GNUNET_break (0);
-    GNUNET_free (pid);
     GNUNET_free (src);
     return NULL;
   }