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

Refactored some rhizome db SQL code

Browse Source 
Added sqlite_exec_void() function, so that sqlite_exec_int64() can return
an error if no rows are found instead of 0, which can be misleading.
This commit is contained in:
Andrew Bettison 2012-05-25 19:42:45 +09:30
parent fdb34593ed
commit d215d90b40
6 changed files with 135 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rhizome.h
View File

@ -234,15 +234,15 @@ int rhizome_server_close_http_request(int i);
int rhizome_server_http_send_bytes(int rn,rhizome_http_request *r); int rhizome_server_http_send_bytes(int rn,rhizome_http_request *r);
int rhizome_server_parse_http_request(int rn,rhizome_http_request *r); int rhizome_server_parse_http_request(int rn,rhizome_http_request *r);
int rhizome_server_simple_http_response(rhizome_http_request *r,int result, char *response); int rhizome_server_simple_http_response(rhizome_http_request *r,int result, char *response);
long long sqlite_exec_int64(char *sqlformat,...); long long sqlite_exec_void(const char *sqlformat,...);
int sqlite_exec_strbuf(strbuf sb, char *sqlformat,...); long long sqlite_exec_int64(const char *sqlformat,...);
int sqlite_exec_strbuf(strbuf sb, const char *sqlformat,...);
int rhizome_server_http_response_header(rhizome_http_request *r,int result, int rhizome_server_http_response_header(rhizome_http_request *r,int result,
char *mime_type,unsigned long long bytes); char *mime_type,unsigned long long bytes);
int rhizome_server_sql_query_fill_buffer(int rn,rhizome_http_request *r); int rhizome_server_sql_query_fill_buffer(int rn,rhizome_http_request *r);
double rhizome_manifest_get_double(rhizome_manifest *m,char *var,double default_value); double rhizome_manifest_get_double(rhizome_manifest *m,char *var,double default_value);
int chartonybl(int c); int chartonybl(int c);
int rhizome_manifest_extract_signature(rhizome_manifest *m,int *ofs); int rhizome_manifest_extract_signature(rhizome_manifest *m,int *ofs);
long long sqlite_exec_int64(char *sqlformat,...);
int rhizome_update_file_priority(char *fileid); int rhizome_update_file_priority(char *fileid);
int rhizome_find_duplicate(const rhizome_manifest *m, rhizome_manifest **found); int rhizome_find_duplicate(const rhizome_manifest *m, rhizome_manifest **found);
int rhizome_manifest_to_bar(rhizome_manifest *m,unsigned char *bar); int rhizome_manifest_to_bar(rhizome_manifest *m,unsigned char *bar);

2
rhizome_crypto.c
View File

