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

renamed sanity_check to check_sanity for consistency.

Browse Source 
Put missing check for illegal service type into check_sanity.
This commit is contained in:
gardners 2012-05-26 08:36:29 +09:30
parent 8161709c4e
commit e213a9eae8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rhizome.c
View File

@ -89,7 +89,7 @@ int rhizome_bundle_import(rhizome_manifest *m_in, rhizome_manifest **m_out,
return ret;
}
int rhizome_manifest_sanity_check(rhizome_manifest *m_in)
int rhizome_manifest_check_sanity(rhizome_manifest *m_in)
{
/* Ensure manifest meets basic sanity checks. */
const char *service = rhizome_manifest_get(m_in, "service", NULL, 0);
@ -113,6 +113,8 @@ int rhizome_manifest_sanity_check(rhizome_manifest *m_in)
return WHY("MeshMS Manifest missing 'recipient' field");
if (!validateSid(recipient))
return WHY("MeshMS Manifest contains invalid 'recipient' field");
} else {
return WHY("Invalid service type");
}
if (debug & DEBUG_RHIZOME) DEBUGF("sender='%s'", sender ? sender : "(null)");
@ -266,7 +268,7 @@ int rhizome_add_manifest(rhizome_manifest *m_in,int ttl)
/* Store time to live, clamped to within legal range */
m_in->ttl = ttl < 0 ? 0 : ttl > 254 ? 254 : ttl;
if (rhizome_manifest_sanity_check(m_in))
if (rhizome_manifest_check_sanity(m_in))
return WHY("Sanity checks on manifest failed");
if (rhizome_manifest_check_file(m_in))

1
rhizome.h
View File

@ -221,6 +221,7 @@ int rhizome_finish_sqlstatement(sqlite3_stmt *statement);
int rhizome_bundle_import(rhizome_manifest *m_in, rhizome_manifest **m_out,
const char *bundle, int ttl);
int rhizome_manifest_check_sanity(rhizome_manifest *m_in);
int rhizome_manifest_check_file(rhizome_manifest *m_in);
int rhizome_manifest_check_duplicate(rhizome_manifest *m_in,rhizome_manifest **m_out);