gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnunet] branch master updated (40eebf828 -> 2d440f03a)


From: gnunet
Subject: [GNUnet-SVN] [gnunet] branch master updated (40eebf828 -> 2d440f03a)
Date: Sun, 25 Jun 2017 14:04:59 +0200

This is an automated email from the git hooks/post-receive script.

daniel-golle pushed a change to branch master
in repository gnunet.

    from 40eebf828 bitch more if NULL rows cause PQ result extraction to fail
     new b3a8a9785 Ensure peer started callback recvs PeerContext
     new 4ef35948e Fix quota compliance tests.
     new 2d440f03a Fix debug message.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/cadet/cadet_api.c                 | 2 +-
 src/transport/test_quota_compliance.c | 8 ++++----
 src/transport/transport-testing.c     | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index 3fdeffe13..00a482452 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -326,7 +326,7 @@ destroy_channel (struct GNUNET_CADET_Channel *ch)
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Destroying channel %X of %p\n",
-       ch->ccn,
+       htonl (ch->ccn.channel_of_client),
        h);
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_CONTAINER_multihashmap32_remove (h->channels,
diff --git a/src/transport/test_quota_compliance.c 
b/src/transport/test_quota_compliance.c
index 73b773b88..211e64e32 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -305,11 +305,11 @@ main (int argc,
   }
   for (unsigned int i=0;i<2;i++)
   {
-    if ( (NULL != gen_cfgs[0]) &&
-         (GNUNET_YES == GNUNET_DISK_file_test (gen_cfgs[0])) )
+    if ( (NULL != gen_cfgs[i]) &&
+         (GNUNET_YES == GNUNET_DISK_file_test (gen_cfgs[i])) )
     {
-      GNUNET_DISK_directory_remove (gen_cfgs[0]);
-      GNUNET_free (gen_cfgs[0]);
+      GNUNET_DISK_directory_remove (gen_cfgs[i]);
+      GNUNET_free (gen_cfgs[i]);
     }
   }
   return 0;
diff --git a/src/transport/transport-testing.c 
b/src/transport/transport-testing.c
index 53a44f338..2aa6cdbb0 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -413,7 +413,10 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct 
GNUNET_TRANSPORT_TESTING_Handle *tth
   else
     p->cb_cls = p;
   p->start_cb = start_cb;
-  p->start_cb_cls = start_cb_cls;
+  if (NULL != start_cb_cls)
+    p->start_cb_cls = start_cb_cls;
+  else
+    p->start_cb_cls = p;
   GNUNET_CONTAINER_DLL_insert (tth->p_head,
                                tth->p_tail,
                                p);

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]