@ -48,7 +48,7 @@ int rhizome_manifest_createid(rhizome_manifest *m)
#ifdef DEPRECATED #ifdef DEPRECATED
int rhizome_store_keypair_bytes(unsigned char *p,unsigned char *s) { int rhizome_store_keypair_bytes(unsigned char *p,unsigned char *s) {
/* XXX TODO Secrets should be encrypted using a keyring password. */ /* XXX TODO Secrets should be encrypted using a keyring password. */
if (sqlite_exec_int64("INSERT INTO KEYPAIRS(public,private) VALUES('%s','%s');", if (sqlite_exec_void("INSERT INTO KEYPAIRS(public,private) VALUES('%s','%s');",
rhizome_bytes_to_hex(p,crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES), rhizome_bytes_to_hex(p,crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES),
rhizome_bytes_to_hex(s,crypto_sign_edwards25519sha512batch_SECRETKEYBYTES))<0) rhizome_bytes_to_hex(s,crypto_sign_edwards25519sha512batch_SECRETKEYBYTES))<0)
return WHY("Failed to store key pair."); return WHY("Failed to store key pair.");

197
rhizome_database.c
View File

@ -172,46 +172,89 @@ int rhizome_opendb()
return 0; return 0;
} }
/*
Convenience wrapper for executing an SQL command that returns a no value.
Returns -1 if an error occurs, otherwise zero.
*/
long long sqlite_exec_void(const char *sqlformat,...)
{
if (!rhizome_db) rhizome_opendb();
strbuf stmt = strbuf_alloca(8192);
va_list ap;
va_start(ap, sqlformat);
strbuf_vsprintf(stmt, sqlformat, ap);
va_end(ap);
if (strbuf_overrun(stmt))
return WHYF("Sql statement overrun: %s", strbuf_str(stmt));
sqlite3_stmt *statement;
switch (sqlite3_prepare_v2(rhizome_db, strbuf_str(stmt), -1, &statement, NULL)) {
case SQLITE_OK: case SQLITE_DONE:
break;
default:
WHY(strbuf_str(stmt));
WHY(sqlite3_errmsg(rhizome_db));
sqlite3_finalize(statement);
sqlite3_close(rhizome_db);
rhizome_db=NULL;
return WHYF("Sql statement prepare: %s -- closed database", strbuf_str(stmt));
}
int stepcode;
while ((stepcode = sqlite3_step(statement)) == SQLITE_ROW)
;
switch (stepcode) {
case SQLITE_OK:
case SQLITE_DONE:
case SQLITE_ROW:
break;
default:
WHY(strbuf_str(stmt));
WHY(sqlite3_errmsg(rhizome_db));
sqlite3_finalize(statement);
return WHYF("Sql statement step: %s", strbuf_str(stmt));
}
sqlite3_finalize(statement);
return 0;
}
/* /*
Convenience wrapper for executing an SQL command that returns a single int64 value Convenience wrapper for executing an SQL command that returns a single int64 value
Returns -1 if an error occurs, otherwise the value of the column in the first row. Returns -1 if an error occurs, otherwise the value of the column in the first row.
If there are no rows, return zero. If there are no rows, return zero.
*/ */
long long sqlite_exec_int64(char *sqlformat,...) long long sqlite_exec_int64(const char *sqlformat,...)
{ {
if (!rhizome_db) rhizome_opendb(); if (!rhizome_db) rhizome_opendb();
strbuf stmt = strbuf_alloca(8192);
char sqlstatement[8192];
va_list ap; va_list ap;
va_start(ap, sqlformat); va_start(ap, sqlformat);
vsnprintf(sqlstatement,8192,sqlformat,ap); sqlstatement[8191]=0; strbuf_vsprintf(stmt, sqlformat, ap);
va_end(ap); va_end(ap);
if (strbuf_overrun(stmt))
return WHYF("sql statement too long: %s", strbuf_str(stmt));
sqlite3_stmt *statement; sqlite3_stmt *statement;
switch (sqlite3_prepare_v2(rhizome_db,sqlstatement,-1,&statement,NULL)) { switch (sqlite3_prepare_v2(rhizome_db, strbuf_str(stmt), -1, &statement, NULL)) {
case SQLITE_OK: case SQLITE_DONE: case SQLITE_ROW: case SQLITE_OK: case SQLITE_DONE: case SQLITE_ROW:
break; break;
default: default:
WHY(strbuf_str(stmt));
WHY(sqlite3_errmsg(rhizome_db));
sqlite3_finalize(statement); sqlite3_finalize(statement);
sqlite3_close(rhizome_db); sqlite3_close(rhizome_db);
rhizome_db=NULL; rhizome_db=NULL;
WHY(sqlstatement); return WHYF("Could not prepare sql statement: %s -- closed database", strbuf_str(stmt));
WHY(sqlite3_errmsg(rhizome_db));
return WHY("Could not prepare sql statement.");
} }
if (sqlite3_step(statement) == SQLITE_ROW) { if (sqlite3_step(statement) == SQLITE_ROW) {
int n = sqlite3_column_count(statement); int n = sqlite3_column_count(statement);
if (n != 1) { if (n != 1) {
sqlite3_finalize(statement); sqlite3_finalize(statement);
return WHYF("Incorrect column count %d (should be 1)", n); return WHYF("Incorrect column count %d (should be 1): %s", n, strbuf_str(stmt));
} }
long long result= sqlite3_column_int64(statement, 0); long long result= sqlite3_column_int64(statement, 0);
sqlite3_finalize(statement); sqlite3_finalize(statement);
return result; return result;
} }
sqlite3_finalize(statement); sqlite3_finalize(statement);
return 0; return WHYF("No rows found: %s", strbuf_str(stmt));
} }
/* /*
@ -222,7 +265,7 @@ long long sqlite_exec_int64(char *sqlformat,...)
2 more than one row, and the first row's column is appended to the strbuf 2 more than one row, and the first row's column is appended to the strbuf
@author Andrew Bettison <andrew@servalproject.com> @author Andrew Bettison <andrew@servalproject.com>
*/ */
int sqlite_exec_strbuf(strbuf sb, char *sqlformat,...) int sqlite_exec_strbuf(strbuf sb, const char *sqlformat,...)
{ {
if (!rhizome_db) rhizome_opendb(); if (!rhizome_db) rhizome_opendb();
strbuf stmt = strbuf_alloca(8192); strbuf stmt = strbuf_alloca(8192);
@ -230,6 +273,8 @@ int sqlite_exec_strbuf(strbuf sb, char *sqlformat,...)
va_start(ap, sqlformat); va_start(ap, sqlformat);
strbuf_vsprintf(stmt, sqlformat, ap); strbuf_vsprintf(stmt, sqlformat, ap);
va_end(ap); va_end(ap);
if (strbuf_overrun(stmt))
return WHYF("sql statement too long: %s", strbuf_str(stmt));
sqlite3_stmt *statement; sqlite3_stmt *statement;
switch (sqlite3_prepare_v2(rhizome_db, strbuf_str(stmt), -1, &statement,NULL)) { switch (sqlite3_prepare_v2(rhizome_db, strbuf_str(stmt), -1, &statement,NULL)) {
case SQLITE_OK: case SQLITE_DONE: case SQLITE_ROW: case SQLITE_OK: case SQLITE_DONE: case SQLITE_ROW:
@ -261,9 +306,9 @@ int sqlite_exec_strbuf(strbuf sb, char *sqlformat,...)
long long rhizome_database_used_bytes() long long rhizome_database_used_bytes()
{ {
long long db_page_size=sqlite_exec_int64("PRAGMA page_size;"); long long db_page_size=sqlite_exec_void("PRAGMA page_size;");
long long db_page_count=sqlite_exec_int64("PRAGMA page_count;"); long long db_page_count=sqlite_exec_void("PRAGMA page_count;");
long long db_free_page_count=sqlite_exec_int64("PRAGMA free_count;"); long long db_free_page_count=sqlite_exec_void("PRAGMA free_count;");
return db_page_size*(db_page_count-db_free_page_count); return db_page_size*(db_page_count-db_free_page_count);
} }
@ -362,18 +407,18 @@ int rhizome_drop_stored_file(char *id,int maximum_priority)
cannot_drop=1; cannot_drop=1;
} else { } else {
printf("removing stale filemanifests, manifests, groupmemberships\n"); printf("removing stale filemanifests, manifests, groupmemberships\n");
sqlite_exec_int64("delete from filemanifests where manifestid='%s';",id); sqlite_exec_void("delete from filemanifests where manifestid='%s';",id);
sqlite_exec_int64("delete from manifests where manifestid='%s';",id); sqlite_exec_void("delete from manifests where manifestid='%s';",id);
sqlite_exec_int64("delete from keypairs where public='%s';",id); sqlite_exec_void("delete from keypairs where public='%s';",id);
sqlite_exec_int64("delete from groupmemberships where manifestid='%s';",id); sqlite_exec_void("delete from groupmemberships where manifestid='%s';",id);
} }
} }
sqlite3_finalize(statement); sqlite3_finalize(statement);
if (!cannot_drop) { if (!cannot_drop) {
printf("cleaning up filemanifests, manifests\n"); printf("cleaning up filemanifests, manifests\n");
sqlite_exec_int64("delete from filemanifests where fileid='%s';",id); sqlite_exec_void("delete from filemanifests where fileid='%s';",id);
sqlite_exec_int64("delete from files where id='%s';",id); sqlite_exec_void("delete from files where id='%s';",id);
} }
return 0; return 0;
} }
@ -418,31 +463,14 @@ int rhizome_store_bundle(rhizome_manifest *m, const char *associated_filename)
Remove old manifest entry, and replace with new one. Remove old manifest entry, and replace with new one.
But we do need to check if the file referenced by the old one is still needed, But we do need to check if the file referenced by the old one is still needed,
and if it's priority is right */ and if it's priority is right */
sqlite_exec_int64("DELETE FROM MANIFESTS WHERE id='%s';",manifestid); sqlite_exec_void("DELETE FROM MANIFESTS WHERE id='%s';",manifestid);
strbuf b = strbuf_alloca(RHIZOME_FILEHASH_STRLEN + 1);
char sql[1024]; if (sqlite_exec_strbuf(b, "SELECT fileid from filemanifests where manifestid='%s';", manifestid) == -1)
sqlite3_stmt *statement; return -1;
snprintf(sql,1024,"SELECT fileid from filemanifests where manifestid='%s';", manifestid); if (strbuf_overrun(b))
if (sqlite3_prepare_v2(rhizome_db,sql,strlen(sql)+1,&statement,NULL)!=SQLITE_OK) return WHYF("got over-long fileid from database: %s", strbuf_str(b));
{ rhizome_update_file_priority(strbuf_str(b));
WHY("sqlite3_prepare_v2() failed"); sqlite_exec_void("DELETE FROM FILEMANIFESTS WHERE manifestid='%s';",manifestid);
WHY(sql);
WHY(sqlite3_errmsg(rhizome_db));
}
else
{
while ( sqlite3_step(statement)== SQLITE_ROW)
{
const unsigned char *fileid;
if (sqlite3_column_type(statement,0)==SQLITE_TEXT) {
fileid=sqlite3_column_text(statement,0);
rhizome_update_file_priority((char *)fileid);
}
}
sqlite3_finalize(statement);
}
sqlite_exec_int64("DELETE FROM FILEMANIFESTS WHERE manifestid='%s';",manifestid);
} }
/* Store manifest */ /* Store manifest */
@ -466,19 +494,18 @@ int rhizome_store_bundle(rhizome_manifest *m, const char *associated_filename)
const char *cmdtail; const char *cmdtail;
sqlite3_stmt *statement; sqlite3_stmt *statement;
if (sqlite3_prepare_v2(rhizome_db,sqlcmd,strlen(sqlcmd)+1,&statement,&cmdtail) if (sqlite3_prepare_v2(rhizome_db,sqlcmd,strlen(sqlcmd)+1,&statement,&cmdtail) != SQLITE_OK) {
!= SQLITE_OK) { WHY(sqlite3_errmsg(rhizome_db));
sqlite3_finalize(statement); sqlite3_finalize(statement);
WHY("*** Insert into manifests failed."); return WHY("Insert into manifests failed.");
return WHY(sqlite3_errmsg(rhizome_db));
} }
/* Bind manifest data to data field */ /* Bind manifest data to data field */
if (sqlite3_bind_blob(statement,1,m->manifestdata,m->manifest_bytes,SQLITE_TRANSIENT)!=SQLITE_OK) if (sqlite3_bind_blob(statement,1,m->manifestdata,m->manifest_bytes,SQLITE_TRANSIENT)!=SQLITE_OK)
{ {
WHY(sqlite3_errmsg(rhizome_db));
sqlite3_finalize(statement); sqlite3_finalize(statement);
WHY("*** Insert into manifests failed (2)."); return WHY("Insert into manifests failed.");
return WHY(sqlite3_errmsg(rhizome_db));
} }
/* Bind BAR to data field */ /* Bind BAR to data field */
@ -488,21 +515,19 @@ int rhizome_store_bundle(rhizome_manifest *m, const char *associated_filename)
if (sqlite3_bind_blob(statement,2,bar,RHIZOME_BAR_BYTES,SQLITE_TRANSIENT) if (sqlite3_bind_blob(statement,2,bar,RHIZOME_BAR_BYTES,SQLITE_TRANSIENT)
!=SQLITE_OK) !=SQLITE_OK)
{ {
WHY(sqlite3_errmsg(rhizome_db));
sqlite3_finalize(statement); sqlite3_finalize(statement);
WHY("*** Insert into manifests failed (3)."); return WHY("Insert into manifests failed.");
return WHY(sqlite3_errmsg(rhizome_db));
} }
if (rhizome_finish_sqlstatement(statement)) { if (rhizome_finish_sqlstatement(statement))
WHY("*** Insert into manifests failed (4).");
return WHY("SQLite3 failed to insert row for manifest"); return WHY("SQLite3 failed to insert row for manifest");
}
else { else {
if (debug & DEBUG_RHIZOME) DEBUGF("Insert into manifests apparently worked."); if (debug & DEBUG_RHIZOME) DEBUGF("Insert into manifests apparently worked.");
} }
/* Create relationship between file and manifest */ /* Create relationship between file and manifest */
long long r=sqlite_exec_int64("INSERT INTO FILEMANIFESTS(manifestid,fileid) VALUES('%s','%s');", manifestid, filehash); long long r=sqlite_exec_void("INSERT INTO FILEMANIFESTS(manifestid,fileid) VALUES('%s','%s');", manifestid, filehash);
if (r<0) { if (r<0) {
WHY(sqlite3_errmsg(rhizome_db)); WHY(sqlite3_errmsg(rhizome_db));
return WHY("SQLite3 failed to insert row in filemanifests."); return WHY("SQLite3 failed to insert row in filemanifests.");
@ -516,9 +541,9 @@ int rhizome_store_bundle(rhizome_manifest *m, const char *associated_filename)
if (closed<1) closed=0; if (closed<1) closed=0;
int ciphered=rhizome_manifest_get_ll(m,"cipheredgroup"); int ciphered=rhizome_manifest_get_ll(m,"cipheredgroup");
if (ciphered<1) ciphered=0; if (ciphered<1) ciphered=0;
sqlite_exec_int64("delete from grouplist where id='%s';",manifestid); sqlite_exec_void("delete from grouplist where id='%s';",manifestid);
int storedP int storedP
=sqlite_exec_int64("insert into grouplist(id,closed,ciphered,priority) VALUES('%s',%d,%d,%d);", =sqlite_exec_void("insert into grouplist(id,closed,ciphered,priority) VALUES('%s',%d,%d,%d);",
manifestid,closed,ciphered,RHIZOME_PRIORITY_DEFAULT); manifestid,closed,ciphered,RHIZOME_PRIORITY_DEFAULT);
if (storedP<0) return WHY("Failed to insert group manifest into grouplist table."); if (storedP<0) return WHY("Failed to insert group manifest into grouplist table.");
} }
@ -528,7 +553,7 @@ int rhizome_store_bundle(rhizome_manifest *m, const char *associated_filename)
int dud=0; int dud=0;
for(g=0;g<m->group_count;g++) for(g=0;g<m->group_count;g++)
{ {
if (sqlite_exec_int64("INSERT INTO GROUPMEMBERSHIPS(manifestid,groupid) VALUES('%s','%s');", if (sqlite_exec_void("INSERT INTO GROUPMEMBERSHIPS(manifestid,groupid) VALUES('%s','%s');",
manifestid, m->groups[g])<0) manifestid, m->groups[g])<0)
dud++; dud++;
} }
@ -739,9 +764,10 @@ int rhizome_store_file(const char *file,char *hash,int priority)
if (sqlite3_prepare_v2(rhizome_db,sqlcmd,strlen(sqlcmd)+1,&statement,&cmdtail) if (sqlite3_prepare_v2(rhizome_db,sqlcmd,strlen(sqlcmd)+1,&statement,&cmdtail)
!= SQLITE_OK) != SQLITE_OK)
{ {
close(fd); WHY(sqlite3_errmsg(rhizome_db));
sqlite3_finalize(statement); sqlite3_finalize(statement);
return WHY(sqlite3_errmsg(rhizome_db)); close(fd);
return WHY("sqlite3_prepare_v2() failed");
} }
/* Bind appropriate sized zero-filled blob to data field */ /* Bind appropriate sized zero-filled blob to data field */
@ -750,8 +776,8 @@ int rhizome_store_file(const char *file,char *hash,int priority)
if ((r=sqlite3_bind_zeroblob(statement,1,stat.st_size))!=SQLITE_OK) if ((r=sqlite3_bind_zeroblob(statement,1,stat.st_size))!=SQLITE_OK)
{ {
dud++; dud++;
WHY("sqlite3_bind_zeroblob() failed");
WHY(sqlite3_errmsg(rhizome_db)); WHY(sqlite3_errmsg(rhizome_db));
WHY("sqlite3_bind_zeroblob() failed");
} }
/* Do actual insert, and abort if it fails */ /* Do actual insert, and abort if it fails */
@ -767,20 +793,20 @@ int rhizome_store_file(const char *file,char *hash,int priority)
if (sqlite3_finalize(statement)) dud++; if (sqlite3_finalize(statement)) dud++;
if (dud) { if (dud) {
close(fd);
if (sqlite3_finalize(statement)!=SQLITE_OK) if (sqlite3_finalize(statement)!=SQLITE_OK)
{ {
WHY("sqlite3_finalize() failed");
WHY(sqlite3_errmsg(rhizome_db)); WHY(sqlite3_errmsg(rhizome_db));
WHY("sqlite3_finalize() failed");
} }
close(fd);
return WHY("SQLite3 failed to insert row for file"); return WHY("SQLite3 failed to insert row for file");
} }
/* Get rowid for inserted row, so that we can modify the blob */ /* Get rowid for inserted row, so that we can modify the blob */
int rowid=sqlite3_last_insert_rowid(rhizome_db); int rowid=sqlite3_last_insert_rowid(rhizome_db);
if (rowid<1) { if (rowid<1) {
close(fd);
WHY(sqlite3_errmsg(rhizome_db)); WHY(sqlite3_errmsg(rhizome_db));
close(fd);
return WHY("SQLite3 failed return rowid of inserted row"); return WHY("SQLite3 failed return rowid of inserted row");
} }
@ -790,8 +816,8 @@ int rhizome_store_file(const char *file,char *hash,int priority)
&blob) != SQLITE_OK) &blob) != SQLITE_OK)
{ {
WHY(sqlite3_errmsg(rhizome_db)); WHY(sqlite3_errmsg(rhizome_db));
close(fd);
sqlite3_blob_close(blob); sqlite3_blob_close(blob);
close(fd);
return WHY("SQLite3 failed to open file blob for writing"); return WHY("SQLite3 failed to open file blob for writing");
} }
@ -805,13 +831,11 @@ int rhizome_store_file(const char *file,char *hash,int priority)
} }
} }
close(fd);
sqlite3_blob_close(blob); sqlite3_blob_close(blob);
close(fd);
/* Mark file as up-to-date */ /* Mark file as up-to-date */
sqlite_exec_int64("UPDATE FILES SET datavalid=1 WHERE id='%s';", sqlite_exec_void("UPDATE FILES SET datavalid=1 WHERE id='%s';", hash);
hash);
if (dud) { if (dud) {
WHY(sqlite3_errmsg(rhizome_db)); WHY(sqlite3_errmsg(rhizome_db));
@ -824,11 +848,11 @@ int rhizome_store_file(const char *file,char *hash,int priority)
int rhizome_clean_payload(const char *fileidhex) int rhizome_clean_payload(const char *fileidhex)
{ {
/* See if the file has any referents, and if not, delete it */ /* See if the file has any referents, and if not, delete it */
int count = sqlite_exec_int64("SELECT COUNT(*) FROM FILEMANIFESTS WHERE fileid='%s';", fileidhex); long long count = sqlite_exec_int64("SELECT COUNT(*) FROM FILEMANIFESTS WHERE fileid='%s';", fileidhex);
if (count == -1) if (count == -1)
return -1; return -1;
if (count == 0) { if (count == 0) {
if (sqlite_exec_int64("DELETE FROM FILES WHERE id='%s';", fileidhex) == -1) if (sqlite_exec_void("DELETE FROM FILES WHERE id='%s';", fileidhex) == -1)
return -1; return -1;
} }
return 0; return 0;
@ -852,8 +876,7 @@ int rhizome_update_file_priority(char *fileid)
/* It has referrers, so workout the highest priority of any referrer */ /* It has referrers, so workout the highest priority of any referrer */
int highestPriority=sqlite_exec_int64("SELECT max(grouplist.priority) FROM MANIFESTS,FILEMANIFESTS,GROUPMEMBERSHIPS,GROUPLIST where manifests.id=filemanifests.manifestid AND groupmemberships.manifestid=manifests.id AND groupmemberships.groupid=grouplist.id AND filemanifests.fileid='%s';",fileid); int highestPriority=sqlite_exec_int64("SELECT max(grouplist.priority) FROM MANIFESTS,FILEMANIFESTS,GROUPMEMBERSHIPS,GROUPLIST where manifests.id=filemanifests.manifestid AND groupmemberships.manifestid=manifests.id AND groupmemberships.groupid=grouplist.id AND filemanifests.fileid='%s';",fileid);
if (highestPriority>=0) if (highestPriority>=0)
sqlite_exec_int64("UPDATE files set highestPriority=%d WHERE id='%s';", sqlite_exec_void("UPDATE files set highestPriority=%d WHERE id='%s';", highestPriority,fileid);
highestPriority,fileid);
} }
return 0; return 0;
} }
@ -1124,15 +1147,16 @@ int rhizome_retrieve_file(const char *fileid, const char *filepath)
const char *cmdtail; const char *cmdtail;
int ret = 0; int ret = 0;
if (sqlite3_prepare_v2(rhizome_db, sqlcmd, strlen(sqlcmd) + 1, &statement, &cmdtail) != SQLITE_OK) { if (sqlite3_prepare_v2(rhizome_db, sqlcmd, strlen(sqlcmd) + 1, &statement, &cmdtail) != SQLITE_OK) {
sqlite3_finalize(statement);
ret = WHY(sqlite3_errmsg(rhizome_db)); ret = WHY(sqlite3_errmsg(rhizome_db));
sqlite3_finalize(statement);
} else { } else {
char fileIdUpper[RHIZOME_FILEHASH_STRLEN + 1]; char fileIdUpper[RHIZOME_FILEHASH_STRLEN + 1];
strncpy(fileIdUpper, fileid, sizeof fileIdUpper); strncpy(fileIdUpper, fileid, sizeof fileIdUpper);
fileIdUpper[RHIZOME_FILEHASH_STRLEN] = '\0'; fileIdUpper[RHIZOME_FILEHASH_STRLEN] = '\0';
str_toupper_inplace(fileIdUpper); str_toupper_inplace(fileIdUpper);
sqlite3_bind_text(statement, 1, fileIdUpper, -1, SQLITE_STATIC); sqlite3_bind_text(statement, 1, fileIdUpper, -1, SQLITE_STATIC);
while (sqlite3_step(statement) == SQLITE_ROW) { int stepcode;
while ((stepcode = sqlite3_step(statement)) == SQLITE_ROW) {
if (!( sqlite3_column_count(statement) == 3 if (!( sqlite3_column_count(statement) == 3
&& sqlite3_column_type(statement, 0) == SQLITE_TEXT && sqlite3_column_type(statement, 0) == SQLITE_TEXT
&& sqlite3_column_type(statement, 1) == SQLITE_BLOB && sqlite3_column_type(statement, 1) == SQLITE_BLOB
@ -1155,19 +1179,26 @@ int rhizome_retrieve_file(const char *fileid, const char *filepath)
if (filepath) { if (filepath) {
int fd = open(filepath, O_WRONLY | O_CREAT | O_TRUNC, 0775); int fd = open(filepath, O_WRONLY | O_CREAT | O_TRUNC, 0775);
if (fd == -1) { if (fd == -1) {
ret = WHYF("Cannot open %s for write/create", filepath);
WHY_perror("open"); WHY_perror("open");
ret = WHYF("Cannot open %s for write/create", filepath);
} else if (write(fd, fileblob, length) != length) { } else if (write(fd, fileblob, length) != length) {
ret = WHYF("Error writing %lld bytes to %s ", (long long) length, filepath);
WHY_perror("write"); WHY_perror("write");
} else if (close(fd) == -1) { ret = WHYF("Error writing %lld bytes to %s ", (long long) length, filepath);
ret = WHYF("Error flushing to %s ", filepath); }
if (fd != -1 && close(fd) == -1) {
WHY_perror("close"); WHY_perror("close");
ret = WHYF("Error flushing to %s ", filepath);
} }
} }
} }
break; break;
} }
switch (stepcode) {
case SQLITE_OK: break;
case SQLITE_DONE: break;
case SQLITE_ROW: WARNF("Found more than one row: %s", sqlcmd); break;
default: ret = WHY(sqlite3_errmsg(rhizome_db)); break;;
}
} }
sqlite3_finalize(statement); sqlite3_finalize(statement);
return ret; return ret;

20
rhizome_fetch.c
View File

@ -137,7 +137,7 @@ int rhizome_manifest_version_cache_lookup(rhizome_manifest *m)
char id[RHIZOME_MANIFEST_ID_STRLEN + 1]; char id[RHIZOME_MANIFEST_ID_STRLEN + 1];
if (!rhizome_manifest_get(m, "id", id, sizeof id)) if (!rhizome_manifest_get(m, "id", id, sizeof id))
return 1; // dodgy manifest, so don't suggest that we want to RX it. return -3; // dodgy manifest, we don't want to receive it
str_toupper_inplace(id); str_toupper_inplace(id);
/* Work out bin number in cache */ /* Work out bin number in cache */
@ -199,30 +199,28 @@ int rhizome_manifest_version_cache_lookup(rhizome_manifest *m)
and require regular database queries, and that memory allowing, we should use and require regular database queries, and that memory allowing, we should use
a fairly large cache here. a fairly large cache here.
*/ */
unsigned long long manifest_version=rhizome_manifest_get_ll(m,"version"); long long manifest_version = rhizome_manifest_get_ll(m, "version");
if (sqlite_exec_int64("select count(*) from manifests where id='%s' and version>=%lld", if (sqlite_exec_int64("select count(*) from manifests 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 = sqlite_exec_int64("select version from manifests where id='%s'", id); long long stored_version = sqlite_exec_int64("select version from manifests where id='%s'", id);
if (stored_version == -1)
return -4; // database is broken, we can't receive it
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];
unsigned long long *cached_version=(unsigned long long *)&entry[24]; long long *cached_version=(long long *)&entry[24];
*cached_version=stored_version; *cached_version=stored_version;
for(i=0;i<24;i++) for(i=0;i<24;i++)
{ {
int byte=(chartonybl(id[(i*2)])<<4)|chartonybl(id[(i*2)+1]); int byte=(chartonybl(id[(i*2)])<<4)|chartonybl(id[(i*2)+1]);
entry[i]=byte; entry[i]=byte;
} }
/* Finally, say that it isn't worth RXing this manifest */ /* Finally, say that it isn't worth RXing this manifest */
if (stored_version>manifest_version) return -2; else return -1; return stored_version > manifest_version ? -2 : -1;
} else {
/* At best we hold an older version of this manifest */
return 0;
} }
/* At best we hold an older version of this manifest */
return 0;
} }
typedef struct ignored_manifest { typedef struct ignored_manifest {

10
rhizome_packetformats.c
View File

@ -344,10 +344,14 @@ int overlay_rhizome_saw_advertisements(int i,overlay_frame *f, long long now)
rhizome_manifest_free(m); rhizome_manifest_free(m);
return 0; return 0;
} }
char manifest_id_buf[RHIZOME_MANIFEST_ID_STRLEN + 1]; char manifest_id[RHIZOME_MANIFEST_ID_STRLEN + 1];
char *manifest_id = rhizome_manifest_get(m, "id", manifest_id_buf, sizeof manifest_id_buf); if (rhizome_manifest_get(m, "id", manifest_id, sizeof manifest_id) == NULL) {
WHY("Manifest does not contain 'id' field");
rhizome_manifest_free(m);
return 0;
}
long long version = rhizome_manifest_get_ll(m, "version"); long long version = rhizome_manifest_get_ll(m, "version");
if (debug & DEBUG_RHIZOMESYNC) DEBUGF("manifest id=%s version=%lld", manifest_id ? manifest_id : "NULL", version); if (debug & DEBUG_RHIZOMESYNC) DEBUGF("manifest id=%s version=%lld", manifest_id, version);
/* Crude signature presence test */ /* Crude signature presence test */
for(i=m->manifest_all_bytes-1;i>0;i--) for(i=m->manifest_all_bytes-1;i>0;i--)

1
tests/dna_rhizome
View File

@ -304,6 +304,7 @@ setup_AddThenExtractFile() {
setup_servald_rhizome setup_servald_rhizome
echo "A test file" >file1 echo "A test file" >file1
executeOk $servald rhizome add file $sid '' file1 file1.manifest executeOk $servald rhizome add file $sid '' file1 file1.manifest
tfw_cat --stderr
executeOk $servald rhizome list executeOk $servald rhizome list
assert_rhizome_list file1 assert_rhizome_list file1
extract_manifest_filehash filehash file1.manifest extract_manifest_filehash filehash file1.manifest