Merge remote-tracking branch 'origin/master' into identity_oidc

[oweals/gnunet.git] / src / nat / nat_api_stun.c

diff --git a/src/nat/nat_api_stun.c b/src/nat/nat_api_stun.c
index 8f5a5f8f65dfe0feb0cc4c0f6d4bd964f8fb99b7..b1309fb538714e66f9fab0c9330febc54cd7d897 100644 (file)
--- a/src/nat/nat_api_stun.c
+++ b/src/nat/nat_api_stun.c
@@ -38,7 +38,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
-#include "gnunet_nat_lib.h"
+#include "gnunet_nat_service.h"
 
 
 #include "nat_stun.h"
@@ -74,7 +74,7 @@ struct GNUNET_NAT_STUN_Handle
   /**
    * Function to call when a error occours
    */
-  GNUNET_NAT_STUN_ErrorCallback cb;
+  GNUNET_NAT_TestCallback cb;
 
   /**
    * Closure for @e cb.
@@ -199,9 +199,7 @@ stun_dns_callback (void *cls,
 
 /**
  * Make Generic STUN request. Sends a generic stun request to the
- * server specified using the specified socket, possibly waiting for
- * a reply and filling the 'reply' field with the externally visible
- * address.
+ * server specified using the specified socket.
  *
  * @param server the address of the stun server
  * @param port port of the stun server, in host byte order
@@ -214,7 +212,7 @@ struct GNUNET_NAT_STUN_Handle *
 GNUNET_NAT_stun_make_request (const char *server,
                               uint16_t port,
                               struct GNUNET_NETWORK_Handle *sock,
-                              GNUNET_NAT_STUN_ErrorCallback cb,
+                              GNUNET_NAT_TestCallback cb,
                               void *cb_cls)
 {
   struct GNUNET_NAT_STUN_Handle *rh;