ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-01 19:06:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug in conversion to rhizome uppercase hex DB keys

Browse Source
This commit is contained in:
Andrew Bettison 2012-05-24 11:37:03 +09:30
parent fa26b53294
commit 24c00091f5
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rhizome_fetch.c
View File

@ -135,8 +135,10 @@ int rhizome_manifest_version_cache_lookup(rhizome_manifest *m)
int slot; int slot;
int i; int i;
char *id=rhizome_manifest_get(m,"id",NULL,0); char id[RHIZOME_MANIFEST_ID_STRLEN + 1];
if (!id) return 1; // dodgy manifest, so don't suggest that we want to RX it. if (!rhizome_manifest_get(m, "id", id, sizeof id))
return 1; // dodgy manifest, so don't suggest that we want to RX it.
str_toupper_inplace(id);
/* Work out bin number in cache */ /* Work out bin number in cache */
for(i=0;i<RHIZOME_VERSION_CACHE_NYBLS;i++) for(i=0;i<RHIZOME_VERSION_CACHE_NYBLS;i++)
@ -198,14 +200,11 @@ int rhizome_manifest_version_cache_lookup(rhizome_manifest *m)
a fairly large cache here. a fairly large cache here.
*/ */
unsigned long long manifest_version=rhizome_manifest_get_ll(m,"version"); unsigned long long manifest_version=rhizome_manifest_get_ll(m,"version");
if (sqlite_exec_int64("select count(*) from manifests" if (sqlite_exec_int64("select count(*) from manifests where id='%s' and version>=%lld",
" where id='%s' and version>=%lld",
id,manifest_version)>0) { id,manifest_version)>0) {
/* Okay, so we have a stored version which is newer, so update the cache /* Okay, so we have a stored version which is newer, so update the cache
using a random replacement strategy. */ using a random replacement strategy. */
unsigned long long stored_version unsigned long long stored_version = sqlite_exec_int64("select version from manifests where id='%s'", id);
=sqlite_exec_int64("select version from manifests where id='%s'",
id);
slot=random()%RHIZOME_VERSION_CACHE_ASSOCIATIVITY; slot=random()%RHIZOME_VERSION_CACHE_ASSOCIATIVITY;
unsigned char *entry=rhizome_manifest_version_cache[bin][slot]; unsigned char *entry=rhizome_manifest_version_cache[bin][slot];