improve NAT API: allow client to store associated data with address

2 files changed, 14 insertions, 0 deletions

diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c
index 31b6a7268..275553203 100644
--- a/src/nat/gnunet-nat.c
+++ b/src/nat/gnunet-nat.c
@@ -110,6 +110,8 @@ test_finished ()
  * a function to call whenever our set of 'valid' addresses changes.
  *
  * @param cls closure, NULL
+ * @param app_ctx[in,out] location where the app can store stuff
+ *                  on add and retrieve it on remove
  * @param add_remove #GNUNET_YES to add a new public IP address,
  *                   #GNUNET_NO to remove a previous (now invalid) one
  * @param ac address class the address belongs to
@@ -118,11 +120,15 @@ test_finished ()
  */
 static void
 address_cb (void *cls,
+            void **app_ctx,
             int add_remove,
             enum GNUNET_NAT_AddressClass ac,
             const struct sockaddr *addr,
             socklen_t addrlen)
 {
+  (void) cls;
+  (void) app_ctx;
+  
   fprintf (stdout,
            "%s %s (%d)\n",
            add_remove ? "+" : "-",
diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c
index 6ae689b63..04fa366aa 100644
--- a/src/nat/nat_api.c
+++ b/src/nat/nat_api.c
@@ -49,6 +49,12 @@ struct AddrEntry
   struct AddrEntry *prev;
 
   /**
+   * Place where the application can store data (on add,
+   * and retrieve on remove).
+   */
+  void *app_ctx;
+  
+  /**
    * Address class of the address.
    */
   enum GNUNET_NAT_AddressClass ac;
@@ -148,6 +154,7 @@ reconnect (struct GNUNET_NAT_Handle *nh)
                                  nh->ae_tail,
                                  ae);
     nh->address_callback (nh->callback_cls,
+                          &ae->app_ctx,
                           GNUNET_NO,
                           ae->ac,
                           (const struct sockaddr *) &ae[1],
@@ -299,6 +306,7 @@ handle_address_change_notification (void *cls,
     GNUNET_free (ae);
   }
   nh->address_callback (nh->callback_cls,
+                        &ae->app_ctx,
                         ntohl (acn->add_remove),
                         ac,
                         sa,