gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r9289 - in gnunet/src: fs include


From: gnunet
Subject: [GNUnet-SVN] r9289 - in gnunet/src: fs include
Date: Sun, 25 Oct 2009 13:36:38 -0600

Author: grothoff
Date: 2009-10-25 13:36:38 -0600 (Sun, 25 Oct 2009)
New Revision: 9289

Modified:
   gnunet/src/fs/fs_search.c
   gnunet/src/fs/gnunet-search.c
   gnunet/src/fs/test_fs_namespace.c
   gnunet/src/fs/test_fs_search.c
   gnunet/src/include/gnunet_fs_service.h
Log:
API fix

Modified: gnunet/src/fs/fs_search.c
===================================================================
--- gnunet/src/fs/fs_search.c   2009-10-25 19:33:17 UTC (rev 9288)
+++ gnunet/src/fs/fs_search.c   2009-10-25 19:36:38 UTC (rev 9289)
@@ -268,6 +268,7 @@
  * @param uri specifies the search parameters; can be
  *        a KSK URI or an SKS URI.
  * @param anonymity desired level of anonymity
+ * @param cctx client context
  * @param parent parent search (for namespace update searches)
  * @return context that can be used to control the search
  */
@@ -275,6 +276,7 @@
 search_start (struct GNUNET_FS_Handle *h,
              const struct GNUNET_FS_Uri *uri,
              uint32_t anonymity,
+             void *cctx,
              struct GNUNET_FS_SearchContext *parent);
 
 
@@ -336,6 +338,7 @@
   search_start (sc->h,
                &uu,
                sc->anonymity,
+               NULL,
                sc);
 }
 
@@ -733,6 +736,7 @@
  * @param uri specifies the search parameters; can be
  *        a KSK URI or an SKS URI.
  * @param anonymity desired level of anonymity
+ * @param cctx initial value for the client context
  * @param parent parent search (for namespace update searches)
  * @return context that can be used to control the search
  */
@@ -740,6 +744,7 @@
 search_start (struct GNUNET_FS_Handle *h,
              const struct GNUNET_FS_Uri *uri,
              uint32_t anonymity,
+             void *cctx,
              struct GNUNET_FS_SearchContext *parent)
 {
   struct GNUNET_FS_SearchContext *sc;
@@ -780,6 +785,7 @@
   sc->client = client;  
   sc->parent = parent;
   sc->master_result_map = GNUNET_CONTAINER_multihashmap_create (16);
+  sc->client_info = cctx;
 
   sc->requests = GNUNET_malloc (sizeof (struct SearchRequestEntry) *
                                sc->uri->data.ksk.keywordCount);
@@ -827,14 +833,16 @@
  * @param uri specifies the search parameters; can be
  *        a KSK URI or an SKS URI.
  * @param anonymity desired level of anonymity
+ * @param cctx initial value for the client context
  * @return context that can be used to control the search
  */
 struct GNUNET_FS_SearchContext *
 GNUNET_FS_search_start (struct GNUNET_FS_Handle *h,
                        const struct GNUNET_FS_Uri *uri,
-                       uint32_t anonymity)
+                       uint32_t anonymity,
+                       void *cctx)
 {
-  return search_start (h, uri, anonymity, NULL);
+  return search_start (h, uri, anonymity, cctx, NULL);
 }
 
 

Modified: gnunet/src/fs/gnunet-search.c
===================================================================
--- gnunet/src/fs/gnunet-search.c       2009-10-25 19:33:17 UTC (rev 9288)
+++ gnunet/src/fs/gnunet-search.c       2009-10-25 19:36:38 UTC (rev 9289)
@@ -179,7 +179,8 @@
     }
   sc = GNUNET_FS_search_start (ctx,
                               uri,
-                              anonymity);
+                              anonymity,
+                              NULL);
   GNUNET_FS_uri_destroy (uri);
   if (NULL == sc)
     {

Modified: gnunet/src/fs/test_fs_namespace.c
===================================================================
--- gnunet/src/fs/test_fs_namespace.c   2009-10-25 19:33:17 UTC (rev 9288)
+++ gnunet/src/fs/test_fs_namespace.c   2009-10-25 19:36:38 UTC (rev 9289)
@@ -108,7 +108,7 @@
 
   GNUNET_assert (NULL == emsg);
   fprintf (stderr, "Starting namespace search...\n");
-  search = GNUNET_FS_search_start (fs, uri, 1);
+  search = GNUNET_FS_search_start (fs, uri, 1, "ns-search");
 }
 
 

Modified: gnunet/src/fs/test_fs_search.c
===================================================================
--- gnunet/src/fs/test_fs_search.c      2009-10-25 19:33:17 UTC (rev 9288)
+++ gnunet/src/fs/test_fs_search.c      2009-10-25 19:36:38 UTC (rev 9289)
@@ -114,7 +114,8 @@
       start = GNUNET_TIME_absolute_get ();
       search = GNUNET_FS_search_start (fs,
                                       kuri,
-                                      1);
+                                      1,
+                                      "search");
       GNUNET_FS_uri_destroy (kuri);
       GNUNET_assert (search != NULL);
       break;
@@ -165,7 +166,7 @@
       break;
     case GNUNET_FS_STATUS_SEARCH_START:
       GNUNET_assert (search == NULL);
-      //  GNUNET_assert (0 == strcmp ("search", event->value.search.cctx));
+      GNUNET_assert (0 == strcmp ("search", event->value.search.cctx));
       GNUNET_assert (1 == event->value.search.anonymity);
       break;
     case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:

Modified: gnunet/src/include/gnunet_fs_service.h
===================================================================
--- gnunet/src/include/gnunet_fs_service.h      2009-10-25 19:33:17 UTC (rev 
9288)
+++ gnunet/src/include/gnunet_fs_service.h      2009-10-25 19:36:38 UTC (rev 
9289)
@@ -2153,13 +2153,14 @@
  * @param uri specifies the search parameters; can be
  *        a KSK URI or an SKS URI.
  * @param anonymity desired level of anonymity
+ * @param cctx initial value for the client context
  * @return context that can be used to control the search
  */
-// FIXME: add a "void *" context for the client to arguments!?
 struct GNUNET_FS_SearchContext *
 GNUNET_FS_search_start (struct GNUNET_FS_Handle *h,
                        const struct GNUNET_FS_Uri *uri,
-                       uint32_t anonymity);
+                       uint32_t anonymity,
+                       void *cctx);
 
 
 /**





reply via email to

[Prev in Thread] Current Thread [Next in Thread]