-fix build system issues
[oweals/gnunet.git] / src / conversation / gnunet-conversation.c
index 9570737f4f2001c7ff5afbd79d8884644616c6ac..a042629cc86be1a29f176871376aa403eecbcd92 100644 (file)
 /*
-                This file is part of GNUnet.
-                (C)
-
-                GNUnet is free software; you can redistribute it and/or modify
-                it under the terms of the GNU General Public License as published
-                by the Free Software Foundation; either version 3, or (at your
-                option) any later version.
-
-                GNUnet is distributed in the hope that it will be useful, but
-                WITHOUT ANY WARRANTY; without even the implied warranty of
-                MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-                General Public License for more details.
-
-                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, InGNUNET_SERVERc., 59 Temple Place - Suite 330,
-                Boston, MA 02111-1307, USA.
-*/
+  This file is part of GNUnet.
+  (C) 2013 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
+  by the Free Software Foundation; either version 3, or (at your
+  option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
+  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.
+*/
 /**
  * @file conversation/gnunet-conversation.c
  * @brief conversation implementation
  * @author Simon Dieterle
  * @author Andreas Fuchs
  */
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_constants.h>
-#include <gnunet/gnunet_util_lib.h>
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_constants.h"
+#include "gnunet_gnsrecord_lib.h"
 #include "gnunet_conversation_service.h"
-#include <fcntl.h>
+#include "gnunet_namestore_service.h"
 
-#define MAX_MESSAGE_LENGTH   (32 * 1024)
 
 /**
-* CONVERSATION handle
-*/
-struct GNUNET_CONVERSATION_Handle *conversation = NULL;
+ * Maximum length allowed for the command line input.
+ */
+#define MAX_MESSAGE_LENGTH 1024
+
 
 /**
-* Task which handles the commands
-*/
-static GNUNET_SCHEDULER_TaskIdentifier handle_cmd_task;
+ * Possible states of the phone.
+ */
+enum PhoneState
+{
+  /**
+   * We're waiting for our own idenitty.
+   */
+  PS_LOOKUP_EGO,
+
+  /**
+   * We're listening for calls
+   */
+  PS_LISTEN,
+
+  /**
+   * We accepted an incoming phone call.
+   */
+  PS_ACCEPTED,
+
+  /**
+   * Internal error
+   */
+  PS_ERROR
+};
+
 
 /**
-* Function declareation for executing a action
-*/
-typedef int (*ActionFunction) (const char *argumetns, const void *xtra);
+ * States for current outgoing call.
+ */
+enum CallState
+{
+  /**
+   * We are looking up some other participant.
+   */
+  CS_RESOLVING,
+
+  /**
+   * We are now ringing the other participant.
+   */
+  CS_RINGING,
+
+  /**
+   * The other party accepted our call and we are now connected.
+   */
+  CS_CONNECTED,
+
+  /**
+   * The call is currently suspended (by us).
+   */
+  CS_SUSPENDED
+
+};
+
+
 
 /**
-* Structure which defines a command
-*/
-struct VoipCommand
+ * List of incoming calls
+ */
+struct CallList
 {
-  const char *command;
-  ActionFunction Action;
-  const char *helptext;
+
+  /**
+   * A DLL.
+   */
+  struct CallList *prev;
+
+  /**
+   * A DLL.
+   */
+  struct CallList *next;
+
+  /**
+   * Handle to hang up or activate.
+   */
+  struct GNUNET_CONVERSATION_Caller *caller;
+
+  /**
+   * String identifying the caller.
+   */
+  char *caller_id;
+
+  /**
+   * Unique number of the call.
+   */
+  unsigned int caller_num;
+
 };
 
-/******************************************************************************/
-/***********************         DECLARATIONS         *************************/
-/******************************************************************************/
 
-static int do_help (const char *args, const void *xtra);
 
-/******************************************************************************/
-/***********************         Functions            *************************/
-/******************************************************************************/
+/**
+ * Phone handle
+ */
+static struct GNUNET_CONVERSATION_Phone *phone;
+
+/**
+ * Call handle (for active outgoing call).
+ */
+static struct GNUNET_CONVERSATION_Call *call;
 
+/**
+ * Caller handle (for active incoming call).
+ */
+static struct CallList *cl_active;
+
+/**
+ * Head of calls waiting to be accepted.
+ */
+static struct CallList *cl_head;
+
+/**
+ * Tail of calls waiting to be accepted.
+ */
+static struct CallList *cl_tail;
+
+/**
+ * Desired phone line.
+ */
+static unsigned int line;
+
+/**
+ * Task which handles the commands
+ */
+static GNUNET_SCHEDULER_TaskIdentifier handle_cmd_task;
+
+/**
+ * Our speaker.
+ */
+static struct GNUNET_SPEAKER_Handle *speaker;
+
+/**
+ * Our microphone.
+ */
+static struct GNUNET_MICROPHONE_Handle *mic;
+
+/**
+ * Our configuration.
+ */
+static struct GNUNET_CONFIGURATION_Handle *cfg;
 
 /**
- * Method called whenever a call is incoming
+ * Our ego.
+ */
+static struct GNUNET_IDENTITY_Ego *caller_id;
+
+/**
+ * Handle to identity service.
+ */
+static struct GNUNET_IDENTITY_Handle *id;
+
+/**
+ * Name of our ego.
+ */
+static char *ego_name;
+
+/**
+ * Name of conversation partner (if any).
+ */
+static char *peer_name;
+
+/**
+ * File handle for stdin.
+ */
+static struct GNUNET_DISK_FileHandle *stdin_fh;
+
+/**
+ * Our phone's current state.
+ */
+static enum PhoneState phone_state;
+
+/**
+ * Our call's current state.
+ */
+static enum CallState call_state;
+
+/**
+ * Counts the number of incoming calls we have had so far.
+ */
+static unsigned int caller_num_gen;
+
+/**
+ * GNS address for this phone.
+ */
+static char *address;
+
+/**
+ * Be verbose.
+ */
+static int verbose;
+
+
+/**
+ * Function called with an event emitted by a phone.
  *
  * @param cls closure
- * @param handle to the conversation session
- * @param caller peer that calls you
+ * @param code type of the event
+ * @param caller handle for the caller
+ * @param caller_id name of the caller in GNS
  */
-void
-call_handler (void *cls, struct GNUNET_CONVERSATION_Handle *handle,
-             const struct GNUNET_PeerIdentity *caller)
+static void
+phone_event_handler (void *cls,
+                     enum GNUNET_CONVERSATION_PhoneEventCode code,
+                     struct GNUNET_CONVERSATION_Caller *caller,
+                     const char *caller_id)
 {
-  FPRINTF (stdout, _("Incoming call from peer: %s\n"),
-          GNUNET_i2s_full (caller));
+  struct CallList *cl;
+
+  switch (code)
+  {
+  case GNUNET_CONVERSATION_EC_PHONE_RING:
+    FPRINTF (stdout,
+             _("Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"),
+             caller_id,
+             caller_num_gen,
+             caller_num_gen);
+    cl = GNUNET_new (struct CallList);
+    cl->caller = caller;
+    cl->caller_id = GNUNET_strdup (caller_id);
+    cl->caller_num = caller_num_gen++;
+    GNUNET_CONTAINER_DLL_insert (cl_head,
+                                 cl_tail,
+                                 cl);
+    break;
+  case GNUNET_CONVERSATION_EC_PHONE_HUNG_UP:
+    for (cl = cl_head; NULL != cl; cl = cl->next)
+      if (caller == cl->caller)
+        break;
+    if (NULL == cl)
+    {
+      GNUNET_break (0);
+      return;
+    }
+    FPRINTF (stdout,
+             _("Call from `%s' terminated\n"),
+             cl->caller_id);
+    GNUNET_CONTAINER_DLL_remove (cl_head,
+                                 cl_tail,
+                                 cl);
+    GNUNET_free (cl->caller_id);
+    if (cl == cl_active)
+    {
+      cl_active = NULL;
+      phone_state = PS_LISTEN;
+    }
+    GNUNET_free (cl);
+    break;
+  }
 }
 
+
 /**
- * Method called whenever a call is rejected
+ * Function called with an event emitted by a caller.
  *
- * @param cls closure
- * @param handle to the conversation session
- * @param peer peer that rejected your call
+ * @param cls closure with the `struct CallList` of the caller
+ * @param code type of the event issued by the caller
  */
-void
-reject_handler (void *cls, struct GNUNET_CONVERSATION_Handle *handle, int reason,
-               const struct GNUNET_PeerIdentity *peer)
+static void
+caller_event_handler (void *cls,
+                      enum GNUNET_CONVERSATION_CallerEventCode code)
 {
-  FPRINTF (stdout, _("Peer %s rejected your call. Reason: %d\n"),
-          GNUNET_i2s_full (peer), reason);
+  struct CallList *cl = cls;
+
+  switch (code)
+  {
+  case GNUNET_CONVERSATION_EC_CALLER_SUSPEND:
+    FPRINTF (stdout,
+             _("Call from `%s' suspended by other user\n"),
+             cl->caller_id);
+    break;
+  case GNUNET_CONVERSATION_EC_CALLER_RESUME:
+    FPRINTF (stdout,
+             _("Call from `%s' resumed by other user\n"),
+             cl->caller_id);
+    break;
+  }
 }
 
+
 /**
- * Method called whenever a notification is there
- *
- * @param cls closure
- * @param handle to the conversation session
- * @param type the type of the notification
- * @param peer peer that the notification is about
+ * Start our phone.
  */
-void
-notification_handler (void *cls, struct GNUNET_CONVERSATION_Handle *handle, int type,
-                     const struct GNUNET_PeerIdentity *peer)
+static void
+start_phone ()
 {
-  switch (type)
-    {
-    case NotificationType_SERVICE_BLOCKED:
-      FPRINTF (stdout, _("The service is already in use. Try again later."));
+  struct GNUNET_GNSRECORD_Data rd;
 
-      break;
+  if (NULL == caller_id)
+  {
+    FPRINTF (stderr,
+             _("Ego `%s' no longer available, phone is now down.\n"),
+             ego_name);
+    phone_state = PS_LOOKUP_EGO;
+    return;
+  }
+  GNUNET_assert (NULL == phone);
+  phone = GNUNET_CONVERSATION_phone_create (cfg,
+                                            caller_id,
+                                            &phone_event_handler, NULL);
+  /* FIXME: get record and print full GNS record info later here... */
+  if (NULL == phone)
+  {
+    FPRINTF (stderr,
+             "%s",
+             _("Failed to setup phone (internal error)\n"));
+    phone_state = PS_ERROR;
+  }
+  else
+  {
+    GNUNET_CONVERSATION_phone_get_record (phone,
+                                          &rd);
+    GNUNET_free_non_null (address);
+    address = GNUNET_GNSRECORD_value_to_string (rd.record_type,
+                                                rd.data,
+                                                rd.data_size);
+    FPRINTF (stdout,
+             _("Phone active on line %u.  Type `/help' for a list of available commands\n"),
+             (unsigned int) line);
+    phone_state = PS_LISTEN;
+  }
+}
 
-    case NotificationType_NO_PEER:
-      FPRINTF (stdout, _("The Peer you were calling is no correct peer.\n"));
 
-      break;
+/**
+ * Function called with an event emitted by a call.
+ *
+ * @param cls closure, NULL
+ * @param code type of the event on the call
+ */
+static void
+call_event_handler (void *cls,
+                    enum GNUNET_CONVERSATION_CallEventCode code)
+{
+  switch (code)
+  {
+  case GNUNET_CONVERSATION_EC_CALL_RINGING:
+    GNUNET_break (CS_RESOLVING == call_state);
+    FPRINTF (stdout,
+             _("Resolved address of `%s'. Now ringing other party.\n"),
+             peer_name);
+    call_state = CS_RINGING;
+    break;
+  case GNUNET_CONVERSATION_EC_CALL_PICKED_UP:
+    GNUNET_break (CS_RINGING == call_state);
+    FPRINTF (stdout,
+             _("Connection established to `%s'\n"),
+             peer_name);
+    call_state = CS_CONNECTED;
+    break;
+  case GNUNET_CONVERSATION_EC_CALL_GNS_FAIL:
+    GNUNET_break (CS_RESOLVING == call_state);
+    FPRINTF (stdout,
+             _("Failed to resolve `%s'\n"),
+             ego_name);
+    call = NULL;
+    break;
+  case GNUNET_CONVERSATION_EC_CALL_HUNG_UP:
+    FPRINTF (stdout,
+             "%s",
+             _("Call terminated\n"));
+    call = NULL;
+    break;
+  case GNUNET_CONVERSATION_EC_CALL_SUSPENDED:
+    GNUNET_break (CS_CONNECTED == call_state);
+    FPRINTF (stdout,
+             _("Connection to `%s' suspended (by other user)\n"),
+             peer_name);
+    break;
+  case GNUNET_CONVERSATION_EC_CALL_RESUMED:
+    GNUNET_break (CS_CONNECTED == call_state);
+    FPRINTF (stdout,
+             _("Connection to `%s' resumed (by other user)\n"),
+             peer_name);
+    break;
+  case GNUNET_CONVERSATION_EC_CALL_ERROR:
+    FPRINTF (stdout,
+             _("Error with the call, restarting it\n"));
+    call_state = CS_RESOLVING;
+    break;
+  }
+}
 
-    case NotificationType_NO_ANSWER:
-      FPRINTF (stdout, _("Peer %s did not answer your call.\n"),
-              GNUNET_i2s_full (peer));
 
-      break;
+/**
+ * Function declareation for executing a action
+ *
+ * @param arguments arguments given to the function
+ */
+typedef void (*ActionFunction) (const char *arguments);
 
-    case NotificationType_AVAILABLE_AGAIN:
-      FPRINTF (stdout, _("Peer %s is now available.\n"),
-              GNUNET_i2s_full (peer));
 
-      break;
+/**
+ * Structure which defines a command
+ */
+struct VoipCommand
+{
+  /**
+   * Command the user needs to enter.
+   */
+  const char *command;
 
-    case NotificationType_CALL_ACCEPTED:
-      FPRINTF (stdout, _("Peer %s has accepted your call.\n"),
-              GNUNET_i2s_full (peer));
+  /**
+   * Function to call on command.
+   */
+  ActionFunction Action;
 
-      break;
+  /**
+   * Help text for the command.
+   */
+  const char *helptext;
+};
 
-    case NotificationType_CALL_TERMINATED:
-      FPRINTF (stdout, _("Peer %s has terminated the call.\n"),
-              GNUNET_i2s_full (peer));
-      break;
-    }
 
-}
+/**
+ * Action function to print help for the command shell.
+ *
+ * @param args arguments given to the command
+ */
+static void
+do_help (const char *args);
+
 
 /**
- * Method called whenever a notification for missed calls is there
+ * Terminate the client
  *
- * @param cls closure
- * @param handle to the conversation session
- * @param missed_calls a list of missed calls
+ * @param args arguments given to the command
  */
