Introduction of intermediate result reporting, removed some stuff, new test:

- new message, message type and api function to handle intermediate result reporting
- removed GNUNET_SIGNATURE_PURPOSE_CREDENTIAL completely and the one usage that was still around
- new test: AND with both parts having a bidirectional forward match

3 files changed, 13 insertions, 8 deletions

diff --git a/src/include/gnunet_credential_service.h b/src/include/gnunet_credential_service.h
index be682c3b5..fdee3b641 100644
--- a/src/include/gnunet_credential_service.h
+++ b/src/include/gnunet_credential_service.h
@@ -259,7 +259,10 @@ typedef void (*GNUNET_CREDENTIAL_CredentialResultProcessor) (void *cls,
                                                          unsigned int d_count,
                                                          struct GNUNET_CREDENTIAL_Delegation *delegation_chain,
                                                          unsigned int c_count,
-                                                         struct GNUNET_CREDENTIAL_Delegate *credential);
+                                                         struct GNUNET_CREDENTIAL_Delegate *delegte);
+                                                        
+typedef void (*GNUNET_CREDENTIAL_IntermediateResultProcessor) (void *cls,
+                                                         struct GNUNET_CREDENTIAL_Delegation *delegation);
 
 /**
  * Iterator called on obtained result for an attribute delegation.
@@ -309,7 +312,9 @@ GNUNET_CREDENTIAL_verify (struct GNUNET_CREDENTIAL_Handle *handle,
                           const struct GNUNET_CREDENTIAL_Delegate *delegates,
                           enum GNUNET_CREDENTIAL_AlgoDirectionFlags direction,
                           GNUNET_CREDENTIAL_CredentialResultProcessor proc,
-                          void *proc_cls);
+                          void *proc_cls,
+                          GNUNET_CREDENTIAL_IntermediateResultProcessor,
+                          void *proc2_cls);
 
 struct GNUNET_CREDENTIAL_Request*
 GNUNET_CREDENTIAL_collect (struct GNUNET_CREDENTIAL_Handle *handle,
@@ -318,7 +323,9 @@ GNUNET_CREDENTIAL_collect (struct GNUNET_CREDENTIAL_Handle *handle,
                            const struct GNUNET_CRYPTO_EcdsaPrivateKey *subject_key,
                            enum GNUNET_CREDENTIAL_AlgoDirectionFlags direction,
                            GNUNET_CREDENTIAL_CredentialResultProcessor proc,
-                           void *proc_cls);
+                           void *proc_cls,
+                           GNUNET_CREDENTIAL_IntermediateResultProcessor,
+                           void *proc2_cls);
 
 /**
  * Delegate an attribute
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index c932c44d0..4ca1ad47a 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -2726,6 +2726,8 @@ extern "C" {
 
 #define GNUNET_MESSAGE_TYPE_CREDENTIAL_COLLECT_RESULT 984
 
+#define GNUNET_MESSAGE_TYPE_CREDENTIAL_INTERMEDIATE_RESULT 985
+
 /******************************************************************************/
 
 
diff --git a/src/include/gnunet_signatures.h b/src/include/gnunet_signatures.h
index 1d6d5a229..a00e0372d 100644
--- a/src/include/gnunet_signatures.h
+++ b/src/include/gnunet_signatures.h
@@ -188,7 +188,7 @@ extern "C"
 /**
  * Signature for a GNUnet credential
  */
-#define GNUNET_SIGNATURE_PURPOSE_CREDENTIAL 28
+#define GNUNET_SIGNATURE_PURPOSE_DELEGATE 28
 
 /**
  * Signature by a peer affirming that this is one of its
@@ -241,10 +241,6 @@ extern "C"
  */
 #define GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DV_INITIATOR 37
 
-/**
- * Signature for a GNUnet delegate
- */
-#define GNUNET_SIGNATURE_PURPOSE_DELEGATE 38
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {