[GNUnet-SVN] r8980 - in gnunet/src: fs upnp

[gnunet]

Author: grothoff
Date: 2009-09-11 05:36:24 -0600 (Fri, 11 Sep 2009)
New Revision: 8980

Modified:
   gnunet/src/fs/gnunet-service-fs.c
   gnunet/src/upnp/test_upnp.c
   gnunet/src/upnp/upnp_init.c
   gnunet/src/upnp/upnp_ip.c
   gnunet/src/upnp/upnp_ip.h
   gnunet/src/upnp/upnp_util.c
   gnunet/src/upnp/upnp_xmlnode.c
   gnunet/src/upnp/upnp_xmlnode.h
Log:
fixing compile errors

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2009-09-11 11:26:42 UTC (rev 8979)
+++ gnunet/src/fs/gnunet-service-fs.c   2009-09-11 11:36:24 UTC (rev 8980)
@@ -182,10 +182,32 @@
    * 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 @@
   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.

Modified: gnunet/src/upnp/test_upnp.c
===================================================================
--- gnunet/src/upnp/test_upnp.c 2009-09-11 11:26:42 UTC (rev 8979)
+++ gnunet/src/upnp/test_upnp.c 2009-09-11 11:36:24 UTC (rev 8980)
@@ -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
  */

Modified: gnunet/src/upnp/upnp_init.c
===================================================================
--- gnunet/src/upnp/upnp_init.c 2009-09-11 11:26:42 UTC (rev 8979)
+++ gnunet/src/upnp/upnp_init.c 2009-09-11 11:36:24 UTC (rev 8980)
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file transport/upnp_init.c
+ * @file upnp/upnp_init.c
  * @brief API for UPnP access
  * @author Christian Grothoff
  */

Modified: gnunet/src/upnp/upnp_ip.c
===================================================================
--- gnunet/src/upnp/upnp_ip.c   2009-09-11 11:26:42 UTC (rev 8979)
+++ gnunet/src/upnp/upnp_ip.c   2009-09-11 11:36:24 UTC (rev 8980)
@@ -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

Modified: gnunet/src/upnp/upnp_ip.h
===================================================================
--- gnunet/src/upnp/upnp_ip.h   2009-09-11 11:26:42 UTC (rev 8979)
+++ gnunet/src/upnp/upnp_ip.h   2009-09-11 11:36:24 UTC (rev 8980)
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file transport/upnp_ip.h
+ * @file upnp/upnp_ip.h
  * @brief
  *
  * @author Christian Grothoff

Modified: gnunet/src/upnp/upnp_util.c
===================================================================
--- gnunet/src/upnp/upnp_util.c 2009-09-11 11:26:42 UTC (rev 8979)
+++ gnunet/src/upnp/upnp_util.c 2009-09-11 11:36:24 UTC (rev 8980)
@@ -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

Modified: gnunet/src/upnp/upnp_xmlnode.c
===================================================================
--- gnunet/src/upnp/upnp_xmlnode.c      2009-09-11 11:26:42 UTC (rev 8979)
+++ gnunet/src/upnp/upnp_xmlnode.c      2009-09-11 11:36:24 UTC (rev 8980)
@@ -1,5 +1,5 @@
 /**
- * @file transport/upnp_xmlnode.c XML DOM functions
+ * @file upnp/upnp_xmlnode.c XML DOM functions
  *
  * gaim
  *

Modified: gnunet/src/upnp/upnp_xmlnode.h
===================================================================
--- gnunet/src/upnp/upnp_xmlnode.h      2009-09-11 11:26:42 UTC (rev 8979)
+++ gnunet/src/upnp/upnp_xmlnode.h      2009-09-11 11:36:24 UTC (rev 8980)
@@ -1,5 +1,5 @@
 /**
- * @file transport/upnp_xmlnode.h XML DOM functions
+ * @file upnp/upnp_xmlnode.h XML DOM functions
  * @ingroup core
  *
  * gaim