fix 1678

[oweals/gnunet.git] / src / nat / upnp-discover.c

diff --git a/src/nat/upnp-discover.c b/src/nat/upnp-discover.c
index 5e955db450ecb021b2c13b8a797dbe7ea2cdc6a1..2e609d79034038d533274161e547b987ee3a52e3 100644 (file)
--- a/src/nat/upnp-discover.c
+++ b/src/nat/upnp-discover.c
@@ -22,7 +22,7 @@
  * Code in this file is originally based on the miniupnp library.
  * Copyright (c) 2005-2009, Thomas BERNARD. All rights reserved.
  *
- * Original licence:
+ * Original license:
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -70,7 +70,7 @@
 #define DESCRIPTION_BUFSIZE 2048
 #define CURL_EASY_SETOPT(c, a, b) do { ret = curl_easy_setopt(c, a, b); if (ret != CURLE_OK) GNUNET_log(GNUNET_ERROR_TYPE_WARNING, _("%s failed at %s:%d: `%s'\n"), "curl_easy_setopt", __FILE__, __LINE__, curl_easy_strerror(ret)); } while (0)
 #define PRINT_SOCKET_ERROR(a) GNUNET_log_from(GNUNET_ERROR_TYPE_WARNING, "UPnP", _("%s failed at %s:%d: '%s'\n"), a, __FILE__, __LINE__, strerror (errno));
-
+#define PRINT_SOCKET_ERROR_STR(a, b) GNUNET_log_from(GNUNET_ERROR_TYPE_WARNING, "UPnP", _("%s failed at %s:%d: '%s' on `%s'\n"), a, __FILE__, __LINE__, strerror (errno), b);
 
 /**
  * Callback function called when download is finished.
@@ -182,7 +182,7 @@ callback_download (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
 
 static void
-task_download (struct download_cls *cls,
+task_download (void *cls,
                const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 /**
@@ -243,7 +243,7 @@ download_prepare (struct download_cls *cls)
                                rtime,
                                grs,
                                gws,
-                               (GNUNET_SCHEDULER_Task) & task_download, cls);
+                               & task_download, cls);
   GNUNET_NETWORK_fdset_destroy (gws);
   GNUNET_NETWORK_fdset_destroy (grs);
 }
@@ -255,10 +255,10 @@ download_prepare (struct download_cls *cls)
  * @param tc task context
  */
 static void
-task_download (struct download_cls *cls,
+task_download (void *cls,
                const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-
+  struct download_cls *dc = cls;
   int running;
   struct CURLMsg *msg;
   CURLMcode mret;
@@ -268,33 +268,33 @@ task_download (struct download_cls *cls,
 #if DEBUG_UPNP
       GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "UPnP",
                        "Shutdown requested while trying to download device description from `%s'\n",
-                       cls->url);
+                       dc->url);
 #endif
-      cls->caller_cb (NULL, cls->caller_cls);
-      download_clean_up (cls);
+      dc->caller_cb (NULL, dc->caller_cls);
+      download_clean_up (dc);
       return;
     }
-  if (GNUNET_TIME_absolute_get_remaining (cls->end_time).rel_value == 0)
+  if (GNUNET_TIME_absolute_get_remaining (dc->end_time).rel_value == 0)
     {
       GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "UPnP",
                        _
                        ("Timeout trying to download UPnP device description from '%s'\n"),
-                       cls->url);
-      cls->caller_cb (NULL, cls->caller_cls);
-      download_clean_up (cls);
+                       dc->url);
+      dc->caller_cb (NULL, dc->caller_cls);
+      download_clean_up (dc);
       return;
     }
 
   do
     {
       running = 0;
-      mret = curl_multi_perform (cls->multi, &running);
+      mret = curl_multi_perform (dc->multi, &running);
 
       if (running == 0)
         {
           do
             {
-              msg = curl_multi_info_read (cls->multi, &running);
+              msg = curl_multi_info_read (dc->multi, &running);
               GNUNET_break (msg != NULL);
               if (msg == NULL)
                 break;
@@ -305,23 +305,23 @@ task_download (struct download_cls *cls,
                   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                               _("%s failed for `%s' at %s:%d: `%s'\n"),
                               "curl_multi_perform",
-                              cls->url,
+                              dc->url,
                               __FILE__,
                               __LINE__,
                               curl_easy_strerror (msg->data.result));
-                  cls->caller_cb (NULL, cls->caller_cls);
+                  dc->caller_cb (NULL, dc->caller_cls);
                 }
               else
                 {
                   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "UPnP",
                                    _
                                    ("Download of device description `%s' completed.\n"),
-                                   cls->url);
-                  cls->caller_cb (GNUNET_strdup (cls->download_buffer),
-                                  cls->caller_cls);
+                                   dc->url);
+                  dc->caller_cb (GNUNET_strdup (dc->download_buffer),
+                                  dc->caller_cls);
                 }
 
-              download_clean_up (cls);
+              download_clean_up (dc);
               return;
             }
           while ((running > 0));
@@ -335,11 +335,11 @@ task_download (struct download_cls *cls,
                        _("%s failed at %s:%d: `%s'\n"),
                        "curl_multi_perform", __FILE__, __LINE__,
                        curl_multi_strerror (mret));
-      download_clean_up (cls);
-      cls->caller_cb (NULL, cls->caller_cls);
+      download_clean_up (dc);
+      dc->caller_cb (NULL, dc->caller_cls);
     }
 
-  download_prepare (cls);
+  download_prepare (dc);
 }
 
 
@@ -348,7 +348,7 @@ task_download (struct download_cls *cls,
  *
  * @param url URL of the file to download
  * @param caller_cb user function to call when done
- * @caller_cls closure to pass to caller_cb
+ * @param caller_cls closure to pass to caller_cb
  */
 void
 download_device_description (char *url, download_cb caller_cb,
@@ -777,7 +777,7 @@ get_valid_igd_connected_cb (char *response, size_t received, void *data)
  * Then, schedule UPnP command to check whether device is connected.
  *
  * @param desc UPnP IGD description (in XML)
- * @data closure from UPNP_discover()
+ * @param data closure from UPNP_discover()
  */
 static void
 get_valid_igd_receive (char *desc, void *data)
@@ -910,11 +910,7 @@ discover_send (void *data, const struct GNUNET_SCHEDULER_TaskContext *tc);
  * and get their descriptions.
  *
  * @param data closure from UPNP_discover()
- * @buf content of the reply
- * @available number of bytes stored in buf
- * @addr address of the sender
- * @addrlen size of addr
- * @param errCode value of errno
+ * @param tc task context
  */
 static void
 discover_recv (void *data, const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -1201,9 +1197,14 @@ UPNP_discover_ (const char *multicastif,
         {
           if (multicastif)
             {
+#ifndef MINGW
               if_index = if_nametoindex (multicastif);
+#else
+              // FIXME
+              if_index = 0;
+#endif
               if (!if_index)
-                PRINT_SOCKET_ERROR ("if_nametoindex");
+                PRINT_SOCKET_ERROR_STR ("if_nametoindex", multicastif);
 
               if (GNUNET_NETWORK_socket_setsockopt
                   (sudp, IPPROTO_IPV6, IPV6_MULTICAST_IF, &if_index,