-void
-missed_call_handler (void *cls, struct GNUNET_CONVERSATION_Handle *handle,
-                    struct GNUNET_CONVERSATION_MissedCallNotification *missed_calls)
+static void
+do_quit (const char *args)
 {
-  FPRINTF (stdout, _("You have missed calls.\n"));
+  GNUNET_SCHEDULER_shutdown ();
 }
 
+
 /**
-* Terminating the client
-*/
-static int
-do_quit (const char *args, const void *xtra)
+ * Handler for unknown command.
+ *
+ * @param msg arguments given to the command
+ */
+static void
+do_unknown (const char *msg)
 {
-  return GNUNET_SYSERR;
+  FPRINTF (stderr,
+          _("Unknown command `%s'\n"),
+          msg);
 }
 
+
 /**
-*
-*/
-static int
-do_unknown (const char *msg, const void *xtra)
+ * Initiating a new call
+ *
+ * @param arg arguments given to the command
+ */
+static void
+do_call (const char *arg)
 {
-  FPRINTF (stderr, _("Unknown command `%s'\n"), msg);
-  return GNUNET_OK;
+  if (NULL == caller_id)
+  {
+    FPRINTF (stderr,
+             _("Ego `%s' not available\n"),
+             ego_name);
+    return;
+  }
+  if (NULL != call)
+  {
+    FPRINTF (stderr,
+             _("You are calling someone else already, hang up first!\n"));
+    return;
+  }
+  switch (phone_state)
+  {
+  case PS_LOOKUP_EGO:
+    FPRINTF (stderr,
+             _("Ego `%s' not available\n"),
+             ego_name);
+    return;
+  case PS_LISTEN:
+    /* ok to call! */
+    break;
+  case PS_ACCEPTED:
+    FPRINTF (stderr,
+             _("You are answering call from `%s', hang up or suspend that call first!\n"),
+             peer_name);
+    return;
+  case PS_ERROR:
+    /* ok to call */
+    break;
+  }
+  GNUNET_free_non_null (peer_name);
+  if (NULL == arg)
+  {
+    FPRINTF (stderr,
+             _("Call recipient missing.\n"));
+    do_help ("/call");
+    return;
+  }
+  peer_name = GNUNET_strdup (arg);
+  call_state = CS_RESOLVING;
+  GNUNET_assert (NULL == call);
+  call = GNUNET_CONVERSATION_call_start (cfg,
+                                         caller_id,
+                                         arg,
+                                         speaker,
+                                         mic,
+                                         &call_event_handler, NULL);
 }
 
