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

[gnunet]

Author: bartpolot
Date: 2015-04-27 21:15:15 +0200 (Mon, 27 Apr 2015)
New Revision: 35622

Modified:
   gnunet/src/cadet/gnunet-service-cadet_connection.c
   gnunet/src/cadet/gnunet-service-cadet_peer.c
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- add AX type to send processors, refactor cid setter

Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c  2015-04-27 19:15:14 UTC 
(rev 35621)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c  2015-04-27 19:15:15 UTC 
(rev 35622)
@@ -3113,6 +3113,7 @@
   droppable = GNUNET_NO == force;
   switch (type)
   {
+    struct GNUNET_CADET_AX        *axmsg;
     struct GNUNET_CADET_Encrypted *emsg;
     struct GNUNET_CADET_KX        *kmsg;
     struct GNUNET_CADET_ACK       *amsg;
@@ -3132,7 +3133,6 @@
       }
       emsg->cid = c->id;
       emsg->ttl = htonl (ttl - 1);
-      emsg->pid = htonl (0);
       LOG (GNUNET_ERROR_TYPE_DEBUG, "  Q_N+ %p %u\n", fc, fc->queue_n);
       LOG (GNUNET_ERROR_TYPE_DEBUG, "last pid sent %u\n", fc->last_pid_sent);
       LOG (GNUNET_ERROR_TYPE_DEBUG, "     ack recv %u\n", fc->last_ack_recv);
@@ -3149,6 +3149,13 @@
         GCC_start_poll (c, fwd);
       }
       break;
+    case GNUNET_MESSAGE_TYPE_CADET_AX:
+      axmsg = (struct GNUNET_CADET_AX *) data;
+      axmsg->cid = c->id;
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "  Q_N+ %p %u\n", fc, fc->queue_n);
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "last pid sent %u\n", fc->last_pid_sent);
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "     ack recv %u\n", fc->last_ack_recv);
+      break;
 
     case GNUNET_MESSAGE_TYPE_CADET_KX:
       kmsg = (struct GNUNET_CADET_KX *) data;

Modified: gnunet/src/cadet/gnunet-service-cadet_peer.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_peer.c        2015-04-27 19:15:14 UTC 
(rev 35621)
+++ gnunet/src/cadet/gnunet-service-cadet_peer.c        2015-04-27 19:15:15 UTC 
(rev 35622)
@@ -1040,10 +1040,16 @@
   {
     case GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED:
       *pid = GCC_get_pid (queue->c, queue->fwd);
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "  payload ID %u\n", *pid);
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "  otr payload ID %u\n", *pid);
       msg_size = send_core_data_raw (queue->cls, size, buf);
       ((struct GNUNET_CADET_Encrypted *) buf)->pid = htonl (*pid);
       break;
+    case GNUNET_MESSAGE_TYPE_CADET_AX:
+      *pid = GCC_get_pid (queue->c, queue->fwd);
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "  ax payload ID %u\n", *pid);
+      msg_size = send_core_data_raw (queue->cls, size, buf);
+      ((struct GNUNET_CADET_AX *) buf)->pid = htonl (*pid);
+      break;
     case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_DESTROY:
     case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN:
     case GNUNET_MESSAGE_TYPE_CADET_KX:

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-04-27 19:15:14 UTC 
(rev 35621)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-04-27 19:15:15 UTC 
(rev 35622)
@@ -1628,15 +1628,6 @@
     case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY:
     case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_ACK:
     case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_NACK:
-      if (CADET_Axolotl == t->enc_type)
-      {
-        ax_msg->cid = *GCC_get_id (c);
-      }
-      else
-      {
-        otr_msg->cid = *GCC_get_id (c);
-        otr_msg->ttl = htonl (default_ttl);
-      }
       break;
     default:
       GNUNET_break (0);
@@ -1661,7 +1652,7 @@
     tq = existing_q;
     tq->tqd = NULL;
   }
-  tq->cq = GCC_send_prebuilt_message (&otr_msg->header, type, mid, c, fwd, 
force,
+  tq->cq = GCC_send_prebuilt_message (msg, type, mid, c, fwd, force,
                                       &tun_message_sent, tq);
   GNUNET_assert (NULL != tq->cq);
   tq->cont = cont;