1 files changed, 70 insertions, 40 deletions

diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index 7d319e51e..059bb158b 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -2,20 +2,18 @@
   This file is part of GNUnet.
   Copyright (C) 2013, 2016, 2017 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
-  by the Free Software Foundation; either version 3, or (at your
-  option) any later version.
+  GNUnet is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License,
+  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., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
+  Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
  * @file conversation/gnunet-service-conversation.c
@@ -305,6 +303,47 @@ handle_client_pickup_message (void *cls,
 
 
 /**
+ * Channel went down, notify client and free data
+ * structure.
+ *
+ * @param ch channel that went down
+ */
+static void
+clean_up_channel (struct Channel *ch)
+{
+  struct Line *line = ch->line;
+  struct GNUNET_MQ_Envelope *env;
+  struct ClientPhoneHangupMessage *hup;
+
+  switch (ch->status)
+  {
+  case CS_CALLEE_INIT:
+  case CS_CALLEE_SHUTDOWN:
+  case CS_CALLER_SHUTDOWN:
+    break;
+  case CS_CALLEE_RINGING:
+  case CS_CALLEE_CONNECTED:
+  case CS_CALLER_CALLING:
+  case CS_CALLER_CONNECTED:
+    if (NULL != line)
+    {
+      env = GNUNET_MQ_msg (hup,
+                           GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP);
+      hup->cid = ch->cid;
+      GNUNET_MQ_send (line->mq,
+                      env);
+    }
+    break;
+  }
+  if (NULL != line)
+    GNUNET_CONTAINER_DLL_remove (line->channel_head,
+                                 line->channel_tail,
+                                 ch);
+  GNUNET_free (ch);
+}
+
+
+/**
  * Destroy a channel.
  *
  * @param ch channel to destroy.
@@ -315,7 +354,11 @@ destroy_line_cadet_channels (struct Channel *ch)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Destroying cadet channels\n");
   if (NULL != ch->channel)
+  {
     GNUNET_CADET_channel_destroy (ch->channel);
+    ch->channel = NULL;
+  }
+  clean_up_channel (ch);
 }
 
 
@@ -605,6 +648,8 @@ static int
 check_client_audio_message (void *cls,
                             const struct ClientAudioMessage *msg)
 {
+  (void) cls;
+  (void) msg;
   return GNUNET_OK;
 }
 
@@ -771,6 +816,7 @@ handle_cadet_hangup_message (void *cls,
   enum ChannelStatus status;
   uint32_t cid;
 
+  (void) message;
   GNUNET_CADET_receive_done (ch->channel);
   cid = ch->cid;
   status = ch->status;
@@ -816,6 +862,7 @@ handle_cadet_pickup_message (void *cls,
   struct GNUNET_MQ_Envelope *env;
   struct ClientPhonePickedupMessage *pick;
 
+  (void) message;
   GNUNET_CADET_receive_done (ch->channel);
   switch (ch->status)
   {
@@ -865,6 +912,7 @@ handle_cadet_suspend_message (void *cls,
   struct GNUNET_MQ_Envelope *env;
   struct ClientPhoneSuspendMessage *suspend;
 
+  (void) message;
   GNUNET_CADET_receive_done (ch->channel);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Suspending channel CID: %u\n",
@@ -914,6 +962,7 @@ handle_cadet_resume_message (void *cls,
   struct GNUNET_MQ_Envelope *env;
   struct ClientPhoneResumeMessage *resume;
 
+  (void) msg;
   line = ch->line;
   GNUNET_CADET_receive_done (ch->channel);
   if (GNUNET_YES != ch->suspended_remote)
@@ -964,6 +1013,8 @@ static int
 check_cadet_audio_message (void *cls,
                            const struct CadetAudioMessage *msg)
 {
+  (void) cls;
+  (void) msg;
   return GNUNET_OK; /* any payload is fine */
 }
 
@@ -1021,40 +1072,13 @@ inbound_end (void *cls,
              const struct GNUNET_CADET_Channel *channel)
 {
   struct Channel *ch = cls;
-  struct Line *line = ch->line;
-  struct GNUNET_MQ_Envelope *env;
-  struct ClientPhoneHangupMessage *hup;
 
   GNUNET_assert (channel == ch->channel);
   ch->channel = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Channel destroyed by CADET in state %d\n",
               ch->status);
-  switch (ch->status)
-  {
-  case CS_CALLEE_INIT:
-  case CS_CALLEE_SHUTDOWN:
-  case CS_CALLER_SHUTDOWN:
-    break;
-  case CS_CALLEE_RINGING:
-  case CS_CALLEE_CONNECTED:
-  case CS_CALLER_CALLING:
-  case CS_CALLER_CONNECTED:
-    if (NULL != line)
-    {
-      env = GNUNET_MQ_msg (hup,
-                           GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP);
-      hup->cid = ch->cid;
-      GNUNET_MQ_send (line->mq,
-                      env);
-    }
-    break;
-  }
-  if (NULL != line)
-    GNUNET_CONTAINER_DLL_remove (line->channel_head,
-                                 line->channel_tail,
-                                 ch);
-  GNUNET_free (ch);
+  clean_up_channel (ch);
 }
 
 
@@ -1152,6 +1176,7 @@ inbound_channel (void *cls,
   struct Line *line = cls;
   struct Channel *ch;
 
+  (void) initiator;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received incoming cadet channel on line %p\n",
               line);
@@ -1183,6 +1208,7 @@ client_connect_cb (void *cls,
 {
   struct Line *line;
 
+  (void) cls;
   line = GNUNET_new (struct Line);
   line->client = client;
   line->mq = mq;
@@ -1203,9 +1229,10 @@ client_disconnect_cb (void *cls,
                       void *app_ctx)
 {
   struct Line *line = app_ctx;
-  struct Channel *ch;
   struct Channel *chn;
 
+  (void) cls;
+  (void) client;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Client disconnected, closing line\n");
   if (NULL != line->port)
@@ -1213,7 +1240,7 @@ client_disconnect_cb (void *cls,
     GNUNET_CADET_close_port (line->port);
     line->port = NULL;
   }
-  for (ch = line->channel_head; NULL != ch; ch = chn)
+  for (struct Channel *ch = line->channel_head; NULL != ch; ch = chn)
   {
     chn = ch->next;
     ch->line = NULL;
@@ -1290,6 +1317,7 @@ handle_client_register_message (void *cls,
 static void
 do_shutdown (void *cls)
 {
+  (void) cls;
   if (NULL != cadet)
   {
     GNUNET_CADET_disconnect (cadet);
@@ -1310,6 +1338,8 @@ run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *c,
      struct GNUNET_SERVICE_Handle *service)
 {
+  (void) cls;
+  (void) service;
   cfg = c;
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_CRYPTO_get_peer_identity (cfg,