+
 /**
-* Initiating a new call
-*/
-static int
-do_call (const char *arg, const void *xtra)
+ * Accepting an incoming call
+ *
+ * @param args arguments given to the command
+ */
+static void
+do_accept (const char *args)
 {
-  char *callee = GNUNET_strdup (arg);
-  FPRINTF (stdout, _("Initiating call to: %s\n"), callee);
-  GNUNET_CONVERSATION_call (conversation, callee, GNUNET_YES);
+  struct CallList *cl;
+  char buf[32];
+
+  if ( (NULL != call) &&
+       (CS_SUSPENDED != call_state) )
+  {
+    FPRINTF (stderr,
+             _("You are calling someone else already, hang up first!\n"));
+    return;
+  }
+  switch (phone_state)
+  {
+  case PS_LOOKUP_EGO:
+    GNUNET_break (0);
+    break;
+  case PS_LISTEN:
+    /* this is the expected state */
+    break;
+  case PS_ACCEPTED:
+    FPRINTF (stderr,
+             _("You are answering call from `%s', hang up or suspend that call first!\n"),
+             peer_name);
+    return;
+  case PS_ERROR:
+    GNUNET_break (0);
+    break;
+  }
+  cl = cl_head;
+  if (NULL == cl)
+  {
+    FPRINTF (stderr,
+             _("There is no incoming call to accept here!\n"));
+    return;
+  }
+  if ( (NULL != cl->next) || (NULL != args) )
+  {
+    for (cl = cl_head; NULL != cl; cl = cl->next)
+    {
+      GNUNET_snprintf (buf, sizeof (buf),
+                       "%u",
+                       cl->caller_num);
+      if (0 == strcmp (buf, args))
+        break;
+    }
+  }
+  if (NULL == cl)
+  {
+    FPRINTF (stderr,
+             _("There is no incoming call `%s' to accept right now!\n"),
+             args);
+    return;
+  }
+  cl_active = cl;
+  GNUNET_free_non_null (peer_name);
+  peer_name = GNUNET_strdup (cl->caller_id);
+  phone_state = PS_ACCEPTED;
+  GNUNET_CONVERSATION_caller_pick_up (cl->caller,
+                                      &caller_event_handler,
+                                      cl,
+                                      speaker,
+                                      mic);
+}
+
 
