gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r29879 - in gnunet/src: conversation include


From: gnunet
Subject: [GNUnet-SVN] r29879 - in gnunet/src: conversation include
Date: Sat, 5 Oct 2013 21:25:51 +0200

Author: grothoff
Date: 2013-10-05 21:25:51 +0200 (Sat, 05 Oct 2013)
New Revision: 29879

Modified:
   gnunet/src/conversation/gnunet-conversation.c
   gnunet/src/conversation/gnunet-service-conversation.c
   gnunet/src/include/gnunet_conversation_service.h
Log:
-fix double-free, clarify API

Modified: gnunet/src/conversation/gnunet-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-conversation.c       2013-10-05 19:10:09 UTC 
(rev 29878)
+++ gnunet/src/conversation/gnunet-conversation.c       2013-10-05 19:25:51 UTC 
(rev 29879)
@@ -296,7 +296,6 @@
     FPRINTF (stdout,
              _("Failed to resolve `%s'\n"),
              ego_name);
-    GNUNET_CONVERSATION_call_stop (call, NULL);
     call = NULL;
     start_phone ();
     break;
@@ -305,7 +304,6 @@
     FPRINTF (stdout,
              "%s",
              _("Line busy\n"));
-    GNUNET_CONVERSATION_call_stop (call, NULL);
     call = NULL;
     start_phone ();
     break;
@@ -315,7 +313,6 @@
     FPRINTF (stdout,
              _("Call terminated: %s\n"),
              va_arg (va, const char *));
-    GNUNET_CONVERSATION_call_stop (call, NULL);
     call = NULL;
     start_phone ();
     break;

Modified: gnunet/src/conversation/gnunet-service-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-service-conversation.c       2013-10-05 
19:10:09 UTC (rev 29878)
+++ gnunet/src/conversation/gnunet-service-conversation.c       2013-10-05 
19:25:51 UTC (rev 29879)
@@ -295,7 +295,7 @@
   }
   line->status = LS_CALLEE_CONNECTED;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending PICK_UP message to client with meta data `%s'\n",
+              "Sending PICK_UP message to mesh with meta data `%s'\n",
               meta);
   e = GNUNET_MQ_msg_extra (mppm,
                            len,
@@ -880,7 +880,7 @@
   pick->header.type = htons 
(GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP);
   memcpy (&pick[1], metadata, len);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending PICK UP message via mesh with metadata `%s'\n",
+              "Sending PICKED UP message to client with metadata `%s'\n",
               metadata);
   GNUNET_SERVER_notification_context_unicast (nc,
                                               line->client,
@@ -895,7 +895,7 @@
   if (NULL == line->tunnel_unreliable)
   {
     GNUNET_break (0);
-  }
+  } 
   return GNUNET_OK;
 }
 

Modified: gnunet/src/include/gnunet_conversation_service.h
===================================================================
--- gnunet/src/include/gnunet_conversation_service.h    2013-10-05 19:10:09 UTC 
(rev 29878)
+++ gnunet/src/include/gnunet_conversation_service.h    2013-10-05 19:25:51 UTC 
(rev 29879)
@@ -127,18 +127,24 @@
   GNUNET_CONVERSATION_EC_READY,
 
   /**
-   * We failed to locate a phone record in GNS.
+   * We failed to locate a phone record in GNS.  After this invocation,
+   * the respective call handle will be automatically destroyed and the
+   * client must no longer call #GNUNET_CONVERSATION_call_stop.
    */
   GNUNET_CONVERSATION_EC_GNS_FAIL,
 
   /**
-   * The phone is busy.  Varargs will be empty.
+   * The phone is busy.  Varargs will be empty.   After this invocation,
+   * the respective call handle will be automatically destroyed and the
+   * client must no longer call #GNUNET_CONVERSATION_call_stop.
    */
   GNUNET_CONVERSATION_EC_BUSY,
   
   /**
-   * The conversation was terminated, a reason may be supplied
-   * as a `const char *` in the varargs.
+   * The conversation was terminated, a reason may be supplied as a
+   * `const char *` in the varargs.  After this invocation, the
+   * respective call handle will be automatically destroyed and the
+   * client must no longer call #GNUNET_CONVERSATION_call_stop.
    */
   GNUNET_CONVERSATION_EC_TERMINATED
   




reply via email to

[Prev in Thread] Current Thread [Next in Thread]