diff options
-rw-r--r-- | src/fs/fs_publish_ksk.c | 3 | ||||
-rw-r--r-- | src/fs/fs_publish_ublock.c | 5 | ||||
-rw-r--r-- | src/fs/fs_search.c | 13 | ||||
-rw-r--r-- | src/fs/plugin_block_fs.c | 2 |
4 files changed, 13 insertions, 10 deletions
diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c index 7cbc880a2..f844217e8 100644 --- a/src/fs/fs_publish_ksk.c +++ b/src/fs/fs_publish_ksk.c | |||
@@ -168,7 +168,8 @@ publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
168 | keyword = pkc->ksk_uri->data.ksk.keywords[pkc->i++]; | 168 | keyword = pkc->ksk_uri->data.ksk.keywords[pkc->i++]; |
169 | pkc->uc = GNUNET_FS_publish_ublock_ (pkc->h, | 169 | pkc->uc = GNUNET_FS_publish_ublock_ (pkc->h, |
170 | pkc->dsh, | 170 | pkc->dsh, |
171 | keyword, NULL, | 171 | keyword + 1 /* skip '+' */, |
172 | NULL, | ||
172 | GNUNET_CRYPTO_ecc_key_get_anonymous (), | 173 | GNUNET_CRYPTO_ecc_key_get_anonymous (), |
173 | pkc->meta, | 174 | pkc->meta, |
174 | pkc->uri, | 175 | pkc->uri, |
diff --git a/src/fs/fs_publish_ublock.c b/src/fs/fs_publish_ublock.c index d4f65edc3..71997fda0 100644 --- a/src/fs/fs_publish_ublock.c +++ b/src/fs/fs_publish_ublock.c | |||
@@ -190,7 +190,7 @@ GNUNET_FS_publish_ublock_ (struct GNUNET_FS_Handle *h, | |||
190 | uris = GNUNET_FS_uri_to_string (uri); | 190 | uris = GNUNET_FS_uri_to_string (uri); |
191 | slen = strlen (uris) + 1; | 191 | slen = strlen (uris) + 1; |
192 | if (NULL == ulabel) | 192 | if (NULL == ulabel) |
193 | ulen = 0; | 193 | ulen = 1; |
194 | else | 194 | else |
195 | ulen = strlen (ulabel) + 1; | 195 | ulen = strlen (ulabel) + 1; |
196 | size = mdsize + sizeof (struct UBlock) + slen + ulen; | 196 | size = mdsize + sizeof (struct UBlock) + slen + ulen; |
@@ -201,7 +201,8 @@ GNUNET_FS_publish_ublock_ (struct GNUNET_FS_Handle *h, | |||
201 | } | 201 | } |
202 | ub_plain = GNUNET_malloc (size); | 202 | ub_plain = GNUNET_malloc (size); |
203 | kbe = (char *) &ub_plain[1]; | 203 | kbe = (char *) &ub_plain[1]; |
204 | memcpy (kbe, ulabel, ulen); | 204 | if (NULL != ulabel) |
205 | memcpy (kbe, ulabel, ulen); | ||
205 | kbe += ulen; | 206 | kbe += ulen; |
206 | memcpy (kbe, uris, slen); | 207 | memcpy (kbe, uris, slen); |
207 | kbe += slen; | 208 | kbe += slen; |
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index 3b0db0429..a0fec03a1 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c | |||
@@ -558,7 +558,7 @@ process_ksk_result (struct GNUNET_FS_SearchContext *sc, | |||
558 | is_new = (NULL == sr) || (sr->mandatory_missing > 0); | 558 | is_new = (NULL == sr) || (sr->mandatory_missing > 0); |
559 | if (NULL == sr) | 559 | if (NULL == sr) |
560 | { | 560 | { |
561 | sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult)); | 561 | sr = GNUNET_new (struct GNUNET_FS_SearchResult); |
562 | sr->h = sc->h; | 562 | sr->h = sc->h; |
563 | sr->sc = sc; | 563 | sr->sc = sc; |
564 | sr->anonymity = sc->anonymity; | 564 | sr->anonymity = sc->anonymity; |
@@ -639,7 +639,7 @@ process_sks_result (struct GNUNET_FS_SearchContext *sc, const char *id_update, | |||
639 | &test_result_present, | 639 | &test_result_present, |
640 | (void *) uri)) | 640 | (void *) uri)) |
641 | return; /* duplicate result */ | 641 | return; /* duplicate result */ |
642 | sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult)); | 642 | sr = GNUNET_new (struct GNUNET_FS_SearchResult); |
643 | sr->h = sc->h; | 643 | sr->h = sc->h; |
644 | sr->sc = sc; | 644 | sr->sc = sc; |
645 | sr->anonymity = sc->anonymity; | 645 | sr->anonymity = sc->anonymity; |
@@ -721,7 +721,8 @@ decrypt_block_with_keyword (const struct GNUNET_FS_SearchContext *sc, | |||
721 | * @param size size of nb | 721 | * @param size size of nb |
722 | */ | 722 | */ |
723 | static void | 723 | static void |
724 | process_kblock (struct GNUNET_FS_SearchContext *sc, const struct UBlock *ub, | 724 | process_kblock (struct GNUNET_FS_SearchContext *sc, |
725 | const struct UBlock *ub, | ||
725 | size_t size) | 726 | size_t size) |
726 | { | 727 | { |
727 | size_t j; | 728 | size_t j; |
@@ -793,7 +794,6 @@ process_sblock (struct GNUNET_FS_SearchContext *sc, | |||
793 | size_t off; | 794 | size_t off; |
794 | char *emsg; | 795 | char *emsg; |
795 | 796 | ||
796 | /* decrypt */ | ||
797 | GNUNET_FS_ublock_decrypt_ (&ub[1], len, | 797 | GNUNET_FS_ublock_decrypt_ (&ub[1], len, |
798 | &sc->uri->data.sks.ns, | 798 | &sc->uri->data.sks.ns, |
799 | sc->uri->data.sks.identifier, | 799 | sc->uri->data.sks.identifier, |
@@ -837,7 +837,8 @@ process_sblock (struct GNUNET_FS_SearchContext *sc, | |||
837 | * @param size size of data | 837 | * @param size size of data |
838 | */ | 838 | */ |
839 | static void | 839 | static void |
840 | process_result (struct GNUNET_FS_SearchContext *sc, enum GNUNET_BLOCK_Type type, | 840 | process_result (struct GNUNET_FS_SearchContext *sc, |
841 | enum GNUNET_BLOCK_Type type, | ||
841 | struct GNUNET_TIME_Absolute expiration, | 842 | struct GNUNET_TIME_Absolute expiration, |
842 | const void *data, | 843 | const void *data, |
843 | size_t size) | 844 | size_t size) |
@@ -1106,7 +1107,7 @@ transmit_search_request (void *cls, size_t size, void *buf) | |||
1106 | &dpub); | 1107 | &dpub); |
1107 | GNUNET_CRYPTO_hash (&dpub, | 1108 | GNUNET_CRYPTO_hash (&dpub, |
1108 | sizeof (dpub), | 1109 | sizeof (dpub), |
1109 | &sm->query); | 1110 | &sm->query); |
1110 | mbc.put_cnt = (size - msize) / sizeof (struct GNUNET_HashCode); | 1111 | mbc.put_cnt = (size - msize) / sizeof (struct GNUNET_HashCode); |
1111 | sqms = GNUNET_CONTAINER_multihashmap_size (sc->master_result_map); | 1112 | sqms = GNUNET_CONTAINER_multihashmap_size (sc->master_result_map); |
1112 | mbc.put_cnt = GNUNET_MIN (mbc.put_cnt, sqms - mbc.skip_cnt); | 1113 | mbc.put_cnt = GNUNET_MIN (mbc.put_cnt, sqms - mbc.skip_cnt); |
diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c index e493319be..9f6791bb5 100644 --- a/src/fs/plugin_block_fs.c +++ b/src/fs/plugin_block_fs.c | |||
@@ -198,7 +198,7 @@ libgnunet_plugin_block_fs_init (void *cls) | |||
198 | }; | 198 | }; |
199 | struct GNUNET_BLOCK_PluginFunctions *api; | 199 | struct GNUNET_BLOCK_PluginFunctions *api; |
200 | 200 | ||
201 | api = GNUNET_malloc (sizeof (struct GNUNET_BLOCK_PluginFunctions)); | 201 | api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions); |
202 | api->evaluate = &block_plugin_fs_evaluate; | 202 | api->evaluate = &block_plugin_fs_evaluate; |
203 | api->get_key = &block_plugin_fs_get_key; | 203 | api->get_key = &block_plugin_fs_get_key; |
204 | api->types = types; | 204 | api->types = types; |