*
* 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"
#define FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 250)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 25)
+
static int ok = 1;
static const struct GNUNET_CONFIGURATION_Handle *cfg;
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);
}
-static struct GNUNET_SPEAKER_Handle caller_speaker = {
+static struct GNUNET_SPEAKER_Handle call_speaker = {
&enable_speaker,
&play,
&disable_speaker,
&play,
&disable_speaker,
&destroy_speaker,
- "caller"
+ "phone"
};
phone_rdc = NULL;
phone_rdc_cls = NULL;
GNUNET_SCHEDULER_cancel (phone_task);
+ phone_task = GNUNET_SCHEDULER_NO_TASK;
}
else
{
call_rdc = NULL;
call_rdc_cls = NULL;
GNUNET_SCHEDULER_cancel (call_task);
+ call_task = GNUNET_SCHEDULER_NO_TASK;
}
-
}
}
-static struct GNUNET_MICROPHONE_Handle caller_mic = {
+static struct GNUNET_MICROPHONE_Handle call_mic = {
&enable_mic,
&disable_mic,
&destroy_mic,
&enable_mic,
&disable_mic,
&destroy_mic,
- "caller"
+ "phone"
};
break;
case GNUNET_CONVERSATION_EC_CALL_GNS_FAIL:
case GNUNET_CONVERSATION_EC_CALL_HUNG_UP:
+ call = NULL;
+ fprintf (stderr, "Unexpected call code: %d\n", 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;
}
call = GNUNET_CONVERSATION_call_start (cfg,
ego,
gns_name,
- &caller_speaker,
- &caller_mic,
+ &call_speaker,
+ &call_mic,
&call_event_handler,
NULL);
return;
struct GNUNET_TESTING_Peer *peer)
{
cfg = c;
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_MINUTES, 1), &end_test,
+ GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_test,
NULL);
id = GNUNET_IDENTITY_connect (cfg,
&identity_cb,