-  return GNUNET_OK;
+/**
+ * Print address information for this phone.
+ *
+ * @param args arguments given to the command
+ */
+static void
+do_address (const char *args)
+{
+  if (NULL == address)
+  {
+    FPRINTF (stdout,
+             "%s",
+             _("We currently do not have an address.\n"));
+    return;
+  }
+  FPRINTF (stdout,
+           "%s\n",
+           address);
 }
 
+
 /**
-* Initiating a new call
-*/
-static int
-do_call_peer (const char *arg, const void *xtra)
+ * Accepting an incoming call
+ *
+ * @param args arguments given to the command
+ */
+static void
+do_status (const char *args)
 {
-  char *callee = GNUNET_strdup (arg);
-  FPRINTF (stdout, _("Initiating call to: %s\n"), callee);
-  GNUNET_CONVERSATION_call (conversation, callee, GNUNET_NO);
+  struct CallList *cl;
 
-  return GNUNET_OK;
+  switch (phone_state)
+  {
+  case PS_LOOKUP_EGO:
+    FPRINTF (stdout,
+             _("We are currently trying to locate the private key for the ego `%s'.\n"),
+             ego_name);
+    break;
+  case PS_LISTEN:
+    FPRINTF (stdout,
+             _("We are listening for incoming calls for ego `%s' on line %u.\n"),
+             ego_name,
+             line);
+    break;
+  case PS_ACCEPTED:
+    FPRINTF (stdout,
+             _("You are having a conversation with `%s'.\n"),
+             peer_name);
+    break;
+  case PS_ERROR:
+    FPRINTF (stdout,
+             _("We had an internal error setting up our phone line. You can still make calls.\n"));
+    break;
+  }
+  if (NULL != call)
+  {
+    switch (call_state)
+    {
+    case CS_RESOLVING:
+      FPRINTF (stdout,
+               _("We are trying to find the network address to call `%s'.\n"),
+               peer_name);
+      break;
+    case CS_RINGING:
+      FPRINTF (stdout,
+               _("We are calling `%s', his phone should be ringing.\n"),
+               peer_name);
+      break;
+    case CS_CONNECTED:
+      FPRINTF (stdout,
+               _("You are having a conversation with `%s'.\n"),
+               peer_name);
+      break;
+    case CS_SUSPENDED:
+      /* ok to accept incoming call right now */
+      break;
+    }
+  }
+  if ( (NULL != cl_head) &&
+       ( (cl_head != cl_active) ||
+         (cl_head != cl_tail) ) )
+  {
+    FPRINTF (stdout,
+             "%s",
+             _("Calls waiting:\n"));
+    for (cl = cl_head; NULL != cl; cl = cl->next)
+    {
+      if (cl == cl_active)
+        continue;
+      FPRINTF (stdout,
+               _("#%u: `%s'\n"),
+               cl->caller_num,
+               cl->caller_id);
+    }
+    FPRINTF (stdout,
+             "%s",
+             "\n");
+  }
 }
 
