#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 25)
-static int ok = 1;
+#define LOG(kind,...) \
+ GNUNET_log (kind, __VA_ARGS__)
+
+#define LOG_DEBUG(...) \
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
static const struct GNUNET_CONFIGURATION_Handle *cfg;
static void *phone_rdc_cls;
-static GNUNET_MICROPHONE_RecordedDataCallback call_rdc;
+static GNUNET_SCHEDULER_TaskIdentifier phone_task;
-static void *call_rdc_cls;
+/**
+ * Variable for recognizing caller1
+ */
+static const char *caller1 = "caller1";
-static GNUNET_SCHEDULER_TaskIdentifier phone_task;
+/**
+ * Variable for recognizing caller2
+ */
+static const char *caller2 = "caller2";
+
+/**
+ * Variable for recognizing callee
+ */
+static const char *phone0 = "phone";
+
+
+#define CALLER1 &caller1
+#define CALLER2 &caller2
+#define PHONE0 &phone0
+
+#define CLS_STR(caller) (*((char **)caller))
+
+
+/**
+ * Did caller1 call finish successfully
+ */
+static int call1_finished;
+
+/**
+ * Did caller2 call finish successfully
+ */
+static int call2_finished;
+
+struct MicContext
+{
+ GNUNET_MICROPHONE_RecordedDataCallback rdc;
+
+ void *rdc_cls;
+
+ GNUNET_SCHEDULER_TaskIdentifier call_task;
+
+};
-static GNUNET_SCHEDULER_TaskIdentifier call_task;
+static struct MicContext call1_mic_ctx;
+static struct MicContext call2_mic_ctx;
+//static struct MicContext phone_mic_ctx;
static void
call_send (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ struct MicContext *mc = cls;
char buf[32];
- GNUNET_assert (NULL != call_rdc);
+ GNUNET_assert (NULL != mc->rdc);
GNUNET_snprintf (buf, sizeof (buf), "call");
- call_rdc (call_rdc_cls, strlen (buf) + 1, buf);
- call_task = GNUNET_SCHEDULER_add_delayed (FREQ,
- &call_send, NULL);
+ mc->rdc (mc->rdc_cls, strlen (buf) + 1, buf);
+ mc->call_task = GNUNET_SCHEDULER_add_delayed (FREQ,
+ &call_send, mc);
}
static int
enable_speaker (void *cls)
{
- const char *origin = cls;
+ const char *origin = CLS_STR (cls);
- fprintf (stderr,
- "Speaker %s enabled\n",
- origin);
+ LOG_DEBUG ("Speaker %s enabled\n",
+ origin);
return GNUNET_OK;
}
static void
disable_speaker (void *cls)
{
- const char *origin = cls;
+ const char *origin = CLS_STR (cls);
- fprintf (stderr,
- "Speaker %s disabled\n",
- origin);
+ LOG_DEBUG ("Speaker %s disabled\n",
+ origin);
}
phone_i++;
else
{
- fprintf (stderr,
- "Received unexpected data %.*s\n",
- (int) data_size,
- (const char *) data);
+ LOG_DEBUG ("Received unexpected data %.*s\n",
+ (int) data_size,
+ (const char *) data);
}
if ( (20 < call_i) &&
(20 < phone_i) &&
- (NULL != call2) )
+ (CALLER2 == cls) )
{
/* time to hang up ... */
GNUNET_CONVERSATION_call_stop (call2);
/* reset counters */
call_i = 0;
phone_i = 0;
+ call2_finished = GNUNET_YES;
}
if ( (20 < call_i) &&
(20 < phone_i) &&
- (NULL != call1) )
+ (CALLER1 == cls) )
{
/* time to hang up ... */
GNUNET_CONVERSATION_call_stop (call1);
call1 = NULL;
+ call_i = 0;
+ phone_i = 0;
+ call1_finished = GNUNET_YES;
}
}
static void
destroy_speaker (void *cls)
{
- const char *origin = cls;
+ const char *origin = CLS_STR (cls);
- fprintf (stderr, "Speaker %s destroyed\n", origin);
+ LOG_DEBUG ("Speaker %s destroyed\n", origin);
}
-static struct GNUNET_SPEAKER_Handle call_speaker = {
+static struct GNUNET_SPEAKER_Handle call1_speaker = {
&enable_speaker,
&play,
&disable_speaker,
&destroy_speaker,
- "caller"
+ CALLER1
+};
+
+
+static struct GNUNET_SPEAKER_Handle call2_speaker = {
+ &enable_speaker,
+ &play,
+ &disable_speaker,
+ &destroy_speaker,
+ CALLER2
};
&play,
&disable_speaker,
&destroy_speaker,
- "phone"
+ PHONE0
};
GNUNET_MICROPHONE_RecordedDataCallback rdc,
void *rdc_cls)
{
- const char *origin = cls;
+ const char *origin = CLS_STR (cls);
+ struct MicContext *mc;
- fprintf (stderr,
- "Mic %s enabled\n",
- origin);
- if (0 == strcmp (origin, "phone"))
+ LOG_DEBUG ("Mic %s enabled\n",
+ origin);
+ if (PHONE0 == cls)
{
phone_rdc = rdc;
phone_rdc_cls = rdc_cls;
GNUNET_break (GNUNET_SCHEDULER_NO_TASK == phone_task);
phone_task = GNUNET_SCHEDULER_add_now (&phone_send, NULL);
+ return GNUNET_OK;
}
- else
- {
- call_rdc = rdc;
- call_rdc_cls = rdc_cls;
- GNUNET_break (GNUNET_SCHEDULER_NO_TASK == call_task);
- call_task = GNUNET_SCHEDULER_add_now (&call_send, NULL);
- }
+ 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);
+ mc->call_task = GNUNET_SCHEDULER_add_now (&call_send, mc);
return GNUNET_OK;
}
static void
disable_mic (void *cls)
{
- const char *origin = cls;
+ const char *origin = CLS_STR (cls);
+ struct MicContext *mc;
- fprintf (stderr,
- "Mic %s disabled\n",
- origin);
- if (0 == strcmp (origin, "phone"))
+ LOG_DEBUG ("Mic %s disabled\n",
+ origin);
+ if (PHONE0 == cls)
{
phone_rdc = NULL;
phone_rdc_cls = NULL;
GNUNET_SCHEDULER_cancel (phone_task);
phone_task = GNUNET_SCHEDULER_NO_TASK;
+ return;
}
- else
- {
- call_rdc = NULL;
- call_rdc_cls = NULL;
- GNUNET_SCHEDULER_cancel (call_task);
- call_task = GNUNET_SCHEDULER_NO_TASK;
- }
+ 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;
}
static void
destroy_mic (void *cls)
{
- const char *origin = cls;
+ const char *origin = CLS_STR (cls);
- fprintf (stderr,
- "Mic %s destroyed\n",
- origin);
+ LOG_DEBUG ("Mic %s destroyed\n",
+ origin);
}
-static struct GNUNET_MICROPHONE_Handle call_mic = {
+static struct GNUNET_MICROPHONE_Handle call1_mic = {
+ &enable_mic,
+ &disable_mic,
+ &destroy_mic,
+ CALLER1
+};
+
+
+static struct GNUNET_MICROPHONE_Handle call2_mic = {
&enable_mic,
&disable_mic,
&destroy_mic,
- "caller"
+ CALLER2
};
&enable_mic,
&disable_mic,
&destroy_mic,
- "phone"
+ PHONE0
};
{
case GNUNET_CONVERSATION_EC_CALLER_SUSPEND:
case GNUNET_CONVERSATION_EC_CALLER_RESUME:
- fprintf (stderr, "Unexpected caller code: %d\n", code);
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Unexpected caller code: %d\n", code);
break;
}
}
{
active_caller1 = NULL;
GNUNET_break (NULL == active_caller2);
- ok = 0;
GNUNET_SCHEDULER_shutdown ();
}
break;
default:
- fprintf (stderr, "Unexpected phone code: %d\n", code);
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Unexpected phone code: %d\n", code);
break;
}
}
case GNUNET_CONVERSATION_EC_CALL_RINGING:
break;
case GNUNET_CONVERSATION_EC_CALL_PICKED_UP:
+ LOG_DEBUG ("Call %s picked\n", cid);
break;
case GNUNET_CONVERSATION_EC_CALL_GNS_FAIL:
+ LOG_DEBUG ("Call %s GNS lookup failed \n", cid);
case GNUNET_CONVERSATION_EC_CALL_HUNG_UP:
+ LOG_DEBUG ("Call %s hungup\n", cid);
if (0 == strcmp (cid, "call1"))
call1 = NULL;
else
call2 = NULL;
break;
case GNUNET_CONVERSATION_EC_CALL_SUSPENDED:
+ LOG_DEBUG ("Call %s suspended\n", cid);
+ break;
case GNUNET_CONVERSATION_EC_CALL_RESUMED:
+ LOG_DEBUG ("Call %s resumed\n", cid);
+ break;
+ case GNUNET_CONVERSATION_EC_CALL_ERROR:
+ GNUNET_break (0);
break;
}
}
call1 = GNUNET_CONVERSATION_call_start (cfg,
ego,
gns_name,
- &call_speaker,
- &call_mic,
+ &call1_speaker,
+ &call1_mic,
&call_event_handler,
(void *) "call1");
call2 = GNUNET_CONVERSATION_call_start (cfg,
ego,
gns_name,
- &call_speaker,
- &call_mic,
+ &call2_speaker,
+ &call2_mic,
&call_event_handler,
(void *) "call2");
return;
int
main (int argc, char *argv[])
{
+
if (0 != GNUNET_TESTING_peer_run ("test_conversation_api_twocalls",
"test_conversation.conf",
&run, NULL))
return 1;
- return ok;
+ if (call1_finished && call2_finished)
+ return 0;
+ return 1;
}
/* end of test_conversation_api_twocalls.c */
projects / oweals / gnunet.git / blobdiff