[gnunet] branch master updated (ecfbd79c0 -> 6c0cac3d3)

[gnunet]

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

marshall pushed a change to branch master
in repository gnunet.

    from ecfbd79c0 -minor bugfixes, adding FIXMEs
     new fa46c7f49 quic: remove hn
     new 6c0cac3d3 quic: nat bug fix

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/transport/gnunet-communicator-quic.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/transport/gnunet-communicator-quic.c 
b/src/transport/gnunet-communicator-quic.c
index 76b0ebd62..108f65b31 100644
--- a/src/transport/gnunet-communicator-quic.c
+++ b/src/transport/gnunet-communicator-quic.c
@@ -141,13 +141,13 @@ struct PeerAddress
   /**
    * Entry in sender expiration heap.
    */
-  struct GNUNET_CONTAINER_HeapNode *hn;
+  // struct GNUNET_CONTAINER_HeapNode *hn;
 };
 
-/**
- * Expiration heap for peers (contains `struct PeerAddress`)
- */
-static struct GNUNET_CONTAINER_Heap *peers_heap;
+// /**
+//  * Expiration heap for peers (contains `struct PeerAddress`)
+//  */
+// static struct GNUNET_CONTAINER_Heap *peers_heap;
 
 /**
  * ID of timeout task
@@ -433,8 +433,8 @@ reschedule_peer_timeout (struct PeerAddress *peer)
 {
   peer->timeout =
     GNUNET_TIME_relative_to_absolute 
(GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-  GNUNET_CONTAINER_heap_update_cost (peer->hn,
-                                     peer->timeout.abs_value_us);
+  // GNUNET_CONTAINER_heap_update_cost (peer->hn,
+  //                                    peer->timeout.abs_value_us);
 }
 
 
@@ -457,7 +457,7 @@ peer_destroy (struct PeerAddress *peer)
     GNUNET_TRANSPORT_communicator_mq_del (peer->d_qh);
     peer->d_qh = NULL;
   }
-  GNUNET_assert (peer == GNUNET_CONTAINER_heap_remove_node (peer->hn));
+  // GNUNET_assert (peer == GNUNET_CONTAINER_heap_remove_node (peer->hn));
   /**
    * Remove peer from hashmap
   */
@@ -1006,9 +1006,9 @@ mq_init (void *cls, const struct GNUNET_PeerIdentity 
*peer_id, const
   peer->nt = GNUNET_NT_scanner_get_type (is, in, in_len);
   peer->timeout =
     GNUNET_TIME_relative_to_absolute 
(GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-  peer->hn = GNUNET_CONTAINER_heap_insert (peers_heap,
-                                           peer,
-                                           peer->timeout.abs_value_us);
+  // peer->hn = GNUNET_CONTAINER_heap_insert (peers_heap,
+  //                                          peer,
+  //                                          peer->timeout.abs_value_us);
   GNUNET_STATISTICS_set (stats,
                          "# peers active",
                          GNUNET_CONTAINER_multihashmap_size (addr_map),
@@ -1593,6 +1593,7 @@ run (void *cls,
                                               NULL,
                                               &notify_cb,
                                               NULL);
+  is = GNUNET_NT_scanner_init ();
   nat = GNUNET_NAT_register (cfg,
                              COMMUNICATOR_CONFIG_SECTION,
                              IPPROTO_UDP,

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