[GNUnet-SVN] [gnunet] branch master updated (e00dbaf68 -> 8e1e2bc0d)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository gnunet.

    from e00dbaf68 misc bugfixes
     new 0b75f7855 fix ignore file
     new 8e1e2bc0d fix testcase

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/multicast/.gitignore                    |  3 +-
 src/revocation/.gitignore                   |  2 +
 src/set/test_set_intersection_result_full.c | 93 ++++++++++++++++++++++-------
 3 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/src/multicast/.gitignore b/src/multicast/.gitignore
index b77c65311..d38ca9c02 100644
--- a/src/multicast/.gitignore
+++ b/src/multicast/.gitignore
@@ -1,3 +1,4 @@
 gnunet-service-multicast
 gnunet-multicast
-test_multicast test_multicast_multipeer
+test_multicast 
+test_multicast_multipeer
diff --git a/src/revocation/.gitignore b/src/revocation/.gitignore
index dee463129..9acd3ac33 100644
--- a/src/revocation/.gitignore
+++ b/src/revocation/.gitignore
@@ -1,2 +1,4 @@
 gnunet-service-revocation
 gnunet-revocation
+test_revocation
+test_local_revocation.py
diff --git a/src/set/test_set_intersection_result_full.c 
b/src/set/test_set_intersection_result_full.c
index f78a03eaf..b2d6ce8a9 100644
--- a/src/set/test_set_intersection_result_full.c
+++ b/src/set/test_set_intersection_result_full.c
@@ -60,6 +60,9 @@ result_cb_set1 (void *cls,
 {
   static int count;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Processing result set 1 (%d)\n",
+              status);
   switch (status)
   {
   case GNUNET_SET_STATUS_OK:
@@ -74,6 +77,8 @@ result_cb_set1 (void *cls,
     GNUNET_assert (1 == count);
     GNUNET_SET_destroy (set1);
     set1 = NULL;
+    if (NULL == set2)
+      GNUNET_SCHEDULER_shutdown ();
     break;
   default:
     GNUNET_assert (0);
@@ -88,6 +93,9 @@ result_cb_set2 (void *cls,
 {
   static int count;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Processing result set 2 (%d)\n",
+              status);
   switch (status)
   {
   case GNUNET_SET_STATUS_OK:
@@ -102,6 +110,8 @@ result_cb_set2 (void *cls,
     GNUNET_assert (1 == count);
     GNUNET_SET_destroy (set2);
     set2 = NULL;
+    if (NULL == set1)
+      GNUNET_SCHEDULER_shutdown ();
     break;
   default:
     GNUNET_assert (0);
@@ -115,14 +125,16 @@ listen_cb (void *cls,
            const struct GNUNET_MessageHeader *context_msg,
            struct GNUNET_SET_Request *request)
 {
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "starting intersection by accepting and committing\n");
   GNUNET_assert (NULL != context_msg);
   GNUNET_assert (ntohs (context_msg->type) == GNUNET_MESSAGE_TYPE_DUMMY);
   GNUNET_SET_listen_cancel (listen_handle);
   listen_handle = NULL;
   oh2 = GNUNET_SET_accept (request,
-                          GNUNET_SET_RESULT_FULL,
-                          &result_cb_set2,
-                          NULL);
+                           GNUNET_SET_RESULT_FULL,
+                           &result_cb_set2,
+                           NULL);
   GNUNET_SET_commit (oh2,
                      set2);
 }
@@ -138,17 +150,20 @@ start (void *cls)
 {
   struct GNUNET_MessageHeader context_msg;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "starting listener\n");
   context_msg.size = htons (sizeof context_msg);
   context_msg.type = htons (GNUNET_MESSAGE_TYPE_DUMMY);
   listen_handle = GNUNET_SET_listen (config,
                                      GNUNET_SET_OPERATION_INTERSECTION,
                                      &app_id,
-                                     &listen_cb, NULL);
+                                     &listen_cb,
+                                     NULL);
   oh1 = GNUNET_SET_prepare (&local_id,
-                           &app_id,
-                           &context_msg,
-                           GNUNET_SET_RESULT_FULL,
-                           &result_cb_set1,
+                            &app_id,
+                            &context_msg,
+                            GNUNET_SET_RESULT_FULL,
+                            &result_cb_set1,
                             NULL);
   GNUNET_SET_commit (oh1,
                      set1);
@@ -170,13 +185,22 @@ init_set2 (void *cls)
   element.element_type = 0;
   element.data = "hello";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (set2, &element, NULL, NULL);
+  GNUNET_SET_add_element (set2,
+                          &element,
+                          NULL,
+                          NULL);
   element.data = "quux";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (set2, &element, NULL, NULL);
+  GNUNET_SET_add_element (set2,
+                          &element,
+                          NULL,
+                          NULL);
   element.data = "baz";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (set2, &element, &start, NULL);
+  GNUNET_SET_add_element (set2,
+                          &element,
+                          &start,
+                          NULL);
 }
 
 
@@ -188,13 +212,21 @@ init_set1 (void)
 {
   struct GNUNET_SET_Element element;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "initializing set 1\n");
   element.element_type = 0;
   element.data = "hello";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (set1, &element, NULL, NULL);
+  GNUNET_SET_add_element (set1,
+                          &element,
+                          NULL,
+                          NULL);
   element.data = "bar";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (set1, &element, &init_set2, NULL);
+  GNUNET_SET_add_element (set1,
+                          &element,
+                          &init_set2,
+                          NULL);
 }
 
 
@@ -219,17 +251,27 @@ test_iter ()
   struct GNUNET_SET_Element element;
   struct GNUNET_SET_Handle *iter_set;
 
-  iter_set = GNUNET_SET_create (config, GNUNET_SET_OPERATION_INTERSECTION);
+  iter_set = GNUNET_SET_create (config,
+                                GNUNET_SET_OPERATION_INTERSECTION);
   element.element_type = 0;
   element.data = "hello";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (iter_set, &element, NULL, NULL);
+  GNUNET_SET_add_element (iter_set,
+                          &element,
+                          NULL,
+                          NULL);
   element.data = "bar";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (iter_set, &element, NULL, NULL);
+  GNUNET_SET_add_element (iter_set,
+                          &element,
+                          NULL,
+                          NULL);
   element.data = "quux";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (iter_set, &element, NULL, NULL);
+  GNUNET_SET_add_element (iter_set,
+                          &element,
+                          NULL,
+                          NULL);
   GNUNET_SET_iterate (iter_set,
                       &iter_cb,
                       iter_set);
@@ -307,8 +349,10 @@ run (void *cls,
      struct GNUNET_TESTING_Peer *peer)
 {
   config = cfg;
-  GNUNET_TESTING_peer_get_identity (peer, &local_id);
-  if (0) test_iter ();
+  GNUNET_TESTING_peer_get_identity (peer,
+                                    &local_id);
+  if (0)
+    test_iter ();
 
   tt = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 5),
                                     &timeout_fail,
@@ -316,8 +360,10 @@ run (void *cls,
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
                                  NULL);
 
-  set1 = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_INTERSECTION);
-  set2 = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_INTERSECTION);
+  set1 = GNUNET_SET_create (cfg,
+                            GNUNET_SET_OPERATION_INTERSECTION);
+  set2 = GNUNET_SET_create (cfg,
+                            GNUNET_SET_OPERATION_INTERSECTION);
   GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK,
                                     &app_id);
 
@@ -327,9 +373,10 @@ run (void *cls,
 
 
 int
-main (int argc, char **argv)
+main (int argc,
+      char **argv)
 {
-  if (0 != GNUNET_TESTING_peer_run ("test_set_api",
+  if (0 != GNUNET_TESTING_peer_run ("test_set_intersection_result_full",
                                     "test_set.conf",
                                     &run, NULL))
     return 1;

-- 
To stop receiving notification emails like this one, please contact
address@hidden