diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-11-27 16:08:09 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-11-27 16:08:09 +0000 |
commit | 7b1f04400778be78d0494803e926474ffba25cc7 (patch) | |
tree | 82ed00ca4d332dd122b7292b23b997a2acc5941a | |
parent | 0eae481ee7934ef996c67ef482c87207fc68220b (diff) | |
download | gnunet-7b1f04400778be78d0494803e926474ffba25cc7.tar.gz gnunet-7b1f04400778be78d0494803e926474ffba25cc7.zip |
- remove old dead code / message types
-rw-r--r-- | src/include/gnunet_protocols.h | 55 | ||||
-rw-r--r-- | src/mesh/gnunet-service-mesh_local.c | 4 | ||||
-rw-r--r-- | src/mesh/gnunet-service-mesh_peer.c | 2 | ||||
-rw-r--r-- | src/mesh/mesh_api.c | 2 |
4 files changed, 10 insertions, 53 deletions
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 3169e2318..2853ee1a3 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h | |||
@@ -784,21 +784,18 @@ extern "C" | |||
784 | #define GNUNET_MESSAGE_TYPE_MESH_HELLO 216 | 784 | #define GNUNET_MESSAGE_TYPE_MESH_HELLO 216 |
785 | 785 | ||
786 | /** | 786 | /** |
787 | * Request the creation of a connection DEPRECATED | 787 | * Request the creation of a connection |
788 | */ | 788 | */ |
789 | #define GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE 256 | ||
790 | #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE 256 | 789 | #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE 256 |
791 | 790 | ||
792 | /** | 791 | /** |
793 | * Send origin an ACK that the connection is complete DEPRECATED | 792 | * Send origin an ACK that the connection is complete |
794 | */ | 793 | */ |
795 | #define GNUNET_MESSAGE_TYPE_MESH_PATH_ACK 257 | ||
796 | #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK 257 | 794 | #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK 257 |
797 | 795 | ||
798 | /** | 796 | /** |
799 | * Notify that a connection is no longer valid DEPRECATED | 797 | * Notify that a connection is no longer valid |
800 | */ | 798 | */ |
801 | #define GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN 258 | ||
802 | #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN 258 | 799 | #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN 258 |
803 | 800 | ||
804 | /** | 801 | /** |
@@ -837,37 +834,11 @@ extern "C" | |||
837 | #define GNUNET_MESSAGE_TYPE_MESH_KX_PONG 265 | 834 | #define GNUNET_MESSAGE_TYPE_MESH_KX_PONG 265 |
838 | 835 | ||
839 | /** | 836 | /** |
840 | * Payload data origin->end DEPRECATED. | 837 | * Request the destuction of a connection |
841 | */ | 838 | */ |
842 | #define GNUNET_MESSAGE_TYPE_MESH_UNICAST 260 | ||
843 | |||
844 | /** | ||
845 | * Payload data end->origin DEPRECATED. | ||
846 | */ | ||
847 | #define GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN 262 | ||
848 | |||
849 | /** | ||
850 | * Confirm owner->dest data end-to-end (ack goes dest->owner). DEPRECATED | ||
851 | */ | ||
852 | #define GNUNET_MESSAGE_TYPE_MESH_UNICAST_ACK 263 | ||
853 | |||
854 | /** | ||
855 | * Confirm dest->owner data end-to-end (ack goes owner->dest). DEPRECATED | ||
856 | */ | ||
857 | #define GNUNET_MESSAGE_TYPE_MESH_TO_ORIG_ACK 264 | ||
858 | |||
859 | /** | ||
860 | * Request the destuction of a path (PATH DEPRECATED) | ||
861 | */ | ||
862 | #define GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY 266 | ||
863 | #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY 266 | 839 | #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY 266 |
864 | 840 | ||
865 | /** | 841 | /** |
866 | * Request the destruction of a whole tunnel | ||
867 | */ | ||
868 | #define GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY 267 | ||
869 | |||
870 | /** | ||
871 | * Hop-by-hop, connection dependent ACK. | 842 | * Hop-by-hop, connection dependent ACK. |
872 | */ | 843 | */ |
873 | #define GNUNET_MESSAGE_TYPE_MESH_ACK 268 | 844 | #define GNUNET_MESSAGE_TYPE_MESH_ACK 268 |
@@ -878,7 +849,7 @@ extern "C" | |||
878 | #define GNUNET_MESSAGE_TYPE_MESH_POLL 269 | 849 | #define GNUNET_MESSAGE_TYPE_MESH_POLL 269 |
879 | 850 | ||
880 | /** | 851 | /** |
881 | * Announce origin is still alive. | 852 | * Announce origin is still alive. DEPRECATED |
882 | */ | 853 | */ |
883 | #define GNUNET_MESSAGE_TYPE_MESH_FWD_KEEPALIVE 270 | 854 | #define GNUNET_MESSAGE_TYPE_MESH_FWD_KEEPALIVE 270 |
884 | #define GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE 270 | 855 | #define GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE 270 |
@@ -894,16 +865,14 @@ extern "C" | |||
894 | #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT 272 | 865 | #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT 272 |
895 | 866 | ||
896 | /** | 867 | /** |
897 | * Ask the mesh service to create a new tunnel DEPRECATED | 868 | * Ask the mesh service to create a new channel. |
898 | */ | 869 | */ |
899 | #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE 273 | 870 | #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE 273 |
900 | #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE 273 | ||
901 | 871 | ||
902 | /** | 872 | /** |
903 | * Ask the mesh service to destroy a tunnel DEPRECATED | 873 | * Ask the mesh service to destroy a channel. |
904 | */ | 874 | */ |
905 | #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY 274 | 875 | #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY 274 |
906 | #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY 274 | ||
907 | 876 | ||
908 | /** | 877 | /** |
909 | * Confirm the creation of a channel | 878 | * Confirm the creation of a channel |
@@ -916,21 +885,11 @@ extern "C" | |||
916 | #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_NACK 276 | 885 | #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_NACK 276 |
917 | 886 | ||
918 | /** | 887 | /** |
919 | * Encrypted data going forward. DEPRECATED | ||
920 | */ | ||
921 | #define GNUNET_MESSAGE_TYPE_MESH_FWD 280 | ||
922 | |||
923 | /** | ||
924 | * Encrypted data. (Payload, channel management, keepalive) | 888 | * Encrypted data. (Payload, channel management, keepalive) |
925 | */ | 889 | */ |
926 | #define GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED 280 | 890 | #define GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED 280 |
927 | 891 | ||
928 | /** | 892 | /** |
929 | * Encrypted data going backwards. | ||
930 | */ | ||
931 | #define GNUNET_MESSAGE_TYPE_MESH_BCK 281 | ||
932 | |||
933 | /** | ||
934 | * Payload client <-> service | 893 | * Payload client <-> service |
935 | */ | 894 | */ |
936 | #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA 285 | 895 | #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA 285 |
diff --git a/src/mesh/gnunet-service-mesh_local.c b/src/mesh/gnunet-service-mesh_local.c index 099a55e26..8b66517d0 100644 --- a/src/mesh/gnunet-service-mesh_local.c +++ b/src/mesh/gnunet-service-mesh_local.c | |||
@@ -1008,7 +1008,7 @@ GML_send_channel_create (struct MeshClient *c, | |||
1008 | struct GNUNET_MESH_ChannelMessage msg; | 1008 | struct GNUNET_MESH_ChannelMessage msg; |
1009 | 1009 | ||
1010 | msg.header.size = htons (sizeof (msg)); | 1010 | msg.header.size = htons (sizeof (msg)); |
1011 | msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE); | 1011 | msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE); |
1012 | msg.channel_id = htonl (id); | 1012 | msg.channel_id = htonl (id); |
1013 | msg.port = htonl (port); | 1013 | msg.port = htonl (port); |
1014 | msg.opt = htonl (opt); | 1014 | msg.opt = htonl (opt); |
@@ -1037,7 +1037,7 @@ GML_send_channel_destroy (struct MeshClient *c, uint32_t id) | |||
1037 | if (GNUNET_YES == c->shutting_down) | 1037 | if (GNUNET_YES == c->shutting_down) |
1038 | return; | 1038 | return; |
1039 | msg.header.size = htons (sizeof (msg)); | 1039 | msg.header.size = htons (sizeof (msg)); |
1040 | msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY); | 1040 | msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY); |
1041 | msg.channel_id = htonl (id); | 1041 | msg.channel_id = htonl (id); |
1042 | msg.port = htonl (0); | 1042 | msg.port = htonl (0); |
1043 | memset (&msg.peer, 0, sizeof (msg.peer)); | 1043 | memset (&msg.peer, 0, sizeof (msg.peer)); |
diff --git a/src/mesh/gnunet-service-mesh_peer.c b/src/mesh/gnunet-service-mesh_peer.c index 967bd1712..f18dcbb76 100644 --- a/src/mesh/gnunet-service-mesh_peer.c +++ b/src/mesh/gnunet-service-mesh_peer.c | |||
@@ -808,7 +808,6 @@ queue_send (void *cls, size_t size, void *buf) | |||
808 | /* Fill buf */ | 808 | /* Fill buf */ |
809 | switch (queue->type) | 809 | switch (queue->type) |
810 | { | 810 | { |
811 | case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY: | ||
812 | case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY: | 811 | case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY: |
813 | case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN: | 812 | case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN: |
814 | case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED: | 813 | case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED: |
@@ -922,7 +921,6 @@ GMP_queue_destroy (struct MeshPeerQueue *queue, int clear_cls) | |||
922 | switch (queue->type) | 921 | switch (queue->type) |
923 | { | 922 | { |
924 | case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY: | 923 | case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY: |
925 | case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY: | ||
926 | LOG (GNUNET_ERROR_TYPE_INFO, "destroying a DESTROY message\n"); | 924 | LOG (GNUNET_ERROR_TYPE_INFO, "destroying a DESTROY message\n"); |
927 | /* fall through */ | 925 | /* fall through */ |
928 | case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED: | 926 | case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED: |
diff --git a/src/mesh/mesh_api.c b/src/mesh/mesh_api.c index c202ed231..c9df698fb 100644 --- a/src/mesh/mesh_api.c +++ b/src/mesh/mesh_api.c | |||
@@ -1062,7 +1062,7 @@ msg_received (void *cls, const struct GNUNET_MessageHeader *msg) | |||
1062 | process_channel_created (h, (struct GNUNET_MESH_ChannelMessage *) msg); | 1062 | process_channel_created (h, (struct GNUNET_MESH_ChannelMessage *) msg); |
1063 | break; | 1063 | break; |
1064 | /* Notify of a channel disconnection */ | 1064 | /* Notify of a channel disconnection */ |
1065 | case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY: | 1065 | case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY: /* TODO separate(gid problem)*/ |
1066 | case GNUNET_MESSAGE_TYPE_MESH_LOCAL_NACK: | 1066 | case GNUNET_MESSAGE_TYPE_MESH_LOCAL_NACK: |
1067 | process_channel_destroy (h, (struct GNUNET_MESH_ChannelMessage *) msg); | 1067 | process_channel_destroy (h, (struct GNUNET_MESH_ChannelMessage *) msg); |
1068 | break; | 1068 | break; |