summaryrefslogtreecommitdiff
path: root/node/Network.hpp
diff options
context:
space:
mode:
authorGrant Limberg <glimberg@gmail.com>2015-07-07 19:24:02 -0700
committerGrant Limberg <glimberg@gmail.com>2015-07-07 19:24:02 -0700
commit1ad2cfeedfa2a9f4fc1f512e1009e5bb1b0630cb (patch)
treed8264c9bd4f6b9dce3f5237b94fe1f2fc521cf19 /node/Network.hpp
parent6d398beefddb48d91f27e5f41bf39f40eb77222f (diff)
parent412389ec755528108e0254e75a9cf43fc53e331a (diff)
downloadinfinitytier-1ad2cfeedfa2a9f4fc1f512e1009e5bb1b0630cb.tar.gz
infinitytier-1ad2cfeedfa2a9f4fc1f512e1009e5bb1b0630cb.zip
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/Network.hpp')
-rw-r--r--node/Network.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/node/Network.hpp b/node/Network.hpp
index daa4554e..d7320d46 100644
--- a/node/Network.hpp
+++ b/node/Network.hpp
@@ -179,12 +179,12 @@ public:
* Add or update a membership certificate
*
* @param cert Certificate of membership
- * @param forceAccept If true, accept without validating signature
+ * @return True if certificate was accepted as valid
*/
- void addMembershipCertificate(const CertificateOfMembership &cert,bool forceAccept);
+ bool validateAndAddMembershipCertificate(const CertificateOfMembership &cert);
/**
- * Check if we should push membership certificate to a peer, and update last pushed
+ * Check if we should push membership certificate to a peer, AND update last pushed
*
* If we haven't pushed a cert to this peer in a long enough time, this returns
* true and updates the last pushed time. Otherwise it returns false.