diff options
Diffstat (limited to 'src/fs/fs.h')
-rw-r--r-- | src/fs/fs.h | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/src/fs/fs.h b/src/fs/fs.h index f4f21faea..d7dcd987d 100644 --- a/src/fs/fs.h +++ b/src/fs/fs.h | |||
@@ -646,12 +646,16 @@ struct GNUNET_FS_SearchResult | |||
646 | /** | 646 | /** |
647 | * ID of an associated download based on this search result (or | 647 | * ID of an associated download based on this search result (or |
648 | * NULL for none). | 648 | * NULL for none). |
649 | * | ||
650 | * FIXME: not yet serialized. | ||
651 | */ | 649 | */ |
652 | struct GNUNET_FS_DownloadContext *download; | 650 | struct GNUNET_FS_DownloadContext *download; |
653 | 651 | ||
654 | /** | 652 | /** |
653 | * If this search result triggered an update search, this field | ||
654 | * links to the update search. | ||
655 | */ | ||
656 | struct GNUNET_FS_SearchContext *update_search; | ||
657 | |||
658 | /** | ||
655 | * Name under which this search result is stored on disk. | 659 | * Name under which this search result is stored on disk. |
656 | */ | 660 | */ |
657 | char *serialization; | 661 | char *serialization; |
@@ -1457,34 +1461,10 @@ struct GNUNET_FS_SearchContext | |||
1457 | struct GNUNET_FS_Uri *uri; | 1461 | struct GNUNET_FS_Uri *uri; |
1458 | 1462 | ||
1459 | /** | 1463 | /** |
1460 | * For update-searches, link to the base-SKS search that triggered | 1464 | * For update-searches, link to the search result that triggered |
1461 | * the update search; otherwise NULL. | ||
1462 | */ | ||
1463 | struct GNUNET_FS_SearchContext *parent; | ||
1464 | |||
1465 | /** | ||
1466 | * For update-searches, link to the first child search that | ||
1467 | * triggered the update search; otherwise NULL. | ||
1468 | */ | ||
1469 | struct GNUNET_FS_SearchContext *child_head; | ||
1470 | |||
1471 | /** | ||
1472 | * For update-searches, link to the last child search that triggered | ||
1473 | * the update search; otherwise NULL. | 1465 | * the update search; otherwise NULL. |
1474 | */ | 1466 | */ |
1475 | struct GNUNET_FS_SearchContext *child_tail; | 1467 | struct GNUNET_FS_SearchResult *psearch_result; |
1476 | |||
1477 | /** | ||
1478 | * For update-searches, link to the next child belonging to the same | ||
1479 | * parent. | ||
1480 | */ | ||
1481 | struct GNUNET_FS_SearchContext *next; | ||
1482 | |||
1483 | /** | ||
1484 | * For update-searches, link to the previous child belonging to the | ||
1485 | * same parent. | ||
1486 | */ | ||
1487 | struct GNUNET_FS_SearchContext *prev; | ||
1488 | 1468 | ||
1489 | /** | 1469 | /** |
1490 | * Connection to the FS service. | 1470 | * Connection to the FS service. |
@@ -1618,8 +1598,6 @@ struct GNUNET_FS_DownloadContext | |||
1618 | /** | 1598 | /** |
1619 | * Associated search (used when downloading files | 1599 | * Associated search (used when downloading files |
1620 | * based on search results), or NULL for none. | 1600 | * based on search results), or NULL for none. |
1621 | * | ||
1622 | * FIXME: not yet serialized | ||
1623 | */ | 1601 | */ |
1624 | struct GNUNET_FS_SearchResult *search; | 1602 | struct GNUNET_FS_SearchResult *search; |
1625 | 1603 | ||