-rps: merge duplicate functions

[oweals/gnunet.git] / src / conversation / test_conversation_api_twocalls.c

diff --git a/src/conversation/test_conversation_api_twocalls.c b/src/conversation/test_conversation_api_twocalls.c
index 3f461231d910ef745c945ae506909f2c5bd0362f..17a12eb4f35821a3ad1d90878810bbb2970ed3f5 100644 (file)
--- a/src/conversation/test_conversation_api_twocalls.c
+++ b/src/conversation/test_conversation_api_twocalls.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2013 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file conversation/test_conversation_api_twocalls.c
@@ -73,7 +73,7 @@ static GNUNET_MICROPHONE_RecordedDataCallback phone_rdc;
 
 static void *phone_rdc_cls;
 
-static GNUNET_SCHEDULER_TaskIdentifier phone_task;
+static struct GNUNET_SCHEDULER_Task * phone_task;
 
 /**
  * Variable for recognizing caller1
@@ -114,7 +114,7 @@ struct MicContext
 
   void *rdc_cls;
 
-  GNUNET_SCHEDULER_TaskIdentifier call_task;
+  struct GNUNET_SCHEDULER_Task * call_task;
 
 };
 
@@ -124,8 +124,7 @@ static struct MicContext call2_mic_ctx;
 
 
 static void
-phone_send (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+phone_send (void *cls)
 {
   char buf[32];
 
@@ -138,8 +137,7 @@ phone_send (void *cls,
 
 
 static void
-call_send (void *cls,
-           const struct GNUNET_SCHEDULER_TaskContext *tc)
+call_send (void *cls)
 {
   struct MicContext *mc = cls;
   char buf[32];
@@ -268,14 +266,14 @@ enable_mic (void *cls,
   {
     phone_rdc = rdc;
     phone_rdc_cls = rdc_cls;
-    GNUNET_break (GNUNET_SCHEDULER_NO_TASK == phone_task);
+    GNUNET_break (NULL == phone_task);
     phone_task = GNUNET_SCHEDULER_add_now (&phone_send, NULL);
     return GNUNET_OK;
   }
   mc = (CALLER1 == cls) ? &call1_mic_ctx : &call2_mic_ctx;
   mc->rdc = rdc;
   mc->rdc_cls = rdc_cls;
-  GNUNET_break (GNUNET_SCHEDULER_NO_TASK == mc->call_task);
+  GNUNET_break (NULL == mc->call_task);
   mc->call_task = GNUNET_SCHEDULER_add_now (&call_send, mc);
   return GNUNET_OK;
 }
@@ -294,14 +292,14 @@ disable_mic (void *cls)
     phone_rdc = NULL;
     phone_rdc_cls = NULL;
     GNUNET_SCHEDULER_cancel (phone_task);
-    phone_task = GNUNET_SCHEDULER_NO_TASK;
+    phone_task = NULL;
     return;
   }
   mc = (CALLER1 == cls) ? &call1_mic_ctx : &call2_mic_ctx;
   mc->rdc = NULL;
   mc->rdc_cls = NULL;
   GNUNET_SCHEDULER_cancel (mc->call_task);
-  mc->call_task = GNUNET_SCHEDULER_NO_TASK;
+  mc->call_task = NULL;
 }
 
 
@@ -343,10 +341,9 @@ static struct GNUNET_MICROPHONE_Handle phone_mic = {
  * Signature of the main function of a task.
  *
  * @param cls closure
- * @param tc context information (why was this task triggered now)
  */
 static void
-end_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_test (void *cls)
 {
   GNUNET_SCHEDULER_shutdown ();
   if (NULL != op)
@@ -406,12 +403,10 @@ static void
 phone_event_handler (void *cls,
                      enum GNUNET_CONVERSATION_PhoneEventCode code,
                      struct GNUNET_CONVERSATION_Caller *caller,
-                     const char *caller_id)
+                     const struct GNUNET_CRYPTO_EcdsaPublicKey *caller_id)
 {
   const char *cid;
 
-  GNUNET_break (0 == strcmp (caller_id,
-                             gns_caller_id));
   switch (code)
   {
   case GNUNET_CONVERSATION_EC_PHONE_RING:
@@ -474,6 +469,7 @@ call_event_handler (void *cls,
     break;
   case GNUNET_CONVERSATION_EC_CALL_GNS_FAIL:
     LOG_DEBUG ("Call %s GNS lookup failed \n", cid);
+    break;
   case GNUNET_CONVERSATION_EC_CALL_HUNG_UP:
     LOG_DEBUG ("Call %s hungup\n", cid);
     if (0 == strcmp (cid, "call1"))
@@ -561,6 +557,7 @@ identity_cb (void *cls,
                      "%s",
                      GNUNET_GNSRECORD_pkey_to_zkey (&pub));
     call1 = GNUNET_CONVERSATION_call_start (cfg,
+                                            ego,
                                             ego,
                                             gns_name,
                                             &call1_speaker,
@@ -568,6 +565,7 @@ identity_cb (void *cls,
                                             &call_event_handler,
                                             (void *) "call1");
     call2 = GNUNET_CONVERSATION_call_start (cfg,
+                                            ego,
                                             ego,
                                             gns_name,
                                             &call2_speaker,