ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-18 20:57:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rhizome_direct_get_bars() now sets bid_high correctly. #9

Browse Source
This commit is contained in:
gardners 2012-09-08 09:35:58 +09:30
parent 89b09563a3
commit b13c23de6a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rhizome.h
View File

@ -389,8 +389,8 @@ int rhizome_http_server_start(int (*http_parse_func)(rhizome_http_request *),
int port_low,int port_high);
int rhizome_direct_process_post_multipart_bytes
(rhizome_http_request *r,const char *bytes,int count);
int rhizome_direct_get_bars(const unsigned char *bid_low,
unsigned char *bid_high,
int rhizome_direct_get_bars(const unsigned char bid_low[RHIZOME_MANIFEST_ID_BYTES],
unsigned char bid_high[RHIZOME_MANIFEST_ID_BYTES],
unsigned char *bars_out,
int bars_requested);

16
rhizome_direct.c
View File

@ -582,6 +582,7 @@ int app_rhizome_direct_sync(int argc, const char *const *argv,
/* Start synchronising from the beginning of the BID address space */
memset(bid_low,0x00,RHIZOME_BAR_BYTES);
int bars_stuffed=rhizome_direct_get_bars(bid_low,bid_high,bars_out,
sizeof(bars_out)/RHIZOME_BAR_BYTES);
DEBUGF("Receied %d BARs",bars_stuffed);
@ -601,8 +602,8 @@ int app_rhizome_direct_sync(int argc, const char *const *argv,
it is possible to make provably complete comparison of the contents
of the respective rhizome databases.
*/
int rhizome_direct_get_bars(const unsigned char *bid_low,
unsigned char *bid_high,
int rhizome_direct_get_bars(const unsigned char bid_low[RHIZOME_MANIFEST_ID_BYTES],
unsigned char bid_high[RHIZOME_MANIFEST_ID_BYTES],
unsigned char *bars_out,
int bars_requested)
{
@ -623,12 +624,12 @@ int rhizome_direct_get_bars(const unsigned char *bid_low,
DEBUGF("%d matching bundles in database.",bundles_available);
snprintf(query,1024,
"SELECT BAR,ROWID FROM MANIFESTS"
"SELECT BAR,ROWID,ID FROM MANIFESTS"
" WHERE ID>='%s' ORDER BY BAR LIMIT %d;",
alloca_tohex(bid_low,RHIZOME_MANIFEST_ID_BYTES),bars_requested);
sqlite3_stmt *statement=sqlite_prepare(query);
sqlite3_blob *blob=NULL;
sqlite3_blob *blob=NULL;
int bars_written=0;
@ -665,6 +666,11 @@ int rhizome_direct_get_bars(const unsigned char *bid_low,
sqlite3_blob_close(blob);
blob=NULL;
/* Remember the BID so that we cant write it into bid_high so that the
caller knows how far we got. */
bcopy((const char *)sqlite3_column_text(statement, 0),
bid_high,RHIZOME_MANIFEST_ID_BYTES);
bars_written++;
break;
default:
@ -677,6 +683,8 @@ int rhizome_direct_get_bars(const unsigned char *bid_low,
sqlite3_finalize(statement);
statement = NULL;
DEBUGF("Last manifest ID was '%s'",bid_high);
return bars_written;
}