projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psyc/social: local join flag; social service: leave place, save _file
[oweals/gnunet.git]
/
src
/
conversation
/
test_conversation_api.c
diff --git
a/src/conversation/test_conversation_api.c
b/src/conversation/test_conversation_api.c
index d8c10c2bfd879a1f35c5c680fd558ba1a1cef379..a80f5dc0c42b980cb0312561b44f099623d57a9a 100644
(file)
--- a/
src/conversation/test_conversation_api.c
+++ b/
src/conversation/test_conversation_api.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
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
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
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
* @file conversation/test_conversation_api.c
*/
/**
* @file conversation/test_conversation_api.c
@@
-23,8
+23,7
@@
*
* This test performs the operations of a call to a phone
* where the phone user picks up and then the call is
*
* 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"
*/
#include "platform.h"
#include "gnunet_util_lib.h"
@@
-68,9
+67,9
@@
static GNUNET_MICROPHONE_RecordedDataCallback call_rdc;
static void *call_rdc_cls;
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
static void
@@
-132,14
+131,14
@@
play (void *cls,
const void *data)
{
const char *origin = cls;
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"))
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++);
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)) )
{
if ( (data_size != strlen (buf) + 1) ||
(0 != strncmp (buf, data, data_size)) )
{
@@
-149,8
+148,13
@@
play (void *cls,
(int) data_size,
(const char *) data);
}
(int) data_size,
(const char *) data);
}
+ else
+ {
+ fprintf (stderr, ".");
+ }
if ( (20 < call_i) &&
if ( (20 < call_i) &&
- (20 < phone_i) )
+ (20 < phone_i) &&
+ (NULL != call) )
{
/* time to hang up ... */
GNUNET_CONVERSATION_call_stop (call);
{
/* time to hang up ... */
GNUNET_CONVERSATION_call_stop (call);
@@
-225,14
+229,14
@@
disable_mic (void *cls)
phone_rdc = NULL;
phone_rdc_cls = NULL;
GNUNET_SCHEDULER_cancel (phone_task);
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);
}
else
{
call_rdc = NULL;
call_rdc_cls = NULL;
GNUNET_SCHEDULER_cancel (call_task);
- call_task =
GNUNET_SCHEDULER_NO_TASK
;
+ call_task =
NULL
;
}
}
}
}
@@
-326,13
+330,11
@@
static void
phone_event_handler (void *cls,
enum GNUNET_CONVERSATION_PhoneEventCode code,
struct GNUNET_CONVERSATION_Caller *caller,
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;
{
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)
{
GNUNET_break (code == expect);
switch (code)
{
@@
-381,6
+383,7
@@
call_event_handler (void *cls,
break;
case GNUNET_CONVERSATION_EC_CALL_SUSPENDED:
case GNUNET_CONVERSATION_EC_CALL_RESUMED:
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;
}
fprintf (stderr, "Unexpected call code: %d\n", code);
break;
}
@@
-454,6
+457,7
@@
identity_cb (void *cls,
"%s",
GNUNET_GNSRECORD_pkey_to_zkey (&pub));
call = GNUNET_CONVERSATION_call_start (cfg,
"%s",
GNUNET_GNSRECORD_pkey_to_zkey (&pub));
call = GNUNET_CONVERSATION_call_start (cfg,
+ ego,
ego,
gns_name,
&call_speaker,
ego,
gns_name,
&call_speaker,