[GNUnet-SVN] r38248 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2016-11-04 10:47:27 +0100 (Fri, 04 Nov 2016)
New Revision: 38248

Modified:
   gnunet/src/cadet/gnunet-service-cadet_connection.c
Log:
-remove dead code

Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c  2016-11-04 09:47:26 UTC 
(rev 38247)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c  2016-11-04 09:47:27 UTC 
(rev 38248)
@@ -720,15 +720,9 @@
     }
     GNUNET_free (q);
   }
-  else if (type == GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED)
-  {
-    /* SHOULD NO LONGER HAPPEN FIXME: REMOVE CASE */
-    // If NULL == q and ENCRYPTED == type, message must have been ch_mngmnt
-    forced = GNUNET_YES;
-    GNUNET_assert (0); // FIXME
-  }
   else /* CONN_CREATE or CONN_ACK */
   {
+    GNUNET_assert (GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED != type);
     forced = GNUNET_YES;
   }
 
@@ -758,7 +752,6 @@
     case GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED:
       if (GNUNET_YES == sent)
       {
-        GNUNET_assert (NULL != q);
         fc->last_pid_sent = pid;
         if (GC_is_pid_bigger (fc->last_pid_sent + 1, fc->last_ack_recv))
           GCC_start_poll (c, fwd);