[GNUnet-SVN] r30910 - in gnunet/src: include mesh

[gnunet]

Author: bartpolot
Date: 2013-11-27 17:08:09 +0100 (Wed, 27 Nov 2013)
New Revision: 30910

Modified:
   gnunet/src/include/gnunet_protocols.h
   gnunet/src/mesh/gnunet-service-mesh_local.c
   gnunet/src/mesh/gnunet-service-mesh_peer.c
   gnunet/src/mesh/mesh_api.c
Log:
- remove old dead code / message types


Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2013-11-27 16:07:21 UTC (rev 
30909)
+++ gnunet/src/include/gnunet_protocols.h       2013-11-27 16:08:09 UTC (rev 
30910)
@@ -784,21 +784,18 @@
 #define GNUNET_MESSAGE_TYPE_MESH_HELLO 216
 
 /**
- * Request the creation of a connection DEPRECATED
+ * Request the creation of a connection
  */
-#define GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE            256
 #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE      256
 
 /**
- * Send origin an ACK that the connection is complete DEPRECATED
+ * Send origin an ACK that the connection is complete
  */
-#define GNUNET_MESSAGE_TYPE_MESH_PATH_ACK               257
 #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK         257
 
 /**
- * Notify that a connection is no longer valid DEPRECATED
+ * Notify that a connection is no longer valid
  */
-#define GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN            258
 #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN      258
 
 /**
@@ -837,37 +834,11 @@
 #define GNUNET_MESSAGE_TYPE_MESH_KX_PONG                265
 
 /**
- * Payload data origin->end DEPRECATED.
+ * Request the destuction of a connection
  */
-#define GNUNET_MESSAGE_TYPE_MESH_UNICAST                260
-
-/**
- * Payload data end->origin DEPRECATED.
- */
-#define GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN              262
-
-/**
- * Confirm owner->dest data end-to-end (ack goes dest->owner). DEPRECATED
- */
-#define GNUNET_MESSAGE_TYPE_MESH_UNICAST_ACK            263
-
-/**
- * Confirm dest->owner data end-to-end (ack goes owner->dest). DEPRECATED
- */
-#define GNUNET_MESSAGE_TYPE_MESH_TO_ORIG_ACK            264
-
-/**
- * Request the destuction of a path (PATH DEPRECATED)
- */
-#define GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY           266
 #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY     266
 
 /**
- * Request the destruction of a whole tunnel
- */
-#define GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY         267
-
-/**
  * Hop-by-hop, connection dependent ACK.
  */
 #define GNUNET_MESSAGE_TYPE_MESH_ACK                    268
@@ -878,7 +849,7 @@
 #define GNUNET_MESSAGE_TYPE_MESH_POLL                   269
 
 /**
- * Announce origin is still alive.
+ * Announce origin is still alive. DEPRECATED
  */
 #define GNUNET_MESSAGE_TYPE_MESH_FWD_KEEPALIVE          270
 #define GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE          270
@@ -894,16 +865,14 @@
 #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT          272
 
 /**
- * Ask the mesh service to create a new tunnel DEPRECATED
+ * Ask the mesh service to create a new channel.
  */
 #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE         273
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE    273
 
 /**
- * Ask the mesh service to destroy a tunnel DEPRECATED
+ * Ask the mesh service to destroy a channel.
  */
 #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY        274
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY   274
 
 /**
  * Confirm the creation of a channel
@@ -916,21 +885,11 @@
 #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_NACK           276
 
 /**
- * Encrypted data going forward. DEPRECATED
- */
-#define GNUNET_MESSAGE_TYPE_MESH_FWD                    280
-
-/**
  * Encrypted data. (Payload, channel management, keepalive)
  */
 #define GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED              280
 
 /**
- * Encrypted data going backwards.
- */
-#define GNUNET_MESSAGE_TYPE_MESH_BCK                    281
-
-/**
  * Payload client <-> service
  */
 #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA             285

Modified: gnunet/src/mesh/gnunet-service-mesh_local.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_local.c 2013-11-27 16:07:21 UTC (rev 
30909)
+++ gnunet/src/mesh/gnunet-service-mesh_local.c 2013-11-27 16:08:09 UTC (rev 
30910)
@@ -1008,7 +1008,7 @@
   struct GNUNET_MESH_ChannelMessage msg;
 
   msg.header.size = htons (sizeof (msg));
-  msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE);
+  msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE);
   msg.channel_id = htonl (id);
   msg.port = htonl (port);
   msg.opt = htonl (opt);
@@ -1037,7 +1037,7 @@
   if (GNUNET_YES == c->shutting_down)
     return;
   msg.header.size = htons (sizeof (msg));
-  msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY);
+  msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY);
   msg.channel_id = htonl (id);
   msg.port = htonl (0);
   memset (&msg.peer, 0, sizeof (msg.peer));

Modified: gnunet/src/mesh/gnunet-service-mesh_peer.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_peer.c  2013-11-27 16:07:21 UTC (rev 
30909)
+++ gnunet/src/mesh/gnunet-service-mesh_peer.c  2013-11-27 16:08:09 UTC (rev 
30910)
@@ -808,7 +808,6 @@
   /* Fill buf */
   switch (queue->type)
   {
-    case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY:
     case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY:
     case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN:
     case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:
@@ -922,7 +921,6 @@
     switch (queue->type)
     {
       case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY:
-      case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY:
         LOG (GNUNET_ERROR_TYPE_INFO, "destroying a DESTROY message\n");
         /* fall through */
       case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:

Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c  2013-11-27 16:07:21 UTC (rev 30909)
+++ gnunet/src/mesh/mesh_api.c  2013-11-27 16:08:09 UTC (rev 30910)
@@ -1062,7 +1062,7 @@
     process_channel_created (h, (struct GNUNET_MESH_ChannelMessage *) msg);
     break;
     /* Notify of a channel disconnection */
-  case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY:
+  case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY: /* TODO separate(gid 
problem)*/
   case GNUNET_MESSAGE_TYPE_MESH_LOCAL_NACK:
     process_channel_destroy (h, (struct GNUNET_MESH_ChannelMessage *) msg);
     break;