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

[gnunet]

Author: bartpolot
Date: 2014-06-24 17:17:32 +0200 (Tue, 24 Jun 2014)
New Revision: 33834

Modified:
   gnunet/src/cadet/gnunet-service-cadet_connection.c
Log:
- don't use payload_type on non-payload messages

Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c  2014-06-24 14:53:24 UTC 
(rev 33833)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c  2014-06-24 15:17:32 UTC 
(rev 33834)
@@ -807,8 +807,7 @@
   LOG (GNUNET_ERROR_TYPE_INFO, "===> {%14s ACK} on connection %s\n",
        GC_f2s (!fwd), GCC_2s (connection));
   GCP_queue_add (get_hop (connection, fwd), NULL,
-                 GNUNET_MESSAGE_TYPE_CADET_CONNECTION_ACK,
-                 GNUNET_MESSAGE_TYPE_CADET_CONNECTION_ACK, 0,
+                 GNUNET_MESSAGE_TYPE_CADET_CONNECTION_ACK, 0, 0,
                  sizeof (struct GNUNET_CADET_ConnectionACK),
                  connection, fwd, &conn_message_sent, NULL);
   connection->pending_messages++;
@@ -876,10 +875,8 @@
   else
     memset (&msg->peer2, 0, sizeof (msg->peer2));
   neighbor = GCP_get (peer_id);
-  GCP_queue_add (neighbor, msg,
-                 GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN,
-                 GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN, 2,
-                 sizeof (struct GNUNET_CADET_ConnectionBroken),
+  GCP_queue_add (neighbor, msg, GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN,
+                 0, 2, sizeof (struct GNUNET_CADET_ConnectionBroken),
                  NULL, GNUNET_SYSERR, /* connection, fwd */
                  NULL, NULL); /* continuation */
 }
@@ -3046,8 +3043,7 @@
 
   connection->maintenance_q =
     GCP_queue_add (get_next_hop (connection), NULL,
-                   GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE,
-                   GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE, 0,
+                   GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE, 0, 0,
                    size, connection, GNUNET_YES, &conn_message_sent, NULL);
 
   state = GCT_get_cstate (connection->t);