From 9ffbe0b7a13b6f086f1d8bf5c770ed0476fe040d Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 9 Jun 2011 21:11:42 +0000
Subject: [PATCH] pass cfg to nat

---
 src/include/gnunet_nat_lib.h         | 4 +++-
 src/nat/nat.c                        | 4 +++-
 src/transport/plugin_transport_tcp.c | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/include/gnunet_nat_lib.h b/src/include/gnunet_nat_lib.h
index 6d158930a..14da4e684 100644
--- a/src/include/gnunet_nat_lib.h
+++ b/src/include/gnunet_nat_lib.h
@@ -57,6 +57,7 @@ struct GNUNET_NAT_Handle;
  * of the local host's addresses should the external port be mapped. The port
  * is taken from the corresponding sockaddr_in[6] field.
  *
+ * @param cfg configuration to use
  * @param addr the local address packets should be redirected to
  * @param addrlen actual lenght of the address
  * @param callback function to call everytime the public IP address changes
@@ -64,7 +65,8 @@ struct GNUNET_NAT_Handle;
  * @return NULL on error, otherwise handle that can be used to unregister 
  */
 struct GNUNET_NAT_Handle *
-GNUNET_NAT_register (const struct sockaddr *addr,
+GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg,
+		     const struct sockaddr *addr,
 		     socklen_t addrlen,
 		     GNUNET_NAT_AddressCallback callback, 
 		     void *callback_cls);
diff --git a/src/nat/nat.c b/src/nat/nat.c
index ca6df0573..7e83134bd 100644
--- a/src/nat/nat.c
+++ b/src/nat/nat.c
@@ -366,6 +366,7 @@ nat_pulse (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * of the local host's addresses should the external port be mapped. The port
  * is taken from the corresponding sockaddr_in[6] field.
  *
+ * @param cfg configuration to use
  * @param addr the local address packets should be redirected to
  * @param addrlen actual lenght of the address
  * @param callback function to call everytime the public IP address changes
@@ -373,7 +374,8 @@ nat_pulse (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @return NULL on error, otherwise handle that can be used to unregister 
  */
 struct GNUNET_NAT_Handle *
-GNUNET_NAT_register (const struct sockaddr *addr,
+GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg,
+		     const struct sockaddr *addr,
                      socklen_t addrlen,
                      GNUNET_NAT_AddressCallback callback, void *callback_cls)
 {
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 4a5cffa23..b85c04402 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -641,7 +641,8 @@ add_to_address_list (struct Plugin *plugin,
     }
   if ( (plugin->behind_nat == GNUNET_YES) &&
        (plugin->enable_upnp == GNUNET_YES) )
-    lal->nat = GNUNET_NAT_register (sa, salen,
+    lal->nat = GNUNET_NAT_register (plugin->env->cfg,
+				    sa, salen,
 				    &nat_port_map_callback,
 				    lal);
 }
-- 
2.25.1