From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 11 Sep 2009 11:36:24 +0000 (+0000)
Subject: fixing compile errors
X-Git-Tag: initial-import-from-subversion-38251~23498
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7f0c6bd7bc74dc479e991cba667e08f66e6e2d42;p=oweals%2Fgnunet.git

fixing compile errors
---

diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index 2fad754c0..bf64f73f1 100644
--- 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 628b40d7c..bd3304566 100644
--- 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 19167342b..ee69c75da 100644
--- 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 cb102cba5..f0d0d2b4e 100644
--- 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 62cb05f5e..38d33cd0e 100644
--- 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 cef40b578..a080b6470 100644
--- 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 aeea157e1..46e66e11c 100644
--- 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 191ef14d2..e3b9136a5 100644
--- 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