[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9133 - GNUnet/src/applications/fs/gap
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9133 - GNUnet/src/applications/fs/gap |
Date: |
Wed, 7 Oct 2009 17:03:39 -0600 |
Author: nevans
Date: 2009-10-07 17:03:39 -0600 (Wed, 07 Oct 2009)
New Revision: 9133
Modified:
GNUnet/src/applications/fs/gap/dv_fs.c
GNUnet/src/applications/fs/gap/dv_querymanager.c
GNUnet/src/applications/fs/gap/fs_dv_dht.c
Log:
incremental changes to get this stuff working, still work in progress
Modified: GNUnet/src/applications/fs/gap/dv_fs.c
===================================================================
--- GNUnet/src/applications/fs/gap/dv_fs.c 2009-10-07 23:00:54 UTC (rev
9132)
+++ GNUnet/src/applications/fs/gap/dv_fs.c 2009-10-07 23:03:39 UTC (rev
9133)
@@ -915,7 +915,7 @@
0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
capi->ectx,
"ABOUT",
- "fs",
+ "dv_fs",
gettext_noop
("enables
(anonymous) file-sharing")));
return GNUNET_OK;
@@ -925,7 +925,7 @@
done_module_dv_fs ()
{
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "fs shutdown\n");
+ "dv_fs shutdown\n");
GNUNET_GE_ASSERT (ectx,
GNUNET_SYSERR !=
Modified: GNUnet/src/applications/fs/gap/dv_querymanager.c
===================================================================
--- GNUnet/src/applications/fs/gap/dv_querymanager.c 2009-10-07 23:00:54 UTC
(rev 9132)
+++ GNUnet/src/applications/fs/gap/dv_querymanager.c 2009-10-07 23:03:39 UTC
(rev 9133)
@@ -212,8 +212,8 @@
request->dht_back_off = GNUNET_GAP_MAX_DHT_DELAY;
}
GNUNET_mutex_unlock (GNUNET_FS_lock);
- if (anonymityLevel == 0)
- GNUNET_FS_DV_DHT_execute_query (type, query);
+ if ((anonymityLevel == 0) && (type == 0)) /* Cannot search the dht with type
0 */
+ GNUNET_FS_DV_DHT_execute_query (GNUNET_ECRS_BLOCKTYPE_KEYWORD, query);
}
/**
Modified: GNUnet/src/applications/fs/gap/fs_dv_dht.c
===================================================================
--- GNUnet/src/applications/fs/gap/fs_dv_dht.c 2009-10-07 23:00:54 UTC (rev
9132)
+++ GNUnet/src/applications/fs/gap/fs_dv_dht.c 2009-10-07 23:03:39 UTC (rev
9133)
@@ -173,11 +173,13 @@
if (dv_dht == NULL)
return;
+
now = GNUNET_get_time ();
record = GNUNET_malloc (sizeof (struct ActiveRequestRecords));
record->end_time = now + GNUNET_GAP_MAX_DHT_DELAY;
record->type = type;
- record->handle = dv_dht->get_start (type, query, &response_callback, record);
+ /*record->type = GNUNET_ECRS_BLOCKTYPE_KEYWORD;*/ /* Anonymous query should
only get this type, right? */
+ record->handle = dv_dht->get_start (record->type, query, &response_callback,
record);
if (record->handle == NULL)
{
GNUNET_free (record);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9133 - GNUnet/src/applications/fs/gap,
gnunet <=