diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/fs/fs_publish.c | 5 | ||||
-rwxr-xr-x | src/fs/test_gnunet_fs_rec.py.in | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index 90908f412..73fc710e1 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c | |||
@@ -567,7 +567,7 @@ block_proc (void *cls, | |||
567 | odb.offset = GNUNET_htonll (offset); | 567 | odb.offset = GNUNET_htonll (offset); |
568 | odb.file_id = p->data.file.file_id; | 568 | odb.file_id = p->data.file.file_id; |
569 | GNUNET_DATASTORE_put (sc->dsh, | 569 | GNUNET_DATASTORE_put (sc->dsh, |
570 | sc->rid, | 570 | (p->is_directory) ? 0 : sc->rid, |
571 | query, | 571 | query, |
572 | sizeof(struct OnDemandBlock), | 572 | sizeof(struct OnDemandBlock), |
573 | &odb, | 573 | &odb, |
@@ -589,7 +589,7 @@ block_proc (void *cls, | |||
589 | (unsigned int) block_size); | 589 | (unsigned int) block_size); |
590 | #endif | 590 | #endif |
591 | GNUNET_DATASTORE_put (sc->dsh, | 591 | GNUNET_DATASTORE_put (sc->dsh, |
592 | sc->rid, | 592 | (p->is_directory) ? 0 : sc->rid, |
593 | query, | 593 | query, |
594 | block_size, | 594 | block_size, |
595 | block, | 595 | block, |
@@ -1105,6 +1105,7 @@ fip_signal_start(void *cls, | |||
1105 | left = left * sizeof (struct ContentHashKey); | 1105 | left = left * sizeof (struct ContentHashKey); |
1106 | sc->reserve_space += left; | 1106 | sc->reserve_space += left; |
1107 | } | 1107 | } |
1108 | sc->reserve_entries++; | ||
1108 | /* entries and space for keywords */ | 1109 | /* entries and space for keywords */ |
1109 | if (NULL != *uri) | 1110 | if (NULL != *uri) |
1110 | { | 1111 | { |
diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in index 145b8e3b4..ccf7be6b5 100755 --- a/src/fs/test_gnunet_fs_rec.py.in +++ b/src/fs/test_gnunet_fs_rec.py.in | |||
@@ -29,10 +29,10 @@ os.system ('tar xfz test_gnunet_fs_rec_data.tgz') | |||
29 | try: | 29 | try: |
30 | pub = pexpect.spawn ('gnunet-publish -c test_gnunet_fs_rec_data.conf -d -k testdir dir/') | 30 | pub = pexpect.spawn ('gnunet-publish -c test_gnunet_fs_rec_data.conf -d -k testdir dir/') |
31 | pub.expect ('Publishing `dir/\' done.\r') | 31 | pub.expect ('Publishing `dir/\' done.\r') |
32 | pub.expect ("URI is `gnunet://fs/chk/P5BPKNHH7CECDQA1A917G5EB67PPVG99NVO5QMJ8AJP2C02NM8O1ALNGOJPLLO0RMST0FNM0ATJV95PDAGATHDGH7AGIK2N3O0OOC70.OSG2JS3JDSI0AV8LMOL9MKPJ70DNG2RBL2CBTUCHK563VEM7L00RN8I2K0VPB459JRVBFOIKJG72LIQPDP9RFCVEVI37BUD76RJ3KK0.20169\'.") | 32 | pub.expect ("URI is `gnunet://fs/chk/8PNDC5FDF7T57HUGM9ODSL7CDKNOLPUFDCJQQ2MPP4SUPSEAJP1LNLBMEFN21KAG0KNVG3LG2AJCV322G3ECU6GKM9HFCVKM78LKEUO.9MI810JGAE6QVQMTBBVO2E92PA3C1MVF511CGKIPBMJ1B0PERIBDK9TNVD2JB4E4NFTD5F8QORJ644CUC281PISDND1NVGC7PB14388.20173'.") |
33 | pub.expect (pexpect.EOF) | 33 | pub.expect (pexpect.EOF) |
34 | 34 | ||
35 | down = pexpect.spawn ('gnunet-download -c test_gnunet_fs_rec_data.conf -R -o rdir.gnd gnunet://fs/chk/P5BPKNHH7CECDQA1A917G5EB67PPVG99NVO5QMJ8AJP2C02NM8O1ALNGOJPLLO0RMST0FNM0ATJV95PDAGATHDGH7AGIK2N3O0OOC70.OSG2JS3JDSI0AV8LMOL9MKPJ70DNG2RBL2CBTUCHK563VEM7L00RN8I2K0VPB459JRVBFOIKJG72LIQPDP9RFCVEVI37BUD76RJ3KK0.20169\'.') | 35 | down = pexpect.spawn ('gnunet-download -c test_gnunet_fs_rec_data.conf -R -o rdir.gnd gnunet://fs/chk/8PNDC5FDF7T57HUGM9ODSL7CDKNOLPUFDCJQQ2MPP4SUPSEAJP1LNLBMEFN21KAG0KNVG3LG2AJCV322G3ECU6GKM9HFCVKM78LKEUO.9MI810JGAE6QVQMTBBVO2E92PA3C1MVF511CGKIPBMJ1B0PERIBDK9TNVD2JB4E4NFTD5F8QORJ644CUC281PISDND1NVGC7PB14388.20173') |
36 | 36 | ||
37 | down.expect (re.compile ("Downloading `rdir.gnd\' done \(.*\).\r")); | 37 | down.expect (re.compile ("Downloading `rdir.gnd\' done \(.*\).\r")); |
38 | down.expect (pexpect.EOF); | 38 | down.expect (pexpect.EOF); |