3 files changed, 24 insertions, 10 deletions

diff --git a/src/include/gnunet_nat_lib.h b/src/include/gnunet_nat_lib.h
index 6c4362c90..5692dc294 100644
--- a/src/include/gnunet_nat_lib.h
+++ b/src/include/gnunet_nat_lib.h
@@ -220,7 +220,7 @@ GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg,
                      GNUNET_NAT_AddressCallback address_callback,
                      GNUNET_NAT_ReversalCallback reversal_callback,
                      void *callback_cls,
-                     struct GNUNET_NETWORK_Handle* sock );
+                     struct GNUNET_NETWORK_Handle* sock);
 
 
 /**
@@ -492,7 +492,8 @@ typedef void
  * @return GNUNET_NAT_STUN_Handle on success, NULL on error.
  */
 struct GNUNET_NAT_STUN_Handle *
-GNUNET_NAT_stun_make_request(char * server, int port,
+GNUNET_NAT_stun_make_request(char * server,
+                             int port,
                              struct GNUNET_NETWORK_Handle * sock, GNUNET_NAT_stun_RequestCallback cb,
                              void *cb_cls);
 
@@ -511,7 +512,9 @@ GNUNET_NAT_stun_make_request(char * server, int port,
  * @return, 0 on IGNORE, -1 if the packet is invalid ( not a stun packet)
  */
 int
-GNUNET_NAT_stun_handle_packet(const uint8_t *data, size_t len,struct sockaddr_in *arg);
+GNUNET_NAT_stun_handle_packet(const void *data,
+                              size_t len,
+                              struct sockaddr_in *arg);
 
 /**
  * CHECK if is a valid STUN packet sending to GNUNET_NAT_stun_handle_packet
@@ -524,7 +527,9 @@ GNUNET_NAT_stun_handle_packet(const uint8_t *data, size_t len,struct sockaddr_in
  * @return, 0 on IGNORE, -1 if the packet is invalid ( not a stun packet)
  */
 int
-GNUNET_NAT_try_decode_stun_packet(void *cls, const uint8_t *data, size_t len);
+GNUNET_NAT_try_decode_stun_packet(void *cls,
+                                  const void *data,
+                                  size_t len);
 
 
 
diff --git a/src/nat/nat.c b/src/nat/nat.c
index 270365425..42fe843e3 100644
--- a/src/nat/nat.c
+++ b/src/nat/nat.c
@@ -1115,9 +1115,16 @@ static void stun_request_callback(void *cls,
 
   struct GNUNET_NAT_Handle *h = cls;
 
+  if(NULL == cls)
+    return;
+
   h->waiting_stun = GNUNET_NO;
-  LOG (GNUNET_ERROR_TYPE_WARNING,
+
+  if(result != GNUNET_OK)
+  {
+    LOG (GNUNET_ERROR_TYPE_WARNING,
        "Error processing a STUN request");
+  }
 
 };
 
@@ -1131,7 +1138,7 @@ static void stun_request_callback(void *cls,
  * @return GNUNET_NO if it can't decode, GNUNET_YES if is a packet
  */
 int
-GNUNET_NAT_try_decode_stun_packet(void *cls, const uint8_t *data, size_t len)
+GNUNET_NAT_try_decode_stun_packet(void *cls, const void *data, size_t len)
 {
   struct GNUNET_NAT_Handle *h = cls;
   struct sockaddr_in answer;
diff --git a/src/nat/nat_stun.c b/src/nat/nat_stun.c
index 5e502c29e..5fff40656 100644
--- a/src/nat/nat_stun.c
+++ b/src/nat/nat_stun.c
@@ -334,7 +334,7 @@ stun_get_mapped(struct StunState *st, struct stun_attr *attr,struct sockaddr_in
  * @return, GNUNET_OK on OK, GNUNET_NO if the packet is invalid ( not a stun packet)
  */
 int
-GNUNET_NAT_stun_handle_packet(const uint8_t *data, size_t len,struct sockaddr_in *arg)
+GNUNET_NAT_stun_handle_packet(const void *data, size_t len, struct sockaddr_in *arg)
 {
     struct stun_header *hdr = (struct stun_header *)data;
     struct stun_attr *attr;
@@ -463,8 +463,9 @@ stun_dns_callback (void *cls,
 
         if( GNUNET_NO == request->dns_success){
             LOG (GNUNET_ERROR_TYPE_INFO, "Empty request\n");
-            clean(request);
             request->cb(request->cb_cls, GNUNET_NAT_ERROR_INTERNAL_NETWORK_ERROR);
+            clean(request);
+
         }
         return;
     }
@@ -474,8 +475,9 @@ stun_dns_callback (void *cls,
 
         if( GNUNET_NO == request->dns_success){
             LOG (GNUNET_ERROR_TYPE_INFO, "Error resolving host %s\n", request->stun_server);
-            clean(request);
             request->cb(request->cb_cls, GNUNET_NAT_ERROR_INTERNAL_NETWORK_ERROR);
+            clean(request);
+
         }
 
         return;
@@ -503,8 +505,8 @@ stun_dns_callback (void *cls,
                                             (const struct sockaddr *) &server, sizeof (server)))
     {
         GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "Fail to sendto");
-        clean(request);
         request->cb(request->cb_cls, GNUNET_NAT_ERROR_INTERNAL_NETWORK_ERROR);
+        clean(request);
         return;
     }