+
 /**
-* Accepting an incoming call
-*/
-static int
-do_accept (const char *args, const void *xtra)
+ * Suspending a call
+ *
+ * @param args arguments given to the command
+ */
+static void
+do_suspend (const char *args)
 {
-  FPRINTF (stdout, _("Accepting the call\n"));
-  GNUNET_CONVERSATION_accept (conversation);
-
-  return GNUNET_OK;
+  if (NULL != call)
+  {
+    switch (call_state)
+    {
+    case CS_RESOLVING:
+    case CS_RINGING:
+    case CS_SUSPENDED:
+      FPRINTF (stderr,
+               "%s",
+               _("There is no call that could be suspended right now.\n"));
+      return;
+    case CS_CONNECTED:
+      call_state = CS_SUSPENDED;
+      GNUNET_CONVERSATION_call_suspend (call);
+      return;
+    }
+  }
+  switch (phone_state)
+  {
+  case PS_LOOKUP_EGO:
+  case PS_LISTEN:
+  case PS_ERROR:
+    FPRINTF (stderr,
+             "%s",
+             _("There is no call that could be suspended right now.\n"));
+    return;
+  case PS_ACCEPTED:
+    /* expected state, do rejection logic */
+    break;
+  }
+  GNUNET_assert (NULL != cl_active);
+  GNUNET_CONVERSATION_caller_suspend (cl_active->caller);
+  cl_active = NULL;
+  phone_state = PS_LISTEN;
 }
 
