diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-06-29 17:20:17 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-06-29 17:20:17 +0000 |
commit | 2a313fb65fe21e5ac6a1ef268fdf43c2ba46a330 (patch) | |
tree | 3714f986ecad9659448cf417d2795f2b19ddcdd4 /src/fs/fs_search.c | |
parent | db62b73f216cbf6c955e6f1b9eceffa7beae7339 (diff) | |
download | gnunet-2a313fb65fe21e5ac6a1ef268fdf43c2ba46a330.tar.gz gnunet-2a313fb65fe21e5ac6a1ef268fdf43c2ba46a330.zip |
convert fs_list_indexed to MQ API
Diffstat (limited to 'src/fs/fs_search.c')
-rw-r--r-- | src/fs/fs_search.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index eaabac746..f3221ac76 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c | |||
@@ -651,9 +651,12 @@ process_ksk_result (struct GNUNET_FS_SearchContext *sc, | |||
651 | * @return context that can be used to control the search | 651 | * @return context that can be used to control the search |
652 | */ | 652 | */ |
653 | static struct GNUNET_FS_SearchContext * | 653 | static struct GNUNET_FS_SearchContext * |
654 | search_start (struct GNUNET_FS_Handle *h, const struct GNUNET_FS_Uri *uri, | 654 | search_start (struct GNUNET_FS_Handle *h, |
655 | uint32_t anonymity, enum GNUNET_FS_SearchOptions options, | 655 | const struct GNUNET_FS_Uri *uri, |
656 | void *cctx, struct GNUNET_FS_SearchResult *psearch); | 656 | uint32_t anonymity, |
657 | enum GNUNET_FS_SearchOptions options, | ||
658 | void *cctx, | ||
659 | struct GNUNET_FS_SearchResult *psearch); | ||
657 | 660 | ||
658 | 661 | ||
659 | /** | 662 | /** |
@@ -957,7 +960,8 @@ try_reconnect (struct GNUNET_FS_SearchContext *sc); | |||
957 | * @param msg message received, NULL on timeout or fatal error | 960 | * @param msg message received, NULL on timeout or fatal error |
958 | */ | 961 | */ |
959 | static void | 962 | static void |
960 | receive_results (void *cls, const struct GNUNET_MessageHeader *msg) | 963 | receive_results (void *cls, |
964 | const struct GNUNET_MessageHeader *msg) | ||
961 | { | 965 | { |
962 | struct GNUNET_FS_SearchContext *sc = cls; | 966 | struct GNUNET_FS_SearchContext *sc = cls; |
963 | const struct ClientPutMessage *cm; | 967 | const struct ClientPutMessage *cm; |
@@ -971,13 +975,16 @@ receive_results (void *cls, const struct GNUNET_MessageHeader *msg) | |||
971 | } | 975 | } |
972 | msize = ntohs (msg->size); | 976 | msize = ntohs (msg->size); |
973 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 977 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
974 | "Receiving %u bytes of result from fs service\n", msize); | 978 | "Receiving %u bytes of result from fs service\n", |
979 | msize); | ||
975 | cm = (const struct ClientPutMessage *) msg; | 980 | cm = (const struct ClientPutMessage *) msg; |
976 | process_result (sc, ntohl (cm->type), | 981 | process_result (sc, ntohl (cm->type), |
977 | GNUNET_TIME_absolute_ntoh (cm->expiration), &cm[1], | 982 | GNUNET_TIME_absolute_ntoh (cm->expiration), &cm[1], |
978 | msize - sizeof (struct ClientPutMessage)); | 983 | msize - sizeof (struct ClientPutMessage)); |
979 | /* continue receiving */ | 984 | /* continue receiving */ |
980 | GNUNET_CLIENT_receive (sc->client, &receive_results, sc, | 985 | GNUNET_CLIENT_receive (sc->client, |
986 | &receive_results, | ||
987 | sc, | ||
981 | GNUNET_TIME_UNIT_FOREVER_REL); | 988 | GNUNET_TIME_UNIT_FOREVER_REL); |
982 | } | 989 | } |
983 | 990 | ||
@@ -993,7 +1000,7 @@ schedule_transmit_search_request (struct GNUNET_FS_SearchContext *sc); | |||
993 | 1000 | ||
994 | 1001 | ||
995 | /** | 1002 | /** |
996 | * Closure for 'build_result_set'. | 1003 | * Closure for #build_result_set(). |
997 | */ | 1004 | */ |
998 | struct MessageBuilderContext | 1005 | struct MessageBuilderContext |
999 | { | 1006 | { |
@@ -1094,7 +1101,9 @@ find_result_set (void *cls, | |||
1094 | * @return number of bytes written to @a buf | 1101 | * @return number of bytes written to @a buf |
1095 | */ | 1102 | */ |
1096 | static size_t | 1103 | static size_t |
1097 | transmit_search_request (void *cls, size_t size, void *buf) | 1104 | transmit_search_request (void *cls, |
1105 | size_t size, | ||
1106 | void *buf) | ||
1098 | { | 1107 | { |
1099 | struct GNUNET_FS_SearchContext *sc = cls; | 1108 | struct GNUNET_FS_SearchContext *sc = cls; |
1100 | struct MessageBuilderContext mbc; | 1109 | struct MessageBuilderContext mbc; |