ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-11 13:16:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

further output cleanups.

Browse Source
This commit is contained in:
gardners 2012-05-22 17:08:12 +09:30
parent 6a83f2434f
commit 299cb92952
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rhizome.c
View File

@ -61,8 +61,8 @@ int rhizome_bundle_import(rhizome_manifest *m_in, rhizome_manifest **m_out,
if (!m) if (!m)
return WHY("Could not read manifest file."); return WHY("Could not read manifest file.");
} else { } else {
if (1||debug&DEBUG_RHIZOMESYNC) if (debug&DEBUG_RHIZOMESYNC)
fprintf(stderr,"Importing direct from manifest structure hashP=%d\n",m->fileHashedP); WHYF("Importing direct from manifest structure hashP=%d\n",m->fileHashedP);
} }
/* Add the manifest and its associated file to the Rhizome database. */ /* Add the manifest and its associated file to the Rhizome database. */

2
rhizome_crypto.c
View File

@ -140,7 +140,7 @@ int rhizome_bk_xor(const char *author,
*/ */
int rhizome_extract_privatekey(rhizome_manifest *m,const char *authorHex) int rhizome_extract_privatekey(rhizome_manifest *m,const char *authorHex)
{ {
if (!authorHex) return WHY("No author SID supplied"); if (!authorHex) return -1; // WHY("No author SID supplied");
char *bk = rhizome_manifest_get(m, "BK", NULL, 0); char *bk = rhizome_manifest_get(m, "BK", NULL, 0);
if (!bk) return WHY("Cannot obtain private key as manifest lacks BK field"); if (!bk) return WHY("Cannot obtain private key as manifest lacks BK field");

14
rhizome_fetch.c
View File

@ -463,8 +463,8 @@ int rhizome_enqueue_suggestions()
if (i) { if (i) {
/* now shuffle up */ /* now shuffle up */
int bytes=(candidate_count-i)*sizeof(rhizome_candidates); int bytes=(candidate_count-i)*sizeof(rhizome_candidates);
WHYF("Moving slot %d to slot 0 (%d bytes = %d slots)", if (0) WHYF("Moving slot %d to slot 0 (%d bytes = %d slots)",
i,bytes,bytes/sizeof(rhizome_candidates)); i,bytes,bytes/sizeof(rhizome_candidates));
bcopy(&candidates[i],&candidates[0],bytes); bcopy(&candidates[i],&candidates[0],bytes);
candidate_count-=i; candidate_count-=i;
} }
@ -820,12 +820,8 @@ int rhizome_fetch_poll()
q->manifest->manifest_all_bytes); q->manifest->manifest_all_bytes);
} }
q->manifest->finalised=1; q->manifest->finalised=1;
WHYF("finalised=%d",q->manifest->finalised);
q->manifest->manifest_bytes=q->manifest->manifest_all_bytes; q->manifest->manifest_bytes=q->manifest->manifest_all_bytes;
if (!rhizome_write_manifest_file(q->manifest,filename)) { if (!rhizome_write_manifest_file(q->manifest,filename)) {
WHYF("finalised=%d",q->manifest->finalised);
q->manifest->finalised=1;
WHYF("finalised=%d",q->manifest->finalised);
rhizome_bundle_import(q->manifest, NULL, id, rhizome_bundle_import(q->manifest, NULL, id,
NULL /* no additional groups */, NULL /* no additional groups */,
q->manifest->ttl - 1 /* TTL */, q->manifest->ttl - 1 /* TTL */,
@ -850,7 +846,6 @@ int rhizome_fetch_poll()
errno=0; errno=0;
bytes=read(q->socket,&q->request[q->request_len], bytes=read(q->socket,&q->request[q->request_len],
1024-q->request_len-1); 1024-q->request_len-1);
WHYF("Read %d bytes",bytes);
/* If we got some data, see if we have found the end of the HTTP request */ /* If we got some data, see if we have found the end of the HTTP request */
if (bytes>0) { if (bytes>0) {
@ -976,8 +971,9 @@ int rhizome_fetch_poll()
/* Reduce count of open connections */ /* Reduce count of open connections */
rhizome_file_fetch_queue_count--; rhizome_file_fetch_queue_count--;
WHYF("Released rhizome fetch slot (%d remaining)", if (debug&DEBUG_RHIZOME)
rhizome_file_fetch_queue_count); WHYF("Released rhizome fetch slot (%d remaining)",
rhizome_file_fetch_queue_count);
} }
} }