/*
This file is part of GNUnet.
- (C) 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2013, 2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
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.c
*
* This test performs the operations of a call to a phone
* where the phone user picks up and then the call is
- * terminated by the party that initiated the call. The
- * actual transmission of voice data is not tested.
+ * terminated by the party that initiated the call.
*/
#include "platform.h"
#include "gnunet_util_lib.h"
static void *call_rdc_cls;
-static GNUNET_SCHEDULER_TaskIdentifier phone_task;
+static struct GNUNET_SCHEDULER_Task * phone_task;
-static GNUNET_SCHEDULER_TaskIdentifier call_task;
+static struct GNUNET_SCHEDULER_Task * call_task;
static void
const void *data)
{
const char *origin = cls;
- static unsigned int phone_i;
+ static unsigned int phone_i = 1;
static unsigned int call_i;
char buf[32];
if (0 == strcmp (origin, "phone"))
- GNUNET_snprintf (buf, sizeof (buf), "phone-%u", phone_i++);
- else
GNUNET_snprintf (buf, sizeof (buf), "call-%u", call_i++);
+ else
+ GNUNET_snprintf (buf, sizeof (buf), "phone-%u", phone_i++);
if ( (data_size != strlen (buf) + 1) ||
(0 != strncmp (buf, data, data_size)) )
{
(int) data_size,
(const char *) data);
}
+ else
+ {
+ fprintf (stderr, ".");
+ }
if ( (20 < call_i) &&
- (20 < phone_i) )
+ (20 < phone_i) &&
+ (NULL != call) )
{
/* time to hang up ... */
GNUNET_CONVERSATION_call_stop (call);
phone_rdc = NULL;
phone_rdc_cls = NULL;
GNUNET_SCHEDULER_cancel (phone_task);
- phone_task = GNUNET_SCHEDULER_NO_TASK;
+ phone_task = NULL;
}
else
{
call_rdc = NULL;
call_rdc_cls = NULL;
GNUNET_SCHEDULER_cancel (call_task);
- call_task = GNUNET_SCHEDULER_NO_TASK;
+ call_task = NULL;
}
}
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)
{
static enum GNUNET_CONVERSATION_PhoneEventCode expect
= GNUNET_CONVERSATION_EC_PHONE_RING;
- GNUNET_break (0 == strcmp (caller_id,
- gns_caller_id));
GNUNET_break (code == expect);
switch (code)
{
break;
case GNUNET_CONVERSATION_EC_CALL_SUSPENDED:
case GNUNET_CONVERSATION_EC_CALL_RESUMED:
+ case GNUNET_CONVERSATION_EC_CALL_ERROR:
fprintf (stderr, "Unexpected call code: %d\n", code);
break;
}
"%s",
GNUNET_GNSRECORD_pkey_to_zkey (&pub));
call = GNUNET_CONVERSATION_call_start (cfg,
+ ego,
ego,
gns_name,
&call_speaker,