diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-01-18 14:49:17 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-01-18 14:49:17 +0100 |
commit | e02d76e46cd00724d32f81375e8981524ee6f3e2 (patch) | |
tree | 91a6aea89bfda7865f04244e2fb2a6ebb019bc3a /src/include/gnunet_protocols.h | |
parent | 9f1d39a86ddb227f91ad75f740d59adeb9b6ee31 (diff) | |
download | gnunet-e02d76e46cd00724d32f81375e8981524ee6f3e2.tar.gz gnunet-e02d76e46cd00724d32f81375e8981524ee6f3e2.zip |
more rename festivities
Diffstat (limited to 'src/include/gnunet_protocols.h')
-rw-r--r-- | src/include/gnunet_protocols.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 4962a944a..e8f5ead37 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h | |||
@@ -2652,34 +2652,38 @@ extern "C" | |||
2652 | /** | 2652 | /** |
2653 | * Hop-by-hop, connection dependent ACK. | 2653 | * Hop-by-hop, connection dependent ACK. |
2654 | */ | 2654 | */ |
2655 | #define GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED_HOP_BY_HOP_ACK 1005 | 2655 | #define GNUNET_MESSAGE_TYPE_CADET_CONNECTION_HOP_BY_HOP_ENCRYPTED_ACK 1005 |
2656 | 2656 | ||
2657 | /** | 2657 | /** |
2658 | * Poll for a hop-by-hop ACK. | 2658 | * Axolotl key exchange. |
2659 | */ | 2659 | */ |
2660 | #define GNUNET_MESSAGE_TYPE_CADET_CONNECTION_HOP_BY_HOP_POLL 1006 | 2660 | #define GNUNET_MESSAGE_TYPE_CADET_TUNNEL_KX 1007 |
2661 | 2661 | ||
2662 | /** | 2662 | /** |
2663 | * Key exchange encapsulation. | 2663 | * Axolotl encrypted data. |
2664 | */ | 2664 | */ |
2665 | #define GNUNET_MESSAGE_TYPE_CADET_TUNNEL_KX 1007 | 2665 | #define GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED 1008 |
2666 | 2666 | ||
2667 | /** | 2667 | /** |
2668 | * Axolotl encrypted data. | 2668 | * We do not bother with ACKs for |
2669 | * #GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED messages, but we instead | ||
2670 | * poll for one if we got nothing for a while and start to be worried. | ||
2669 | */ | 2671 | */ |
2670 | #define GNUNET_MESSAGE_TYPE_CONNECTION_ENCRYPTED 1008 | 2672 | #define GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED_POLL 1006 |
2673 | |||
2674 | |||
2671 | 2675 | ||
2672 | /********************************** Channel *********************************/ | 2676 | /********************************** Channel *********************************/ |
2673 | 2677 | ||
2674 | /** | 2678 | /** |
2675 | * Payload data (inside an encrypted tunnel). | 2679 | * Payload data (inside an encrypted tunnel). |
2676 | */ | 2680 | */ |
2677 | #define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DATA 1010 | 2681 | #define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_APP_DATA 1010 |
2678 | 2682 | ||
2679 | /** | 2683 | /** |
2680 | * Confirm payload data end-to-end. | 2684 | * Confirm payload data end-to-end. |
2681 | */ | 2685 | */ |
2682 | #define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DATA_ACK 1011 | 2686 | #define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_APP_DATA_ACK 1011 |
2683 | 2687 | ||
2684 | /** | 2688 | /** |
2685 | * Announce connection is still alive (direction sensitive). | 2689 | * Announce connection is still alive (direction sensitive). |
@@ -2689,7 +2693,7 @@ extern "C" | |||
2689 | /** | 2693 | /** |
2690 | * Ask the cadet service to create a new channel. | 2694 | * Ask the cadet service to create a new channel. |
2691 | */ | 2695 | */ |
2692 | #define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_CREATE 1013 | 2696 | #define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_OPEN 1013 |
2693 | 2697 | ||
2694 | /** | 2698 | /** |
2695 | * Ask the cadet service to destroy a channel. | 2699 | * Ask the cadet service to destroy a channel. |
@@ -2699,12 +2703,12 @@ extern "C" | |||
2699 | /** | 2703 | /** |
2700 | * Confirm the creation of a channel | 2704 | * Confirm the creation of a channel |
2701 | */ | 2705 | */ |
2702 | #define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_CREATE_ACK 1015 | 2706 | #define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_OPEN_ACK 1015 |
2703 | 2707 | ||
2704 | /** | 2708 | /** |
2705 | * Reject the creation of a channel | 2709 | * Reject the creation of a channel |
2706 | */ | 2710 | */ |
2707 | #define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_CREATE_NACK_DEPRECATED 1016 | 2711 | #define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_OPEN_NACK_DEPRECATED 1016 |
2708 | 2712 | ||
2709 | /*********************************** Local **********************************/ | 2713 | /*********************************** Local **********************************/ |
2710 | 2714 | ||