/*
This file is part of GNUnet
- (C) 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2013, 2014 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
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.
*/
/**
*/
enum CallerState
{
- /**
- * We still need to reverse lookup the caller ID.
- */
- CS_RESOLVE,
-
/**
* The phone is ringing (user knows about incoming call).
*/
*/
struct GNUNET_MICROPHONE_Handle *mic;
- /**
- * Active NAMESTORE lookup (or NULL).
- */
- struct GNUNET_NAMESTORE_QueueEntry *qe;
-
/**
* Identity of the person calling us.
*/
struct GNUNET_CRYPTO_EcdsaPublicKey caller_id;
- /**
- * Caller ID of the person calling us as a string.
- */
- char *caller_id_str;
-
/**
* Internal handle to identify the caller with the service.
*/
*/
const struct GNUNET_CONFIGURATION_Handle *cfg;
- /**
- * Handle to talk with CONVERSATION service.
- */
- struct GNUNET_CLIENT_Connection *client;
-
/**
* We keep all callers in a DLL.
*/
reconnect_phone (struct GNUNET_CONVERSATION_Phone *phone);
-/**
- * We have resolved the caller ID using our name service.
- *
- * @param cls the `struct GNUNET_CONVERSATION_Caller`
- * @param zone our zone used for resolution
- * @param label name of the caller
- * @param rd_count number of records we have in @a rd
- * @param rd records we have for the caller's label
- */
-static void
-handle_caller_name (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
- const char *label,
- unsigned int rd_count,
- const struct GNUNET_GNSRECORD_Data *rd)
-{
- struct GNUNET_CONVERSATION_Caller *caller = cls;
- struct GNUNET_CONVERSATION_Phone *phone = caller->phone;
- char *name;
-
- caller->qe = NULL;
- if (NULL == label)
- name = GNUNET_strdup (GNUNET_GNSRECORD_pkey_to_zkey (&caller->caller_id));
- else
- GNUNET_asprintf (&name, "%s.gnu", label);
- caller->caller_id_str = name;
- caller->state = CS_RINGING;
- phone->event_handler (phone->event_handler_cls,
- GNUNET_CONVERSATION_EC_PHONE_RING,
- caller,
- name);
-}
-
-
/**
* Process recorded audio data.
*
* We received a `struct ClientPhoneRingMessage`
*
* @param cls the `struct GNUNET_CONVERSATION_Phone`
- * @param msg the message
+ * @param ring the message
*/
static void
handle_phone_ring (void *cls,
- const struct GNUNET_MessageHeader *msg)
+ const struct ClientPhoneRingMessage *ring)
{
struct GNUNET_CONVERSATION_Phone *phone = cls;
- const struct ClientPhoneRingMessage *ring;
struct GNUNET_CONVERSATION_Caller *caller;
- ring = (const struct ClientPhoneRingMessage *) msg;
switch (phone->state)
{
case PS_REGISTER:
GNUNET_CONTAINER_DLL_insert (phone->caller_head,
phone->caller_tail,
caller);
- caller->state = CS_RESOLVE;
caller->caller_id = ring->caller_id;
caller->cid = ring->cid;
- caller->qe = GNUNET_NAMESTORE_zone_to_name (phone->ns,
- &phone->my_zone,
- &ring->caller_id,
- &handle_caller_name,
- caller);
+ caller->state = CS_RINGING;
+ phone->event_handler (phone->event_handler_cls,
+ GNUNET_CONVERSATION_EC_PHONE_RING,
+ caller,
+ &caller->caller_id);
break;
}
}
/**
* We received a `struct ClientPhoneHangupMessage`.
*
- * @param cls the `struct GNUNET_CONVERSATION_Phone`
+ * @param cls the `struct GNUNET_CONVERSATION_Phone *`
* @param msg the message
*/
static void
handle_phone_hangup (void *cls,
- const struct GNUNET_MessageHeader *msg)
+ const struct ClientPhoneHangupMessage *hang)
{
struct GNUNET_CONVERSATION_Phone *phone = cls;
- const struct ClientPhoneHangupMessage *hang;
struct GNUNET_CONVERSATION_Caller *caller;
- hang = (const struct ClientPhoneHangupMessage *) msg;
for (caller = phone->caller_head; NULL != caller; caller = caller->next)
if (hang->cid == caller->cid)
break;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received HANG_UP message, terminating call with `%s'\n",
- caller->caller_id_str);
+ GNUNET_GNSRECORD_pkey_to_zkey (&caller->caller_id));
switch (caller->state)
{
- case CS_RESOLVE:
- /* application doesn't even know about call yet */
- GNUNET_NAMESTORE_cancel (caller->qe);
- caller->qe = NULL;
- break;
case CS_RINGING:
phone->event_handler (phone->event_handler_cls,
GNUNET_CONVERSATION_EC_PHONE_HUNG_UP,
caller,
- caller->caller_id_str);
+ &caller->caller_id);
break;
case CS_ACTIVE:
caller->speaker->disable_speaker (caller->speaker->cls);
phone->event_handler (phone->event_handler_cls,
GNUNET_CONVERSATION_EC_PHONE_HUNG_UP,
caller,
- caller->caller_id_str);
+ &caller->caller_id);
break;
case CS_CALLEE_SUSPENDED:
case CS_CALLER_SUSPENDED:
phone->event_handler (phone->event_handler_cls,
GNUNET_CONVERSATION_EC_PHONE_HUNG_UP,
caller,
- caller->caller_id_str);
+ &caller->caller_id);
break;
}
GNUNET_CONTAINER_DLL_remove (phone->caller_head,
* We received a `struct ClientPhoneSuspendMessage`.
*
* @param cls the `struct GNUNET_CONVERSATION_Phone`
- * @param msg the message
+ * @param suspend the message
*/
static void
handle_phone_suspend (void *cls,
- const struct GNUNET_MessageHeader *msg)
+ const struct ClientPhoneSuspendMessage *suspend)
{
struct GNUNET_CONVERSATION_Phone *phone = cls;
struct GNUNET_CONVERSATION_Caller *caller;
- const struct ClientPhoneSuspendMessage *suspend;
- suspend = (const struct ClientPhoneSuspendMessage *) msg;
for (caller = phone->caller_head; NULL != caller; caller = caller->next)
if (suspend->cid == caller->cid)
break;
return;
switch (caller->state)
{
- case CS_RESOLVE:
- GNUNET_break_op (0);
- break;
case CS_RINGING:
GNUNET_break_op (0);
break;
* We received a `struct ClientPhoneResumeMessage`.
*
* @param cls the `struct GNUNET_CONVERSATION_Phone`
- * @param msg the message
+ * @param resume the message
*/
static void
handle_phone_resume (void *cls,
- const struct GNUNET_MessageHeader *msg)
+ const struct ClientPhoneResumeMessage *resume)
{
struct GNUNET_CONVERSATION_Phone *phone = cls;
struct GNUNET_CONVERSATION_Caller *caller;
- const struct ClientPhoneResumeMessage *resume;
- resume = (const struct ClientPhoneResumeMessage *) msg;
for (caller = phone->caller_head; NULL != caller; caller = caller->next)
if (resume->cid == caller->cid)
break;
return;
switch (caller->state)
{
- case CS_RESOLVE:
- GNUNET_break_op (0);
- break;
case CS_RINGING:
GNUNET_break_op (0);
break;
}
+/**
+ * We received a `struct ClientAudioMessage`, check it is well-formed.
+ *
+ * @param cls the `struct GNUNET_CONVERSATION_Phone`
+ * @param am the message
+ * @return #GNUNET_OK if @a am is well-formed
+ */
+static int
+check_phone_audio (void *cls,
+ const struct ClientAudioMessage *am)
+{
+ /* any variable-size payload is OK */
+ return GNUNET_OK;
+}
+
+
/**
* We received a `struct ClientAudioMessage`
*
* @param cls the `struct GNUNET_CONVERSATION_Phone`
- * @param msg the message
+ * @param am the message
*/
static void
-handle_phone_audio_message (void *cls,
- const struct GNUNET_MessageHeader *msg)
+handle_phone_audio (void *cls,
+ const struct ClientAudioMessage *am)
{
struct GNUNET_CONVERSATION_Phone *phone = cls;
- const struct ClientAudioMessage *am;
struct GNUNET_CONVERSATION_Caller *caller;
- am = (const struct ClientAudioMessage *) msg;
for (caller = phone->caller_head; NULL != caller; caller = caller->next)
if (am->cid == caller->cid)
break;
return;
switch (caller->state)
{
- case CS_RESOLVE:
- GNUNET_break_op (0);
- break;
case CS_RINGING:
GNUNET_break_op (0);
break;
case CS_ACTIVE:
caller->speaker->play (caller->speaker->cls,
- ntohs (msg->size) - sizeof (struct ClientAudioMessage),
+ ntohs (am->header.size) - sizeof (struct ClientAudioMessage),
&am[1]);
break;
case CS_CALLEE_SUSPENDED:
phone->event_handler (phone->event_handler_cls,
GNUNET_CONVERSATION_EC_PHONE_HUNG_UP,
caller,
- caller->caller_id_str);
+ &caller->caller_id);
GNUNET_CONVERSATION_caller_hang_up (caller);
}
}
static void
reconnect_phone (struct GNUNET_CONVERSATION_Phone *phone)
{
- static struct GNUNET_MQ_MessageHandler handlers[] =
- {
- { &handle_phone_ring,
- GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING,
- sizeof (struct ClientPhoneRingMessage) },
- { &handle_phone_hangup,
- GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP,
- sizeof (struct ClientPhoneHangupMessage) },
- { &handle_phone_suspend,
- GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND,
- sizeof (struct ClientPhoneSuspendMessage) },
- { &handle_phone_resume,
- GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RESUME,
- sizeof (struct ClientPhoneResumeMessage) },
- { &handle_phone_audio_message,
- GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO,
- 0 },
- { NULL, 0, 0 }
+ GNUNET_MQ_hd_fixed_size (phone_ring,
+ GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING,
+ struct ClientPhoneRingMessage);
+ GNUNET_MQ_hd_fixed_size (phone_hangup,
+ GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP,
+ struct ClientPhoneHangupMessage);
+ GNUNET_MQ_hd_fixed_size (phone_suspend,
+ GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND,
+ struct ClientPhoneSuspendMessage);
+ GNUNET_MQ_hd_fixed_size (phone_resume,
+ GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RESUME,
+ struct ClientPhoneResumeMessage);
+ GNUNET_MQ_hd_var_size (phone_audio,
+ GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO,
+ struct ClientAudioMessage);
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ make_phone_ring_handler (phone),
+ make_phone_hangup_handler (phone),
+ make_phone_suspend_handler (phone),
+ make_phone_resume_handler (phone),
+ make_phone_audio_handler (phone),
+ GNUNET_MQ_handler_end ()
};
struct GNUNET_MQ_Envelope *e;
struct ClientPhoneRegisterMessage *reg;
GNUNET_MQ_destroy (phone->mq);
phone->mq = NULL;
}
- if (NULL != phone->client)
- {
- GNUNET_CLIENT_disconnect (phone->client);
- phone->client = NULL;
- }
phone->state = PS_REGISTER;
- phone->client = GNUNET_CLIENT_connect ("conversation", phone->cfg);
- if (NULL == phone->client)
+ phone->mq = GNUNET_CLIENT_connecT (phone->cfg,
+ "conversation",
+ handlers,
+ &phone_error_handler,
+ phone);
+ if (NULL == phone->mq)
return;
- phone->mq = GNUNET_MQ_queue_for_connection_client (phone->client,
- handlers,
- &phone_error_handler,
- phone);
e = GNUNET_MQ_msg (reg, GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_REGISTER);
reg->line = phone->my_record.line;
GNUNET_MQ_send (phone->mq, e);
"CONVERSATION",
"LINE",
&line))
+ {
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "CONVERSATION",
+ "LINE");
return NULL;
+ }
if (line >= (1 << 31))
+ {
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+ "CONVERSATION",
+ "LINE",
+ _("number too large"));
return NULL;
+ }
phone = GNUNET_new (struct GNUNET_CONVERSATION_Phone);
if (GNUNET_OK !=
GNUNET_CRYPTO_get_peer_identity (cfg,
phone->my_record.line = htonl ((uint32_t) line);
phone->my_record.version = htonl (0);
reconnect_phone (phone);
- if ( (NULL == phone->client) ||
+ if ( (NULL == phone->mq) ||
(NULL == phone->ns) )
{
GNUNET_break (0);
switch (caller->state)
{
- case CS_RESOLVE:
- GNUNET_NAMESTORE_cancel (caller->qe);
- caller->qe = NULL;
- break;
case CS_ACTIVE:
caller->speaker->disable_speaker (caller->speaker->cls);
caller->mic->disable_microphone (caller->mic->cls);
GNUNET_CONTAINER_DLL_remove (phone->caller_head,
phone->caller_tail,
caller);
- GNUNET_free_non_null (caller->caller_id_str);
- GNUNET_free (caller);
e = GNUNET_MQ_msg (hang,
GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP);
+ hang->cid = caller->cid;
GNUNET_MQ_send (phone->mq, e);
+ GNUNET_free (caller);
}
GNUNET_MQ_destroy (phone->mq);
phone->mq = NULL;
}
- if (NULL != phone->client)
- {
- GNUNET_CLIENT_disconnect (phone->client);
- phone->client = NULL;
- }
GNUNET_free (phone);
}
projects / oweals / gnunet.git / blobdiff