From e213a9eae862ad9fd7da7fb0bed113f18b6b1340 Mon Sep 17 00:00:00 2001 From: gardners Date: Sat, 26 May 2012 08:36:29 +0930 Subject: [PATCH] renamed sanity_check to check_sanity for consistency. Put missing check for illegal service type into check_sanity. --- rhizome.c | 6 ++++-- rhizome.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rhizome.c b/rhizome.c index 076f9199..d41cc434 100644 --- a/rhizome.c +++ b/rhizome.c @@ -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)) diff --git a/rhizome.h b/rhizome.h index 5b4e4c9e..7b6ea0a6 100644 --- a/rhizome.h +++ b/rhizome.h @@ -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);