- cancel pending AX_KX when forced to send a KX by peer, fix #3927

[oweals/gnunet.git] / src / cadet / cadet_common.c

diff --git a/src/cadet/cadet_common.c b/src/cadet/cadet_common.c
index ec2ed47358d7d7f820e9a3a0949c8c6117dbe4be..7df22b3966ef4fed875af28000cb0f9d8fc49e51 100644 (file)
--- a/src/cadet/cadet_common.c
+++ b/src/cadet/cadet_common.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      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., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -103,7 +103,7 @@ GC_h2s (const struct GNUNET_CADET_Hash *id)
 const char *
 GC_m2s (uint16_t m)
 {
-  static char buf[2][32];
+  static char buf[2][16];
   static int idx;
   const char *t;
 
@@ -120,21 +120,21 @@ GC_m2s (uint16_t m)
        * Request the creation of a path
        */
     case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE:
-      t = "CONNECTION_CREATE";
+      t = "CONN_CREATE";
       break;
 
       /**
        * Request the modification of an existing path
        */
     case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_ACK:
-      t = "CONNECTION_ACK";
+      t = "CONN_ACK";
       break;
 
       /**
        * Notify that a connection of a path is no longer valid
        */
     case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN:
-      t = "CONNECTION_BROKEN";
+      t = "CONN_BROKEN";
       break;
 
       /**
@@ -165,6 +165,13 @@ GC_m2s (uint16_t m)
       t = "KX";
       break;
 
+      /**
+       * Axolotl key exchange message.
+       */
+    case GNUNET_MESSAGE_TYPE_CADET_AX_KX:
+      t = "AX_KX";
+      break;
+
       /**
        * New ephemeral key.
        */
@@ -183,7 +190,7 @@ GC_m2s (uint16_t m)
        * Request the destuction of a path
        */
     case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_DESTROY:
-      t = "CONNECTION_DESTROY";
+      t = "CONN_DESTROY";
       break;
 
       /**
@@ -218,35 +225,42 @@ GC_m2s (uint16_t m)
        * Ask the cadet service to create a new tunnel
        */
     case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_CREATE:
-      t = "CHANNEL_CREATE";
+      t = "CHAN_CREATE";
       break;
 
       /**
        * Ask the cadet service to destroy a tunnel
        */
     case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY:
-      t = "CHANNEL_DESTROY";
+      t = "CHAN_DESTROY";
       break;
 
       /**
        * Confirm the creation of a channel.
        */
     case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_ACK:
-      t = "CHANNEL_ACK";
+      t = "CHAN_ACK";
       break;
 
       /**
        * Confirm the creation of a channel.
        */
     case GNUNET_MESSAGE_TYPE_CADET_CHANNEL_NACK:
-      t = "CHANNEL_NACK";
+      t = "CHAN_NACK";
       break;
 
       /**
-       * Encrypted payload.
+       * OTR encrypted payload.
        */
     case GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED:
-      t = "ENCRYPTED";
+      t = "OTR";
+      break;
+
+      /**
+       * Axolotl encrypted payload.
+       */
+    case GNUNET_MESSAGE_TYPE_CADET_AX:
+      t = "AX";
       break;
 
       /**
@@ -267,56 +281,56 @@ GC_m2s (uint16_t m)
        * Local monitoring of channels.
        */
     case GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_CHANNELS:
-      t = "LOCAL_INFO_CHANNELS";
+      t = "INFO_CHANS";
       break;
 
       /**
        * Local monitoring of a channel.
        */
     case GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_CHANNEL:
-      t = "LOCAL_INFO_CHANNEL";
+      t = "INFO_CHAN";
       break;
 
       /**
        * Local monitoring of service.
        */
     case GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_TUNNELS:
-      t = "LOCAL_INFO_TUNNELS";
+      t = "INFO_TUNS";
       break;
 
       /**
        * Local monitoring of service.
        */
     case GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_TUNNEL:
-      t = "LOCAL_INFO_TUNNEL";
+      t = "INFO_TUN";
       break;
 
       /**
        * Local information about all connections of service.
        */
     case GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_CONNECTIONS:
-      t = "LOCAL_INFO_CONNECTIONS";
+      t = "INFO_CONNS";
       break;
 
       /**
        * Local information of service about a specific connection.
        */
     case GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_CONNECTION:
-      t = "LOCAL_INFO_CONNECTION";
+      t = "INFO_CONN";
       break;
 
       /**
        * Local information about all peers known to the service.
        */
     case GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_PEERS:
-      t = "LOCAL_INFO_PEERS";
+      t = "INFO_PEERS";
       break;
 
       /**
        * Local information of service about a specific peer.
        */
     case GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_PEER:
-      t = "LOCAL_INFO_PEER";
+      t = "INFO_PEER";
       break;
 
       /**
@@ -334,10 +348,10 @@ GC_m2s (uint16_t m)
       break;
 
     default:
-      SPRINTF(buf[idx], "%u (UNKNOWN TYPE)", m);
+      SPRINTF(buf[idx], "%u (UNKNOWN)", m);
       return buf[idx];
   }
-  SPRINTF(buf[idx], "{%18s}", t);
+  SPRINTF(buf[idx], "{%13s}", t);
   return buf[idx];
 }
 #else