+
 /**
-* Rejecting a call
-*/
-static int
-do_reject (const char *args, const void *xtra)
+ * Resuming a call
+ *
+ * @param args arguments given to the command
+ */
+static void
+do_resume (const char *args)
 {
-  FPRINTF (stdout, _("Rejecting the call\n"));
-  GNUNET_CONVERSATION_reject (conversation);
+  struct CallList *cl;
+  char buf[32];
 
-  return GNUNET_OK;
+  if (NULL != call)
+  {
+    switch (call_state)
+    {
+    case CS_RESOLVING:
+    case CS_RINGING:
+    case CS_CONNECTED:
+      FPRINTF (stderr,
+               "%s",
+               _("There is no call that could be resumed right now.\n"));
+      return;
+    case CS_SUSPENDED:
+      call_state = CS_CONNECTED;
+      GNUNET_CONVERSATION_call_resume (call,
+                                       speaker,
+                                       mic);
+      return;
+    }
+  }
+  switch (phone_state)
+  {
+  case PS_LOOKUP_EGO:
+  case PS_ERROR:
+    FPRINTF (stderr,
+             "%s",
+             _("There is no call that could be resumed right now.\n"));
+    return;
+  case PS_LISTEN:
+    /* expected state, do resume logic */
+    break;
+  case PS_ACCEPTED:
+    FPRINTF (stderr,
+             _("Already talking with `%s', cannot resume a call right now.\n"),
+             peer_name);
+    return;
+  }
+  GNUNET_assert (NULL == cl_active);
+  cl = cl_head;
+  if (NULL == cl)
+  {
+    FPRINTF (stderr,
+             _("There is no incoming call to resume here!\n"));
+    return;
+  }
+  if ( (NULL != cl->next) || (NULL != args) )
+  {
+    for (cl = cl_head; NULL != cl; cl = cl->next)
+    {
+      GNUNET_snprintf (buf, sizeof (buf),
+                       "%u",
+                       cl->caller_num);
+      if (0 == strcmp (buf, args))
+        break;
+    }
+  }
+  if (NULL == cl)
+  {
+    FPRINTF (stderr,
+             _("There is no incoming call `%s' to resume right now!\n"),
+             args);
+    return;
+  }
+  cl_active = cl;
+  GNUNET_CONVERSATION_caller_resume (cl_active->caller,
+                                     speaker,
+                                     mic);
+  phone_state = PS_ACCEPTED;
 }
 
+
 /**
-* Terminating a call
-*/
-static int
-do_hang_up (const char *args, const void *xtra)
+ * Rejecting a call
+ *
+ * @param args arguments given to the command
+ */
+static void
+do_reject (const char *args)
 {
-  FPRINTF (stdout, _("Terminating the call\n"));
-  GNUNET_CONVERSATION_hangup (conversation);
+  struct CallList *cl;
+  char buf[32];
 
-  return GNUNET_OK;
+  if (NULL != call)
+  {
+    GNUNET_CONVERSATION_call_stop (call);
+    call = NULL;
+    return;
+  }
+  switch (phone_state)
+  {
+  case PS_LOOKUP_EGO:
+  case PS_ERROR:
+    FPRINTF (stderr,
+             "%s",
+             _("There is no call that could be cancelled right now.\n"));
+    return;
+  case PS_LISTEN:
+    /* look for active incoming calls to refuse */
+    cl = cl_head;
+    if (NULL == cl)
+    {
+      FPRINTF (stderr,
+               _("There is no incoming call to refuse here!\n"));
+      return;
+    }
+    if ( (NULL != cl->next) || (NULL != args) )
+    {
+      for (cl = cl_head; NULL != cl; cl = cl->next)
+      {
+        GNUNET_snprintf (buf, sizeof (buf),
+                         "%u",
+                         cl->caller_num);
+        if (0 == strcmp (buf, args))
+          break;
+      }
+    }
+    if (NULL == cl)
+    {
+      FPRINTF (stderr,
+               _("There is no incoming call `%s' to refuse right now!\n"),
+               args);
+      return;
+    }
+    GNUNET_CONVERSATION_caller_hang_up (cl->caller);
+    GNUNET_CONTAINER_DLL_remove (cl_head,
+                                 cl_tail,
+                                 cl);
+    GNUNET_free (cl->caller_id);
+    GNUNET_free (cl);
+    break;
+  case PS_ACCEPTED:
+    /* expected state, do rejection logic */
+    GNUNET_assert (NULL != cl_active);
+    GNUNET_CONVERSATION_caller_hang_up (cl_active->caller);
+    cl_active = NULL;
+    phone_state = PS_LISTEN;
+    break;
+  }
 }
 
+
 /**
  * List of supported commands.
  */
 static struct VoipCommand commands[] = {
-  {"/call ", &do_call, gettext_noop ("Use `/call gads_record'")},
-  {"/callpeer ", &do_call_peer,
-   gettext_noop ("Use `/call private_key' to call a person")},
+  {"/address", &do_address,
+   gettext_noop ("Use `/address' to find out which address this phone should have in GNS")},
+  {"/call", &do_call,
+   gettext_noop ("Use `/call USER.gnu' to call USER")},
   {"/accept", &do_accept,
-   gettext_noop ("Use `/accept' to accept an incoming call")},
-  {"/terminate", &do_hang_up,
-   gettext_noop ("Use `/terminate' to end a call")},
-  {"/reject", &do_reject,
-   gettext_noop ("Use `/rejet' to reject an incoming call")},
-  {"/quit", &do_quit, gettext_noop ("Use `/quit' to terminate gnunet-conversation")},
+   gettext_noop ("Use `/accept #NUM' to accept incoming call #NUM")},
+  {"/suspend", &do_suspend,
+   gettext_noop ("Use `/suspend' to suspend the active call")},
+  {"/resume", &do_resume,
+   gettext_noop ("Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming calls, no argument is needed to resume the current outgoing call.")},
+  {"/cancel", &do_reject,
+   gettext_noop ("Use `/cancel' to reject or terminate a call")},
+  {"/status", &do_status,
+   gettext_noop ("Use `/status' to print status information")},
+  {"/quit", &do_quit,
+   gettext_noop ("Use `/quit' to terminate gnunet-conversation")},
   {"/help", &do_help,
    gettext_noop ("Use `/help command' to get help for a specific command")},
