1 files changed, 65 insertions, 27 deletions

diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
index ed82dba9f..9dd2797df 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -739,7 +739,6 @@ struct Addresses
 };
 
 
-
 /**
  * Maximum queue length before we stop reading towards the transport service.
  */
@@ -878,12 +877,14 @@ queue_destroy (struct Queue *queue)
 {
   struct ListenTask *lt = NULL;
   struct GNUNET_HashCode h_sock;
+  int sockfd;
 
-  GNUNET_CRYPTO_hash (queue->listen_sock,
-                      sizeof(queue->listen_sock),
+  sockfd = GNUNET_NETWORK_get_fd (queue->listen_sock);
+  GNUNET_CRYPTO_hash (&sockfd,
+                      sizeof(int),
                       &h_sock);
 
-  lt =   GNUNET_CONTAINER_multihashmap_get (lt_map, &h_sock);
+  lt = GNUNET_CONTAINER_multihashmap_get (lt_map, &h_sock);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Disconnecting queue for peer `%s'\n",
@@ -953,6 +954,9 @@ queue_destroy (struct Queue *queue)
   else
     GNUNET_free (queue);
 
+  if (NULL == lt)
+    return;
+
   if ((! shutdown_running) && (NULL == lt->listen_task))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1193,6 +1197,7 @@ setup_cipher (const struct GNUNET_HashCode *dh,
                                     0));
 }
 
+
 /**
  * Callback called when peerstore store operation for rekey monotime value is finished.
  * @param cls Queue context the store operation was executed.
@@ -1210,6 +1215,7 @@ rekey_monotime_store_cb (void *cls, int success)
   queue->rekey_monotime_sc = NULL;
 }
 
+
 /**
  * Callback called by peerstore when records for GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_REKEY
  * where found.
@@ -1259,13 +1265,15 @@ rekey_monotime_cb (void *cls,
                                                      pid,
                                                      GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_REKEY,
                                                      rekey_monotonic_time,
-                                                     sizeof(rekey_monotonic_time),
+                                                     sizeof(*
+                                                            rekey_monotonic_time),
                                                      GNUNET_TIME_UNIT_FOREVER_ABS,
                                                      GNUNET_PEERSTORE_STOREOPTION_REPLACE,
                                                      &rekey_monotime_store_cb,
                                                      queue);
 }
 
+
 /**
  * Setup cipher of @a queue for decryption.
  *
@@ -1344,6 +1352,7 @@ do_rekey (struct Queue *queue, const struct TCPRekey *rekey)
   setup_in_cipher (&rekey->ephemeral, queue);
 }
 
+
 /**
  * Callback called when peerstore store operation for handshake ack monotime value is finished.
  * @param cls Queue context the store operation was executed.
@@ -1362,6 +1371,7 @@ handshake_ack_monotime_store_cb (void *cls, int success)
   queue->handshake_ack_monotime_sc = NULL;
 }
 
+
 /**
  * Callback called by peerstore when records for GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_HANDSHAKE_ACK
  * where found.
@@ -1406,20 +1416,21 @@ handshake_ack_monotime_cb (void *cls,
     queue_finish (queue);
     return;
   }
-  queue->handshake_ack_monotime_sc = GNUNET_PEERSTORE_store (peerstore,
-                                                             "transport_tcp_communicator",
-                                                             pid,
-                                                             GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_HANDSHAKE_ACK,
-                                                             handshake_ack_monotonic_time,
-                                                             sizeof(
-                                                               handshake_ack_monotonic_time),
-                                                             GNUNET_TIME_UNIT_FOREVER_ABS,
-                                                             GNUNET_PEERSTORE_STOREOPTION_REPLACE,
-                                                             &
-                                                             handshake_ack_monotime_store_cb,
-                                                             queue);
+  queue->handshake_ack_monotime_sc =
+    GNUNET_PEERSTORE_store (peerstore,
+                            "transport_tcp_communicator",
+                            pid,
+                            GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_HANDSHAKE_ACK,
+                            handshake_ack_monotonic_time,
+                            sizeof(*handshake_ack_monotonic_time),
+                            GNUNET_TIME_UNIT_FOREVER_ABS,
+                            GNUNET_PEERSTORE_STOREOPTION_REPLACE,
+                            &
+                            handshake_ack_monotime_store_cb,
+                            queue);
 }
 
+
 /**
  * Sending challenge with TcpConfirmationAck back to sender of ephemeral key.
  *
@@ -1465,6 +1476,7 @@ send_challenge (struct ChallengeNonceP challenge, struct Queue *queue)
                            "sending challenge done\n");
 }
 
+
 /**
  * Setup cipher for outgoing data stream based on target and
  * our ephemeral private key.
@@ -1545,6 +1557,7 @@ inject_rekey (struct Queue *queue)
   setup_out_cipher (queue);
 }
 
+
 /**
  * We have been notified that our socket is ready to write.
  * Then reschedule this function to be called again once more is available.
@@ -1634,6 +1647,7 @@ queue_write (void *cls)
                                       queue);
 }
 
+
 /**
  * Test if we have received a full message in plaintext.
  * If so, handle it.
@@ -1778,7 +1792,7 @@ try_handle_plaintext (struct Queue *queue)
     queue->qh = GNUNET_TRANSPORT_communicator_mq_add (ch,
                                                       &queue->target,
                                                       foreign_addr,
-                                                      0 /* no MTU */,
+                                                      UINT32_MAX, /* no MTU */
                                                       GNUNET_TRANSPORT_QUEUE_LENGTH_UNLIMITED,
                                                       0, /* Priority */
                                                       queue->nt,
@@ -1975,6 +1989,7 @@ queue_read (void *cls)
   queue_finish (queue);
 }
 
+
 /**
  * Convert a `struct sockaddr_in6 to a `struct sockaddr *`
  *
@@ -2001,6 +2016,7 @@ tcp_address_to_sockaddr_numeric_v6 (socklen_t *sock_len, struct sockaddr_in6 v6,
   return in;
 }
 
+
 /**
  * Convert a `struct sockaddr_in4 to a `struct sockaddr *`
  *
@@ -2024,6 +2040,7 @@ tcp_address_to_sockaddr_numeric_v4 (socklen_t *sock_len, struct sockaddr_in v4,
   return in;
 }
 
+
 /**
  * Convert TCP bind specification to a `struct PortOnlyIpv4Ipv6  *`
  *
@@ -2083,6 +2100,7 @@ tcp_address_to_sockaddr_port_only (const char *bindto, unsigned int *port)
   return po;
 }
 
+
 /**
  * This Method extracts the address part of the BINDTO string.
  *
@@ -2117,7 +2135,8 @@ extract_address (const char *bindto)
     start++;   /* skip over '['*/
     cp[strlen (cp) - 1] = '\0';  /* eat ']'*/
   }
-  else {
+  else
+  {
     token = strtok_r (cp, "]", &rest);
     if (strlen (bindto) == strlen (token))
     {
@@ -2139,6 +2158,7 @@ extract_address (const char *bindto)
   return start;
 }
 
+
 /**
  * This Method extracts the port part of the BINDTO string.
  *
@@ -2217,6 +2237,7 @@ extract_port (const char *addr_and_port)
   return port;
 }
 
+
 /**
  * Convert TCP bind specification to a `struct sockaddr *`
  *
@@ -2245,7 +2266,6 @@ tcp_address_to_sockaddr (const char *bindto, socklen_t *sock_len)
               bindto);
 
 
-
   if (1 == inet_pton (AF_INET, start, &v4.sin_addr))
   {
     // colon = strrchr (cp, ':');
@@ -2263,7 +2283,8 @@ tcp_address_to_sockaddr (const char *bindto, socklen_t *sock_len)
     port = extract_port (bindto);
     in = tcp_address_to_sockaddr_numeric_v6 (sock_len, v6, port);
   }
-  else{
+  else
+  {
     GNUNET_assert (0);
   }
 
@@ -2272,6 +2293,7 @@ tcp_address_to_sockaddr (const char *bindto, socklen_t *sock_len)
   return in;
 }
 
+
 /**
  * Signature of functions implementing the sending functionality of a
  * message queue.
@@ -2510,6 +2532,7 @@ start_initial_kx_out (struct Queue *queue)
   transmit_kx (queue, &epub);
 }
 
+
 /**
  * Callback called when peerstore store operation for handshake monotime is finished.
  * @param cls Queue context the store operation was executed.
@@ -2527,6 +2550,7 @@ handshake_monotime_store_cb (void *cls, int success)
   queue->handshake_monotime_sc = NULL;
 }
 
+
 /**
  * Callback called by peerstore when records for GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_HANDSHAKE
  * where found.
@@ -2585,6 +2609,7 @@ handshake_monotime_cb (void *cls,
                                                          queue);
 }
 
+
 /**
  * We have received the first bytes from the other side on a @a queue.
  * Decrypt the @a tc contained in @a ibuf and check the signature.
@@ -2651,6 +2676,7 @@ free_proto_queue (struct ProtoQueue *pq)
   GNUNET_free (pq);
 }
 
+
 /**
  * Read from the socket of the proto queue until we have enough data
  * to upgrade to full queue.
@@ -2892,6 +2918,7 @@ queue_read_kx (void *cls)
     queue->read_task = GNUNET_SCHEDULER_add_now (&queue_read, queue);
 }
 
+
 /**
  * Function called by the transport service to initialize a
  * message queue given address information about another peer.
@@ -2991,6 +3018,7 @@ mq_init (void *cls, const struct GNUNET_PeerIdentity *peer, const char *address)
   return GNUNET_OK;
 }
 
+
 /**
  * Iterator over all ListenTasks to clean up.
  *
@@ -3021,6 +3049,7 @@ get_lt_delete_it (void *cls,
   return GNUNET_OK;
 }
 
+
 /**
  * Iterator over all message queues to clean up.
  *
@@ -3042,6 +3071,7 @@ get_queue_delete_it (void *cls,
   return GNUNET_OK;
 }
 
+
 /**
  * Shutdown the UNIX communicator.
  *
@@ -3182,6 +3212,7 @@ nat_address_cb (void *cls,
   }
 }
 
+
 /**
  * This method adds addresses to the DLL, that are later register at the NAT service.
  */
@@ -3211,6 +3242,7 @@ add_addr (struct sockaddr *in, socklen_t in_len)
   addrs_lens++;
 }
 
+
 /**
  * This method launch network interactions for each address we like to bind to.
  *
@@ -3226,6 +3258,7 @@ init_socket (struct sockaddr *addr,
   socklen_t sto_len;
   struct GNUNET_NETWORK_Handle *listen_sock;
   struct ListenTask *lt;
+  int sockfd;
   struct GNUNET_HashCode h_sock;
 
   if (NULL == addr)
@@ -3314,8 +3347,9 @@ init_socket (struct sockaddr *addr,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "creating hash\n");
-  GNUNET_CRYPTO_hash (lt->listen_sock,
-                      sizeof(lt->listen_sock),
+  sockfd = GNUNET_NETWORK_get_fd (lt->listen_sock);
+  GNUNET_CRYPTO_hash (&sockfd,
+                      sizeof(int),
                       &h_sock);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -3336,7 +3370,7 @@ init_socket (struct sockaddr *addr,
   if (NULL == queue_map)
     queue_map = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
 
-  if (NULL == ch )
+  if (NULL == ch)
     ch = GNUNET_TRANSPORT_communicator_connect (cfg,
                                                 COMMUNICATOR_CONFIG_SECTION,
                                                 COMMUNICATOR_ADDRESS_PREFIX,
@@ -3360,6 +3394,7 @@ init_socket (struct sockaddr *addr,
 
 }
 
+
 /**
  * This method reads from the DLL addrs_head to register them at the NAT service.
  */
@@ -3421,6 +3456,7 @@ nat_register ()
   }
 }
 
