fixing compile errors

diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index 2fad754c0535f1cad213ed9807c1cb14ae0a132a..bf64f73f1e3f2f2c818dc29791c49e56c36218fd 100644 (file)
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -182,10 +182,32 @@ struct LocalGetContext
    * Client that initiated the search.
    */
   struct GNUNET_SERVER_Client *client;
+
+
   
 };
 
 
+static void 
+transmit_local_get (void *cls,
+                   int ok)
+{
+  struct LocalGetContext *lgc = cls;
+  // FIXME: search locally
+
+  GNUNET_assert (GNUNET_OK == ok);
+  GNUNET_SERVER_receive_done (lgc->client,
+                             GNUNET_OK);
+
+  // once we're done processing the DS reply, do:
+  next_ds_request ();
+  // FIXME: if not found, initiate P2P search  
+
+  // FIXME: once done with "client" handle:
+  GNUNET_SERVER_client_drop (lgc->client); 
+}
+
+
 /**
  * Handle START_SEARCH-message.
  *
@@ -205,30 +227,13 @@ handle_start_search (void *cls,
   GNUNET_SERVER_client_keep (client);
   lgc = GNUNET_malloc (sizeof (struct LocalGetContext));
   lgc->client = client;
-  lgc->x = y;
-  queue_ds_request (&transmit_local_get,
+  // lgc->x = y;
+  queue_ds_request (GNUNET_TIME_UNIT_FOREVER_REL,
+                   &transmit_local_get,
                    lgc);
 }
 
 
-static void 
-transmit_local_get (void *cls,
-                   int ok)
-{
-  struct LocalGetContext *lgc = cls;
-  // FIXME: search locally
-
-  GNUNET_assert (GNUNET_OK == ok);
-  GNUNET_SERVER_receive_done (lgc->client,
-                             GNUNET_OK);
-  
-  // FIXME: if not found, initiate P2P search  
-
-  // FIXME: once done with "client" handle:
-  GNUNET_SERVER_client_drop (lgc->client); 
-}
-
-
 /**
  * List of handlers for the messages understood by this
  * service.

diff --git a/src/upnp/test_upnp.c b/src/upnp/test_upnp.c
index 628b40d7c9d39df413de1c060b4fded73bd517b1..bd3304566ee066eb84d4f7a31f7c35cb24871809 100644 (file)
--- a/src/upnp/test_upnp.c
+++ b/src/upnp/test_upnp.c
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file src/transports/upnp/upnptest.c
+ * @file upnp/test_upnp.c
  * @brief Testcase for UPnP
  * @author Christian Grothoff
  */

diff --git a/src/upnp/upnp_init.c b/src/upnp/upnp_init.c
index 19167342b1b80f161ff60c545c1baf140a5bd394..ee69c75da184e79f4fca19cc42ce46de875ae8ba 100644 (file)
--- a/src/upnp/upnp_init.c
+++ b/src/upnp/upnp_init.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file transport/upnp_init.c
+ * @file upnp/upnp_init.c
  * @brief API for UPnP access
  * @author Christian Grothoff
  */

diff --git a/src/upnp/upnp_ip.c b/src/upnp/upnp_ip.c
index cb102cba5d17f87c2a4b1f498eba205fadbf448a..f0d0d2b4e0473c8a4ff111919ecd13be3cadf9e7 100644 (file)
--- a/src/upnp/upnp_ip.c
+++ b/src/upnp/upnp_ip.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file transport/upnp_ip.c
+ * @file upnp/upnp_ip.c
  * @brief code to determine the IP of the local machine
  *
  * @author Christian Grothoff

diff --git a/src/upnp/upnp_ip.h b/src/upnp/upnp_ip.h
index 62cb05f5eb34ba1d8f012582c7baa61bdf546b99..38d33cd0e3c220ba3fd0041f5fd63566161e9805 100644 (file)
--- a/src/upnp/upnp_ip.h
+++ b/src/upnp/upnp_ip.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file transport/upnp_ip.h
+ * @file upnp/upnp_ip.h
  * @brief
  *
  * @author Christian Grothoff

diff --git a/src/upnp/upnp_util.c b/src/upnp/upnp_util.c
index cef40b57878e9df8a1623fa1b9255424cea8c4d4..a080b647072539b9de7d24823cb991f7b155309e 100644 (file)
--- a/src/upnp/upnp_util.c
+++ b/src/upnp/upnp_util.c
@@ -1,5 +1,5 @@
 /*
- * @file util.h Utility Functions
+ * @file upnp_util.cUtility Functions
  * @ingroup core
  *
  * Gaim is the legal property of its developers, whose names are too numerous

diff --git a/src/upnp/upnp_xmlnode.c b/src/upnp/upnp_xmlnode.c
index aeea157e13b7a8f5de638cd1ae74ac5ac10b321d..46e66e11c424d112e27680c5a99ef645296974af 100644 (file)
--- a/src/upnp/upnp_xmlnode.c
+++ b/src/upnp/upnp_xmlnode.c
@@ -1,5 +1,5 @@
 /**
- * @file transport/upnp_xmlnode.c XML DOM functions
+ * @file upnp/upnp_xmlnode.c XML DOM functions
  *
  * gaim
  *

diff --git a/src/upnp/upnp_xmlnode.h b/src/upnp/upnp_xmlnode.h
index 191ef14d2c9f9750f5b264f9431fb2b282491966..e3b9136a5ebda47763f331dd97e67161981ec5dc 100644 (file)
--- a/src/upnp/upnp_xmlnode.h
+++ b/src/upnp/upnp_xmlnode.h
@@ -1,5 +1,5 @@
 /**
- * @file transport/upnp_xmlnode.h XML DOM functions
+ * @file upnp/upnp_xmlnode.h XML DOM functions
  * @ingroup core
  *
  * gaim