-  {"/", &do_unknown, NULL},
-  {"", &do_unknown, NULL},
+  {"", &do_unknown,
+   NULL},
   {NULL, NULL, NULL},
 };
 
+
 /**
-*
-*/
-static int
-do_help (const char *args, const void *xtra)
+ * Action function to print help for the command shell.
+ *
+ * @param args arguments given to the command
+ */
+static void
+do_help (const char *args)
 {
-  int i;
+  unsigned int i;
 
   i = 0;
-  while ((NULL != args) && (0 != strlen (args)) &&
-        (commands[i].Action != &do_help))
+  while ( (NULL != args) &&
+          (0 != strlen (args)) &&
+          (commands[i].Action != &do_help))
+  {
+    if (0 ==
+       strncasecmp (&args[1], &commands[i].command[1], strlen (args) - 1))
     {
-      if (0 ==
-         strncasecmp (&args[1], &commands[i].command[1], strlen (args) - 1))
-       {
-         FPRINTF (stdout, "%s\n", gettext (commands[i].helptext));
-         return GNUNET_OK;
-       }
-      i++;
+      FPRINTF (stdout,
+              "%s\n",
+              gettext (commands[i].helptext));
+      return;
     }
+    i++;
+  }
   i = 0;
-  FPRINTF (stdout, "%s", "Available commands:");
+  FPRINTF (stdout,
+          "%s",
+          "Available commands:\n");
   while (commands[i].Action != &do_help)
-    {
-      FPRINTF (stdout, " %s", gettext (commands[i].command));
-      i++;
-    }
-  FPRINTF (stdout, "%s", "\n");
-  FPRINTF (stdout, "%s\n", gettext (commands[i].helptext));
-  return GNUNET_OK;
+  {
+    FPRINTF (stdout,
+            "%s\n",
+            gettext (commands[i].command));
+    i++;
+  }
+  FPRINTF (stdout,
+          "%s",
+          "\n");
+  FPRINTF (stdout,
+          "%s\n",
+          gettext (commands[i].helptext));
 }
 
+
 /**
-*
-*/
+ * Task run during shutdown.
+ *
+ * @param cls NULL
+ * @param tc unused
+ */
 static void
-do_stop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_stop_task (void *cls,
+             const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Running shutdown task\n");
-  GNUNET_CONVERSATION_disconnect (conversation);
-
-  if (handle_cmd_task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (handle_cmd_task);
-      handle_cmd_task = GNUNET_SCHEDULER_NO_TASK;
-    }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Running shutdown task finished\n");
+  if (NULL != call)
+  {
+    GNUNET_CONVERSATION_call_stop (call);
+    call = NULL;
+  }
+  if (NULL != phone)
+  {
+    GNUNET_CONVERSATION_phone_destroy (phone);
+    phone = NULL;
+  }
+  if (GNUNET_SCHEDULER_NO_TASK != handle_cmd_task)
+  {
+    GNUNET_SCHEDULER_cancel (handle_cmd_task);
+    handle_cmd_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  if (NULL != id)
+  {
+    GNUNET_IDENTITY_disconnect (id);
+    id = NULL;
+  }
+  GNUNET_SPEAKER_destroy (speaker);
+  speaker = NULL;
+  GNUNET_MICROPHONE_destroy (mic);
+  mic = NULL;
+  GNUNET_free (ego_name);
+  ego_name = NULL;
+  GNUNET_free_non_null (peer_name);
+  phone_state = PS_ERROR;
 }
 
+
 /**
-*
-*/
-void
-handle_command (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+ * Task to handle commands from the terminal.
+ *
+ * @param cls NULL
+ * @param tc scheduler context
+ */
+static void
+handle_command (void *cls,
+               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   char message[MAX_MESSAGE_LENGTH + 1];
-  int i;
+  const char *ptr;
+  size_t i;
 
+  handle_cmd_task =
+    GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+                                    stdin_fh,
+                                    &handle_command, NULL);
   /* read message from command line and handle it */
   memset (message, 0, MAX_MESSAGE_LENGTH + 1);
   if (NULL == fgets (message, MAX_MESSAGE_LENGTH, stdin))
-    goto next;
-  if (strlen (message) == 0)
-    goto next;
+    return;
+  if (0 == strlen (message))
+    return;
   if (message[strlen (message) - 1] == '\n')
     message[strlen (message) - 1] = '\0';
-  if (strlen (message) == 0)
-    goto next;
+  if (0 == strlen (message))
+    return;
   i = 0;
   while ((NULL != commands[i].command) &&
-        (0 !=
-         strncasecmp (commands[i].command, message,
-                      strlen (commands[i].command))))
+        (0 != strncasecmp (commands[i].command, message,
+                            strlen (commands[i].command))))
     i++;
-  if (GNUNET_OK !=
-      commands[i].Action (&message[strlen (commands[i].command)], NULL))
-    goto out;
+  ptr = &message[strlen (commands[i].command)];
+  while (isspace ((int) *ptr))
+    ptr++;
+  if ('\0' == *ptr)
+    ptr = NULL;
+  commands[i].Action (ptr);
+}
 
