[gnunet] branch master updated (e5e1586bb -> ec5758786)

[gnunet]

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

t3sserakt pushed a change to branch master
in repository gnunet.

    from e5e1586bb Merge branch 'master' of ssh://git.gnunet.org/gnunet
     new f1510f744 Transport: Fixed using wrong function to calculate mean time 
when to send next fragment.
     new ec5758786 Peerstore: Fixed wrong assert when checking DLL with watches.

The 2 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/service/peerstore/peerstore_api.c            | 2 +-
 src/service/transport/gnunet-service-transport.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/service/peerstore/peerstore_api.c 
b/src/service/peerstore/peerstore_api.c
index 269d4788e..2f43db3f5 100644
--- a/src/service/peerstore/peerstore_api.c
+++ b/src/service/peerstore/peerstore_api.c
@@ -366,7 +366,7 @@ disconnect (struct GNUNET_PEERSTORE_Handle *h)
 {
   if (NULL != h->watches)
   {
-    GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size (h->watches));
+    GNUNET_assert (0 != GNUNET_CONTAINER_multihashmap_size (h->watches));
     GNUNET_CONTAINER_multihashmap_destroy (h->watches);
   }
   GNUNET_assert (NULL == h->iterate_head);
diff --git a/src/service/transport/gnunet-service-transport.c 
b/src/service/transport/gnunet-service-transport.c
index af6406787..66f8641a2 100644
--- a/src/service/transport/gnunet-service-transport.c
+++ b/src/service/transport/gnunet-service-transport.c
@@ -9758,8 +9758,8 @@ update_pm_next_attempt (struct PendingMessage *pm,
       struct GNUNET_TIME_Relative s1;
       struct GNUNET_TIME_Relative s2;
       struct GNUNET_TIME_Relative plus_mean =
-        GNUNET_TIME_absolute_get_duration (root->next_attempt);
-      struct GNUNET_TIME_Relative plus = GNUNET_TIME_absolute_get_duration (
+        GNUNET_TIME_absolute_get_remaining (root->next_attempt);
+      struct GNUNET_TIME_Relative plus = GNUNET_TIME_absolute_get_remaining (
         next_attempt);
 
       s1 = GNUNET_TIME_relative_multiply (plus_mean,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.