-add FIXME to nat service _unregister; fix printf format in tcp communicator

3 files changed, 9 insertions, 10 deletions

diff --git a/src/include/gnunet_nat_service.h b/src/include/gnunet_nat_service.h
index e39e2c016..628ca2ef8 100644
--- a/src/include/gnunet_nat_service.h
+++ b/src/include/gnunet_nat_service.h
@@ -385,6 +385,12 @@ GNUNET_NAT_request_reversal (struct GNUNET_NAT_Handle *nh,
  * handle.  This frees the handle, after having sent the needed
  * commands to close open ports.
  *
+ * FIXME: No, the implementation of this API does not do anything beyond
+ * cleaning up the handle.
+ * This is a problem for applications that use #GNUNET_NAT_AddressCallback
+ * and use the app_ctx to store objects, because the callback will never be
+ * called for cleanup on unregister.
+ *
  * @param nh the handle to unregister
  */
 void
diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c
index 7cf7e6bb3..3072cff7f 100644
--- a/src/nat/nat_api.c
+++ b/src/nat/nat_api.c
@@ -670,13 +670,6 @@ GNUNET_NAT_request_reversal (struct GNUNET_NAT_Handle *nh,
 }
 
 
-/**
- * Stop port redirection and public IP address detection for the given
- * handle.  This frees the handle, after having sent the needed
- * commands to close open ports.
- *
- * @param nh the handle to stop
- */
 void
 GNUNET_NAT_unregister (struct GNUNET_NAT_Handle *nh)
 {
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
index a8dbed604..84aa45b9a 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -1448,7 +1448,7 @@ handshake_ack_monotime_cb (void *cls,
  * @param queue The queue context.
  */
 static void
-send_challenge (struct GNUNET_CRYPTO_ChallengeNonceP challenge, 
+send_challenge (struct GNUNET_CRYPTO_ChallengeNonceP challenge,
                 struct Queue *queue)
 {
   struct TCPConfirmationAck tca;
@@ -1914,10 +1914,10 @@ queue_read (void *cls)
                                      &queue->cread_buf[queue->cread_off],
                                      BUF_SIZE - queue->cread_off);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received %lu bytes from TCP queue\n", rcvd);
+              "Received %zd bytes from TCP queue\n", rcvd);
   GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG,
                            "transport",
-                           "Received %lu bytes from TCP queue\n", rcvd);
+                           "Received %zd bytes from TCP queue\n", rcvd);
   if (-1 == rcvd)
   {
     if ((EAGAIN != errno) && (EINTR != errno))