-next:
-  handle_cmd_task =
-    GNUNET_SCHEDULER_add_delayed_with_priority (GNUNET_TIME_relative_multiply
-                                               (GNUNET_TIME_UNIT_MILLISECONDS,
-                                                100),
-                                               GNUNET_SCHEDULER_PRIORITY_UI,
-                                               &handle_command, NULL);
-  return;
-
-out:
-  handle_cmd_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_SCHEDULER_shutdown ();
+
+/**
+ * Function called by identity service with information about egos.
+ *
+ * @param cls NULL
+ * @param ego ego handle
+ * @param ctx unused
+ * @param name name of the ego
+ */
+static void
+identity_cb (void *cls,
+             struct GNUNET_IDENTITY_Ego *ego,
+             void **ctx,
+             const char *name)
+{
+  if (NULL == name)
+    return;
+  if (ego == caller_id)
+  {
+    if (verbose)
+      FPRINTF (stdout,
+               _("Name of our ego changed to `%s'\n"),
+               name);
+    GNUNET_free (ego_name);
+    ego_name = GNUNET_strdup (name);
+    return;
+  }
+  if (0 != strcmp (name,
+                   ego_name))
+    return;
+  if (NULL == ego)
+  {
+    if (verbose)
+      FPRINTF (stdout,
+               _("Our ego `%s' was deleted!\n"),
+               ego_name);
+    caller_id = NULL;
+    return;
+  }
+  caller_id = ego;
+  GNUNET_CONFIGURATION_set_value_number (cfg,
+                                         "CONVERSATION",
+                                         "LINE",
+                                         line);
+  start_phone ();
 }
 
+
 /**
  * Main function that will be run by the scheduler.
  *
@@ -366,18 +1126,24 @@ out:
  * @param c configuration
  */
 static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  if (NULL ==
-      (conversation =
-       GNUNET_CONVERSATION_connect (c, NULL, &call_handler, &reject_handler,
-                           &notification_handler, &missed_call_handler)))
-    {
-      FPRINTF (stderr, "%s", _("Could not access CONVERSATION service.  Exiting.\n"));
-      return;
-    }
-
+  cfg = GNUNET_CONFIGURATION_dup (c);
+  speaker = GNUNET_SPEAKER_create_from_hardware (cfg);
+  mic = GNUNET_MICROPHONE_create_from_hardware (cfg);
+  if (NULL == ego_name)
+  {
+    FPRINTF (stderr,
+             "%s",
+             _("You must specify the NAME of an ego to use\n"));
+    return;
+  }
+  id = GNUNET_IDENTITY_connect (cfg,
+                                &identity_cb,
+                                NULL);
   handle_cmd_task =
     GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_UI,
                                        &handle_command, NULL);
@@ -385,7 +1151,9 @@ run (void *cls, char *const *args, const char *cfgfile,
                                NULL);
 }
 
-/** * The main function to conversation.
+
+/**
+ * The main function to conversation.
  *
  * @param argc number of arguments from the command line
  * @param argv command line arguments
@@ -395,25 +1163,34 @@ int
 main (int argc, char *const *argv)
 {
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    {'e', "ego", "NAME",
+     gettext_noop ("sets the NAME of the ego to use for the phone (and name resolution)"),
+     1, &GNUNET_GETOPT_set_string, &ego_name},
+    {'p', "phone", "LINE",
+      gettext_noop ("sets the LINE to use for the phone"),
+     1, &GNUNET_GETOPT_set_uint, &line},
     GNUNET_GETOPT_OPTION_END
   };
-
   int flags;
   int ret;
 
   flags = fcntl (0, F_GETFL, 0);
   flags |= O_NONBLOCK;
   fcntl (0, F_SETFL, flags);
-
+  stdin_fh = GNUNET_DISK_get_handle_from_int_fd (0);
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
-
-  ret = GNUNET_PROGRAM_run (argc, argv, "gnunet-conversation",
-                           gettext_noop ("Print information about conversation."),
+  ret = GNUNET_PROGRAM_run (argc, argv,
+                            "gnunet-conversation",
+                           gettext_noop ("Enables having a conversation with other GNUnet users."),
                            options, &run, NULL);
   GNUNET_free ((void *) argv);
-
-  return ret;
+  if (NULL != cfg)
+  {
+    GNUNET_CONFIGURATION_destroy (cfg);
+    cfg = NULL;
+  }
+  return (GNUNET_OK == ret) ? 0 : 1;
 }
 
 /* end of gnunet-conversation.c */