+
 /**
  * This method is the callback called by the resolver API, and wraps method init_socket.
  *
@@ -3476,6 +3512,7 @@ init_socket_resolv (void *cls,
   }
 }
 
+
 /**
  * Setup communicator and launch network interactions.
  *
@@ -3532,6 +3569,7 @@ run (void *cls,
   peerstore = GNUNET_PEERSTORE_connect (cfg);
   if (NULL == peerstore)
   {
+    GNUNET_free (bindto);
     GNUNET_break (0);
     GNUNET_SCHEDULER_shutdown ();
     return;
@@ -3564,7 +3602,6 @@ run (void *cls,
     GNUNET_free (po);
     nat_register ();
     GNUNET_free (bindto);
-
     return;
   }
 
@@ -3577,8 +3614,8 @@ run (void *cls,
     in = tcp_address_to_sockaddr_numeric_v4 (&in_len, v4, bind_port);
     init_socket (in, in_len);
     nat_register ();
+    GNUNET_free (start);
     GNUNET_free (bindto);
-
     return;
   }
 
@@ -3588,8 +3625,8 @@ run (void *cls,
     in = tcp_address_to_sockaddr_numeric_v6 (&in_len, v6, bind_port);
     init_socket (in, in_len);
     nat_register ();
+    GNUNET_free (start);
     GNUNET_free (bindto);
-
     return;
   }
 
@@ -3603,6 +3640,7 @@ run (void *cls,
                                                    &init_socket_resolv,
                                                    &port);
   GNUNET_free (bindto);
+  GNUNET_free (start);
 }