diff options
author | TheJackiMonster <thejackimonster@gmail.com> | 2020-11-12 17:32:32 +0100 |
---|---|---|
committer | TheJackiMonster <thejackimonster@gmail.com> | 2020-11-12 17:32:32 +0100 |
commit | e11d1e59e4ae5f7d89c33df3ae9ca8f1ece990cf (patch) | |
tree | 80c08d417bb0c862adcbcde7f55aa7e3a4646d27 /src/include/gnunet_protocols.h | |
parent | fec34163a1f17729c190022a2bf747f48e34f07a (diff) | |
download | gnunet-e11d1e59e4ae5f7d89c33df3ae9ca8f1ece990cf.tar.gz gnunet-e11d1e59e4ae5f7d89c33df3ae9ca8f1ece990cf.zip |
-revert "-merge branch 'jacki/messenger'"
This reverts commit fec34163a1f17729c190022a2bf747f48e34f07a, reversing
changes made to 63fe195e40e55f13ab29e3ba578e97017fc4cc48.
Diffstat (limited to 'src/include/gnunet_protocols.h')
-rw-r--r-- | src/include/gnunet_protocols.h | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 3bdebeb50..d9821ffe8 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | Copyright (C) 2001--2020 GNUnet e.V. | 3 | Copyright (C) 2001--2018 GNUnet e.V. |
4 | 4 | ||
5 | GNUnet is free software: you can redistribute it and/or modify it | 5 | GNUnet is free software: you can redistribute it and/or modify it |
6 | under the terms of the GNU Affero General Public License as published | 6 | under the terms of the GNU Affero General Public License as published |
@@ -20,7 +20,6 @@ | |||
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @author Christian Grothoff | 22 | * @author Christian Grothoff |
23 | * @author Tobias Frisch | ||
24 | * | 23 | * |
25 | * @file | 24 | * @file |
26 | * Constants for network protocols | 25 | * Constants for network protocols |
@@ -3519,46 +3518,6 @@ extern "C" { | |||
3519 | #define GNUNET_MESSAGE_TYPE_RECLAIM_REFERENCE_RESULT 1501 | 3518 | #define GNUNET_MESSAGE_TYPE_RECLAIM_REFERENCE_RESULT 1501 |
3520 | 3519 | ||
3521 | 3520 | ||
3522 | /*********************************************************************************/ | ||
3523 | /********************************** MESSENGER **********************************/ | ||
3524 | /*********************************************************************************/ | ||
3525 | /* MESSENGER: message types 1600-1629 | ||
3526 | * 1600-1609 Connection-level Messages | ||
3527 | * 1610-1619 Room-level Messages | ||
3528 | */ | ||
3529 | |||
3530 | /********************************* Connection **********************************/ | ||
3531 | |||
3532 | #define GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_CREATE 1600 | ||
3533 | |||
3534 | #define GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_UPDATE 1601 | ||
3535 | |||
3536 | #define GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_DESTROY 1602 | ||
3537 | |||
3538 | #define GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_GET_NAME 1603 | ||
3539 | |||
3540 | #define GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_SET_NAME 1604 | ||
3541 | |||
3542 | #define GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_GET_KEY 1605 | ||
3543 | |||
3544 | #define GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_MEMBER_ID 1606 | ||
3545 | |||
3546 | /************************************ Room *************************************/ | ||
3547 | |||
3548 | #define GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_OPEN 1610 | ||
3549 | |||
3550 | #define GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_ENTRY 1611 | ||
3551 | |||
3552 | #define GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_CLOSE 1612 | ||
3553 | |||
3554 | #define GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_SEND_MESSAGE 1614 | ||
3555 | |||
3556 | #define GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_RECV_MESSAGE 1615 | ||
3557 | |||
3558 | #define GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_GET_MESSAGE 1616 | ||
3559 | |||
3560 | /*********************************************************************************/ | ||
3561 | |||
3562 | /** | 3521 | /** |
3563 | * Type used to match 'all' message types. | 3522 | * Type used to match 'all' message types. |
3564 | */ | 3523 | */ |