re-added collective disconnect command to the scalarproduct API

adapted the scalarproduct client to use the new API
modified scalarproduct.h to include proper logging for gcrypt errors
cancel is now quiet        
added proper gcry logging to the SP-API

1 files changed, 7 insertions, 0 deletions

diff --git a/src/scalarproduct/scalarproduct.h b/src/scalarproduct/scalarproduct.h
index 43a866cf1..9304c0c7e 100644
--- a/src/scalarproduct/scalarproduct.h
+++ b/src/scalarproduct/scalarproduct.h
@@ -48,6 +48,13 @@ extern "C"
  */
 #define PAILLIER_ELEMENT_LENGTH (2*KEYBITS/8 +1)
 
+/**
+ * Log an error message at log-level 'level' that indicates
+ * a failure of the command 'cmd' with the message given
+ * by gcry_strerror(rc).
+ */
+#define LOG_GCRY(level, cmd, rc) do { LOG(level, _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, gcry_strerror(rc)); } while(0)
+
 ///////////////////////////////////////////////////////////////////////////////
 //                     Scalar Product Message Types
 ///////////////////////////////////////////////////////////////////////////////