- make api compile

4 files changed, 740 insertions, 325 deletions

diff --git a/src/mesh/gnunet-service-mesh-new.c b/src/mesh/gnunet-service-mesh-new.c
index 5b7e9991f..72295b0bb 100644
--- a/src/mesh/gnunet-service-mesh-new.c
+++ b/src/mesh/gnunet-service-mesh-new.c
@@ -46,8 +46,8 @@
  */
 
 #include "platform.h"
-#include "mesh.h"
-#include "mesh_protocol.h"
+#include "mesh2.h"
+#include "mesh2_protocol.h"
 #include "mesh_tunnel_tree.h"
 #include "block_mesh.h"
 #include "gnunet_dht_service.h"
diff --git a/src/mesh/mesh2.h b/src/mesh/mesh2.h
new file mode 100644
index 000000000..39533e654
--- /dev/null
+++ b/src/mesh/mesh2.h
@@ -0,0 +1,343 @@
+/*
+     This file is part of GNUnet.
+     (C) 2001 - 2011 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
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     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.
+*/
+
+/**
+ * @author Bartlomiej Polot
+ * @file mesh/mesh.h
+ */
+
+#ifndef MESH_H_
+#define MESH_H_
+
+#ifdef __cplusplus
+extern "C"
+{
+#if 0                           /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+#include <stdint.h>
+
+#define MESH_DEBUG              GNUNET_YES
+
+#define INITIAL_WINDOW_SIZE     8
+#define ACK_THRESHOLD           INITIAL_WINDOW_SIZE / 2
+
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_peer_lib.h"
+#include "gnunet_core_service.h"
+#include "gnunet_protocols.h"
+#include <gnunet_mesh_service.h>
+
+/******************************************************************************/
+/********************        MESH LOCAL MESSAGES      *************************/
+/******************************************************************************/
+/*  Any API call should be documented in the folowing table under API CALL.
+ *  Also, any message type should be documented in the following table, with the
+ * associated event.
+ *
+ * API CALL (GNUNET_MESH_*)             MESSAGE USED
+ * ------------------------             ------------
+ * connect                              GNUNET_MESH_ClientConnect
+ * disconnect                           None (network level disconnect)
+ *
+ * tunnel_create                        GNUNET_MESH_TunnelMessage
+ * tunnel_destroy                       GNUNET_MESH_TunnelMessage
+ * tunnel_buffer                        GNUNET_MESH_TunnelMessage
+ *
+ * notify_transmit_ready                None (queue / GNUNET_CLIENT_ntf_tmt_rdy)
+ * notify_transmit_ready_cancel         None (clear of internal data structures)
+ *
+ * 
+ * EVENT                                MESSAGE USED
+ * -----                                ------------
+ * data                                 GNUNET_MESH_Unicast OR
+ *                                      GNUNET_MESH_Multicast OR
+ *                                      GNUNET_MESH_ToOrigin
+ * data ack                             GNUNET_MESH_LocalAck
+ * 
+ * new incoming tunnel                  GNUNET_MESH_PeerControl
+ * peer connects to a tunnel            FIXME
+ * peer disconnects from a tunnel       FIXME
+ */
+
+/******************************************************************************/
+/**************************       CONSTANTS      ******************************/
+/******************************************************************************/
+
+#define GNUNET_MESH_LOCAL_TUNNEL_ID_CLI         0x80000000
+#define GNUNET_MESH_LOCAL_TUNNEL_ID_SERV        0xB0000000
+
+#define HIGH_PID                                0xFFFF0000
+#define LOW_PID                                 0x0000FFFF
+
+#define PID_OVERFLOW(pid, max) (pid > HIGH_PID && max < LOW_PID)
+
+/******************************************************************************/
+/**************************        MESSAGES      ******************************/
+/******************************************************************************/
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Message for a client to register to the service
+ */
+struct GNUNET_MESH_ClientConnect
+{
+    /**
+     * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT
+     *
+     * Size: sizeof(struct GNUNET_MESH_ClientConnect) +
+     *       sizeof(MESH_ApplicationType) * applications +
+     *       sizeof(uint16_t) * types
+     */
+  struct GNUNET_MessageHeader header;
+  uint16_t types GNUNET_PACKED;
+  /* uint16_t                 list_types[types]           */
+};
+
+
+/**
+ * Type for tunnel numbering.
+ * - Local tunnel numbers given by the service (incoming) are >= 0xB0000000
+ * - Local tunnel numbers given by the client (created) are >= 0x80000000
+ * - Global tunnel numbers are < 0x80000000
+ */
+typedef uint32_t MESH_TunnelNumber;
+
+/**
+ * Message for a client to create and destroy tunnels.
+ */
+struct GNUNET_MESH_TunnelMessage
+{
+    /**
+     * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_[CREATE|DESTROY]
+     *       GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_[MAX|MIN]
+     *
+     * Size: sizeof(struct GNUNET_MESH_TunnelMessage)
+     */
+  struct GNUNET_MessageHeader header;
+
+    /**
+     * ID of a tunnel controlled by this client.
+     */
+  MESH_TunnelNumber tunnel_id GNUNET_PACKED;
+
+    /**
+     * Tunnel's peer
+     */
+  struct GNUNET_PeerIdentity peer;
+};
+
+
+/**
+ * Message for the service to let a client know about created tunnels.
+ */
+struct GNUNET_MESH_TunnelNotification
+{
+    /**
+     * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE
+     *
+     * Size: sizeof(struct GNUNET_MESH_TunnelMessage)
+     */
+  struct GNUNET_MessageHeader header;
+
+    /**
+     * ID of a tunnel controlled by this client.
+     */
+  MESH_TunnelNumber tunnel_id GNUNET_PACKED;
+
+    /**
+     * Peer at the other end.
+     */
+  struct GNUNET_PeerIdentity peer;
+
+    /**
+     * Tunnel options (speed, buffering)
+     */
+  uint32_t opt;
+};
+
+
+/**
+ * Message to allow the client send more data to the service
+ * (always service -> client).
+ */
+struct GNUNET_MESH_LocalAck
+{
+    /**
+     * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK
+     */
+  struct GNUNET_MessageHeader header;
+
+    /**
+     * ID of the tunnel allowed to send more data.
+     */
+  MESH_TunnelNumber tunnel_id GNUNET_PACKED;
+
+    /**
+     * ID of the last packet allowed.
+     */
+  uint32_t max_pid GNUNET_PACKED;
+};
+
+
+/**
+ * Message to inform the client about tunnels in the service.
+ */
+struct GNUNET_MESH_LocalMonitor
+{
+  /**
+     * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_MONITOR[_TUNNEL]
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * ID of the tunnel allowed to send more data.
+   */
+  MESH_TunnelNumber tunnel_id GNUNET_PACKED;
+
+  /**
+   * Number of peers in the tunnel.
+   */
+  uint32_t npeers GNUNET_PACKED;
+
+  /**
+   * Alignment.
+   */
+  uint32_t reserved GNUNET_PACKED;
+
+  /**
+   * ID of the owner of the tunnel (can be local peer).
+   */
+  struct GNUNET_PeerIdentity owner;
+
+  /* struct GNUNET_PeerIdentity peers[npeers] */
+};
+
+
+GNUNET_NETWORK_STRUCT_END
+
+/******************************************************************************/
+/************************        ENUMERATIONS      ****************************/
+/******************************************************************************/
+
+/**
+ * All the states a peer participating in a tunnel can be in.
+ */
+enum MeshPeerState
+{
+    /**
+     * Uninitialized status, should never appear in operation.
+     */
+  MESH_PEER_INVALID,
+
+    /**
+     * Peer is the root and owner of the tree
+     */
+  MESH_PEER_ROOT,
+
+    /**
+     * Peer only retransmits traffic, is not a final destination
+     */
+  MESH_PEER_RELAY,
+
+    /**
+     * Path to the peer not known yet
+     */
+  MESH_PEER_SEARCHING,
+
+    /**
+     * Request sent, not yet answered.
+     */
+  MESH_PEER_WAITING,
+
+    /**
+     * Peer connected and ready to accept data
+     */
+  MESH_PEER_READY,
+
+    /**
+     * Peer connected previosly but not responding
+     */
+  MESH_PEER_RECONNECTING
+};
+
+
+/**
+ * Check if one pid is bigger than other, accounting for overflow.
+ *
+ * @param bigger Argument that should be bigger.
+ * @param smaller Argument that should be smaller.
+ *
+ * @return True if bigger (arg1) has a higher value than smaller (arg 2).
+ */
+int
+GMC_is_pid_bigger (uint32_t bigger, uint32_t smaller);
+
+
+/**
+ * Get the higher ACK value out of two values, taking in account overflow.
+ *
+ * @param a First ACK value.
+ * @param b Second ACK value.
+ *
+ * @return Highest ACK value from the two.
+ */
+uint32_t
+GMC_max_pid (uint32_t a, uint32_t b);
+
+
+/**
+ * Get the lower ACK value out of two values, taking in account overflow.
+ *
+ * @param a First ACK value.
+ * @param b Second ACK value.
+ *
+ * @return Lowest ACK value from the two.
+ */
+uint32_t
+GMC_min_pid (uint32_t a, uint32_t b);
+
+
+/**
+ * Convert a message type into a string to help debug
+ * Generated with:
+ * FIND:        "#define ([^ ]+)[ ]*([0-9]+)"
+ * REPLACE:     "    case \2: return "\1"; break;"
+ * 
+ * @param m Message type.
+ * 
+ * @return Human readable string description.
+ */
+const char *
+GNUNET_MESH_DEBUG_M2S (uint16_t m);
+
+#if 0                           /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mesh/mesh2_api.c b/src/mesh/mesh2_api.c
index 35b408552..98359dff6 100644
--- a/src/mesh/mesh2_api.c
+++ b/src/mesh/mesh2_api.c
@@ -36,8 +36,8 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_peer_lib.h"
 #include "gnunet_mesh2_service.h"
-#include "mesh.h"
-#include "mesh_protocol.h"
+#include "mesh2.h"
+#include "mesh2_protocol.h"
 
 #define LOG(kind,...) GNUNET_log_from (kind, "mesh2-api",__VA_ARGS__)
 
@@ -168,11 +168,6 @@ struct GNUNET_MESH_Handle
   unsigned int n_handlers;
 
     /**
-     * Number of applications in the applications array.
-     */
-  unsigned int n_applications;
-
-    /**
      * Have we started the task to receive messages from the service
      * yet? We do this after we send the 'MESH_LOCAL_CONNECT' message.
      */
@@ -280,24 +275,9 @@ struct GNUNET_MESH_Tunnel
   MESH_TunnelNumber tid;
 
     /**
-     * Owner of the tunnel. (1 if the tunnel is a local client).
-     */
-  GNUNET_PEER_Id owner;
-
-    /**
-     * Destination of the tunnel.
-     */
-  GNUNET_PEER_Id destination;
-
-    /**
-     * Next hop for the tunnel.
-     */
-  GNUNET_PEER_Id next_hop;
-
-    /**
-     * Previous hop for the tunnel.
+     * Other end of the tunnel.
      */
-  GNUNET_PEER_Id prev_hop;
+  GNUNET_PEER_Id peer;
 
   /**
    * Any data the caller wants to put in here
@@ -310,16 +290,6 @@ struct GNUNET_MESH_Tunnel
   unsigned int packet_size;
 
     /**
-     * Number of applications requested this tunnel
-     */
-  unsigned int napps;
-
-    /**
-     * Is the tunnel throttled to the slowest peer?
-     */
-  int speed_min;
-
-    /**
      * Is the tunnel allowed to buffer?
      */
   int buffering;
@@ -489,10 +459,8 @@ static void
 destroy_tunnel (struct GNUNET_MESH_Tunnel *t, int call_cleaner)
 {
   struct GNUNET_MESH_Handle *h;
-  struct GNUNET_PeerIdentity pi;
   struct GNUNET_MESH_TransmitHandle *th;
   struct GNUNET_MESH_TransmitHandle *next;
-  unsigned int i;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "destroy_tunnel %X\n", t->tid);
 
@@ -505,13 +473,10 @@ destroy_tunnel (struct GNUNET_MESH_Tunnel *t, int call_cleaner)
 
   /* free all peer's ID */
   GNUNET_CONTAINER_DLL_remove (h->tunnels_head, h->tunnels_tail, t);
-  GNUNET_PEER_change_rc (t->owner, -1);
-  GNUNET_PEER_change_rc (t->destination, -1);
-  GNUNET_PEER_change_rc (t->next_hop, -1);
-  GNUNET_PEER_change_rc (t->prev_hop, -1);
+  GNUNET_PEER_change_rc (t->peer, -1);
 
   /* signal tunnel destruction */
-  if ( (NULL != h->cleaner) && (0 != t->owner) && (GNUNET_YES == call_cleaner) )
+  if ( (NULL != h->cleaner) && (0 != t->peer) && (GNUNET_YES == call_cleaner) )
     h->cleaner (h->cls, t, t->ctx);
 
   /* check that clients did not leave messages behind in the queue */
@@ -539,89 +504,14 @@ destroy_tunnel (struct GNUNET_MESH_Tunnel *t, int call_cleaner)
     h->th = NULL;
   }
 
-
-  if (t->npeers > 0)
-    GNUNET_free (t->peers);
-  if (0 != t->owner)
-    GNUNET_PEER_change_rc (t->owner, -1);
-  if (0 != t->napps && t->apps)
-    GNUNET_free (t->apps);
+  if (0 != t->peer)
+    GNUNET_PEER_change_rc (t->peer, -1);
   GNUNET_free (t);
   return;
 }
 
 
 /**
- * Get the peer descriptor for the peer with id from the given tunnel
- * @param t Tunnel handle
- * @param id Short form ID of the wanted peer
- * @return handle to the requested peer or NULL if not found
- */
-static struct GNUNET_MESH_Peer *
-retrieve_peer (struct GNUNET_MESH_Tunnel *t, GNUNET_PEER_Id id)
-{
-  unsigned int i;
-
-  for (i = 0; i < t->npeers; i++)
-    if (t->peers[i]->id == id)
-      return t->peers[i];
-  return NULL;
-}
-
-
-/**
- * Add a peer into a tunnel
- * @param t Tunnel handle
- * @param pi Full ID of the new peer
- * @return handle to the newly created peer
- */
-static struct GNUNET_MESH_Peer *
-add_peer_to_tunnel (struct GNUNET_MESH_Tunnel *t,
-                    const struct GNUNET_PeerIdentity *pi)
-{
-  struct GNUNET_MESH_Peer *p;
-  GNUNET_PEER_Id id;
-
-  if (0 != t->owner)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  id = GNUNET_PEER_intern (pi);
-
-  p = GNUNET_malloc (sizeof (struct GNUNET_MESH_Peer));
-  p->id = id;
-  p->t = t;
-  GNUNET_array_append (t->peers, t->npeers, p);
-  return p;
-}
-
-
-/**
- * Remove a peer from a tunnel
- * @param p Peer handle
- */
-static void
-remove_peer_from_tunnel (struct GNUNET_MESH_Peer *p)
-{
-  unsigned int i;
-
-  for (i = 0; i < p->t->npeers; i++)
-  {
-    if (p->t->peers[i] == p)
-      break;
-  }
-  if (i == p->t->npeers)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  p->t->peers[i] = p->t->peers[p->t->npeers - 1];
-  GNUNET_array_grow (p->t->peers, p->t->npeers, p->t->npeers - 1);
-}
-
-
-/**
  * Notify client that the transmission has timed out
  * 
  * @param cls closure
@@ -752,7 +642,6 @@ send_connect (struct GNUNET_MESH_Handle *h)
   {
     char buf[size] GNUNET_ALIGN;
     struct GNUNET_MESH_ClientConnect *msg;
-    uint16_t napps;
     uint16_t *types;
     uint16_t ntypes;
 
@@ -760,18 +649,17 @@ send_connect (struct GNUNET_MESH_Handle *h)
     msg = (struct GNUNET_MESH_ClientConnect *) buf;
     msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT);
     msg->header.size = htons (size);
-    types = (uint16_t *) & apps[napps];
+    types = (uint16_t *) & msg[1];
     for (ntypes = 0; ntypes < h->n_handlers; ntypes++)
     {
       types[ntypes] = htons (h->message_handlers[ntypes].type);
       LOG (GNUNET_ERROR_TYPE_DEBUG, " type %u\n",
            h->message_handlers[ntypes].type);
     }
-    msg->applications = htons (napps);
     msg->types = htons (ntypes);
     LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Sending %lu bytes long message %d types and %d apps\n",
-         ntohs (msg->header.size), ntypes, napps);
+         "Sending %lu bytes long message %d types\n",
+         ntohs (msg->header.size), ntypes);
     send_packet (h, &msg->header, NULL);
   }
 }
@@ -789,7 +677,6 @@ static int
 do_reconnect (struct GNUNET_MESH_Handle *h)
 {
   struct GNUNET_MESH_Tunnel *t;
-  unsigned int i;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "*****************************\n");
   LOG (GNUNET_ERROR_TYPE_DEBUG, "*******   RECONNECT   *******\n");
@@ -834,7 +721,6 @@ do_reconnect (struct GNUNET_MESH_Handle *h)
   for (t = h->tunnels_head; NULL != t; t = t->next)
   {
     struct GNUNET_MESH_TunnelMessage tmsg;
-    struct GNUNET_MESH_PeerControl pmsg;
 
     if (t->tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
     {
@@ -850,36 +736,11 @@ do_reconnect (struct GNUNET_MESH_Handle *h)
     tmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE);
     tmsg.header.size = htons (sizeof (struct GNUNET_MESH_TunnelMessage));
     tmsg.tunnel_id = htonl (t->tid);
+    GNUNET_PEER_resolve (t->peer, &tmsg.peer);
     send_packet (h, &tmsg.header, t);
 
-    pmsg.header.size = htons (sizeof (struct GNUNET_MESH_PeerControl));
-    pmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD);
-    pmsg.tunnel_id = htonl (t->tid);
-
-    /* Reconnect all peers */
-    /* If the tunnel was "by type", dont connect individual peers */
-    for (i = 0; i < t->npeers && 0 == t->napps; i++)
-    {
-      GNUNET_PEER_resolve (t->peers[i]->id, &pmsg.peer);
-      if (NULL != t->disconnect_handler && t->peers[i]->connected)
-        t->disconnect_handler (t->cls, &pmsg.peer);
-      send_packet (t->mesh, &pmsg.header, t);
-    }
-    /* Reconnect all types, if any  */
-    for (i = 0; i < t->napps; i++)
-    {
-      struct GNUNET_MESH_ConnectPeerByType msg;
-
-      msg.header.size = htons (sizeof (struct GNUNET_MESH_ConnectPeerByType));
-      msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD_BY_TYPE);
-      msg.tunnel_id = htonl (t->tid);
-      msg.type = htonl (t->apps[i]);
-      send_packet (t->mesh, &msg.header, t);
-    }
     if (GNUNET_NO == t->buffering)
       GNUNET_MESH_tunnel_buffer (t, GNUNET_NO);
-    if (GNUNET_YES == t->speed_min)
-      GNUNET_MESH_tunnel_speed_min (t);
   }
   return GNUNET_YES;
 }
@@ -947,29 +808,17 @@ process_tunnel_created (struct GNUNET_MESH_Handle *h,
   }
   if (NULL != h->new_tunnel)
   {
-    struct GNUNET_ATS_Information atsi;
-
     t = create_tunnel (h, tid);
-    t->owner = GNUNET_PEER_intern (&msg->peer);
-    t->npeers = 1;
-    t->peers = GNUNET_malloc (sizeof (struct GNUNET_MESH_Peer *));
-    t->peers[0] = GNUNET_malloc (sizeof (struct GNUNET_MESH_Peer));
-    t->peers[0]->t = t;
-    t->peers[0]->connected = 1;
-    t->peers[0]->id = t->owner;
-    GNUNET_PEER_change_rc (t->owner, 1);
+    t->peer = GNUNET_PEER_intern (&msg->peer);
+    GNUNET_PEER_change_rc (t->peer, 1);
     t->mesh = h;
     t->tid = tid;
     if ((msg->opt & MESH_TUNNEL_OPT_NOBUFFER) != 0)
       t->buffering = GNUNET_NO;
     else
       t->buffering = GNUNET_YES;
-    if ((msg->opt & MESH_TUNNEL_OPT_SPEED_MIN) != 0)
-      t->speed_min = GNUNET_YES;
-    atsi.type = 0;
-    atsi.value = 0;
     LOG (GNUNET_ERROR_TYPE_DEBUG, "  created tunnel %p\n", t);
-    t->ctx = h->new_tunnel (h->cls, t, &msg->peer, &atsi);
+    t->ctx = h->new_tunnel (h->cls, t, &msg->peer);
     LOG (GNUNET_ERROR_TYPE_DEBUG, "User notified\n");
   }
   else
@@ -1008,10 +857,6 @@ process_tunnel_destroy (struct GNUNET_MESH_Handle *h,
   {
     return;
   }
-  if (0 == t->owner)
-  {
-    GNUNET_break (0);
-  }
   LOG (GNUNET_ERROR_TYPE_DEBUG, "tunnel %X destroyed\n", t->tid);
   destroy_tunnel (t, GNUNET_YES);
   return;
@@ -1019,63 +864,6 @@ process_tunnel_destroy (struct GNUNET_MESH_Handle *h,
 
 
 /**
- * Process the new peer event and notify the upper level of it
- *
- * @param h     The mesh handle
- * @param msg   A message with the details of the peer event
- */
-static void
-process_peer_event (struct GNUNET_MESH_Handle *h,
-                    const struct GNUNET_MESH_PeerControl *msg)
-{
-  struct GNUNET_MESH_Tunnel *t;
-  struct GNUNET_MESH_Peer *p;
-  struct GNUNET_ATS_Information atsi;
-  GNUNET_PEER_Id id;
-  uint16_t size;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "processig peer event\n");
-  size = ntohs (msg->header.size);
-  if (size != sizeof (struct GNUNET_MESH_PeerControl))
-  {
-    GNUNET_break (0);
-    return;
-  }
-  t = retrieve_tunnel (h, ntohl (msg->tunnel_id));
-  if (NULL == t)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  id = GNUNET_PEER_search (&msg->peer);
-  if ((p = retrieve_peer (t, id)) == NULL)
-    p = add_peer_to_tunnel (t, &msg->peer);
-  if (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD == ntohs (msg->header.type))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "adding peer\n");
-    if (NULL != t->connect_handler)
-    {
-      atsi.type = 0;
-      atsi.value = 0;
-      t->connect_handler (t->cls, &msg->peer, &atsi);
-    }
-    p->connected = 1;
-  }
-  else
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "removing peer\n");
-    if (NULL != t->disconnect_handler && p->connected)
-    {
-      t->disconnect_handler (t->cls, &msg->peer);
-    }
-    remove_peer_from_tunnel (p);
-    GNUNET_free (p);
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "processing peer event END\n");
-}
-
-
-/**
  * Process the incoming data packets
  *
  * @param h         The mesh handle
@@ -1160,12 +948,8 @@ process_incoming_data (struct GNUNET_MESH_Handle *h,
     handler = &h->message_handlers[i];
     if (handler->type == type)
     {
-      struct GNUNET_ATS_Information atsi;
-
-      atsi.type = 0;
-      atsi.value = 0;
       if (GNUNET_OK !=
-          handler->callback (h->cls, t, &t->ctx, peer, payload, &atsi))
+          handler->callback (h->cls, t, &t->ctx, peer, payload))
       {
         LOG (GNUNET_ERROR_TYPE_DEBUG, "callback caused disconnection\n");
         GNUNET_MESH_disconnect (h);
@@ -1264,10 +1048,9 @@ process_get_tunnels (struct GNUNET_MESH_Handle *h,
     return;
   }
   h->tunnels_cb (h->tunnels_cls,
-                 &msg->owner,
                  ntohl (msg->tunnel_id),
-                 (struct GNUNET_PeerIdentity *) &msg[1],
-                 npeers);
+                 &msg->owner,
+                 (struct GNUNET_PeerIdentity *) &msg[1]);
 }
 
 
@@ -1368,11 +1151,6 @@ msg_received (void *cls, const struct GNUNET_MessageHeader *msg)
   case GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY:
     process_tunnel_destroy (h, (struct GNUNET_MESH_TunnelMessage *) msg);
     break;
-    /* Notify of a new peer or a peer disconnect in the tunnel */
-  case GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD:
-  case GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_DEL:
-    process_peer_event (h, (struct GNUNET_MESH_PeerControl *) msg);
-    break;
     /* Notify of a new data packet in the tunnel */
   case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
   case GNUNET_MESSAGE_TYPE_MESH_MULTICAST:
@@ -1506,8 +1284,6 @@ send_callback (void *cls, size_t size, void *buf)
           uc.pid = htonl (t->next_send_pid);
           uc.ttl = 0;
           memset (&uc.oid, 0, sizeof (struct GNUNET_PeerIdentity));
-          GNUNET_PEER_resolve (th->target, &uc.destination);
-          memcpy (cbuf, &uc, sizeof (uc));
         }
       }
       t->next_send_pid++;
@@ -1602,33 +1378,13 @@ send_packet (struct GNUNET_MESH_Handle *h,
 /**********************      API CALL DEFINITIONS     *************************/
 /******************************************************************************/
 
-/**
- * Connect to the mesh service.
- *
- * @param cfg configuration to use
- * @param cls closure for the various callbacks that follow
- *            (including handlers in the handlers array)
- * @param new_tunnel function called when an *inbound* tunnel is created
- * @param cleaner function called when an *inbound* tunnel is destroyed by the
- *                remote peer, it is *not* called if GNUNET_MESH_tunnel_destroy
- *                is called on the tunnel
- * @param handlers callbacks for messages we care about, NULL-terminated
- *                note that the mesh is allowed to drop notifications about
- *                inbound messages if the client does not process them fast
- *                enough (for this notification type, a bounded queue is used)
- * @param stypes list of the applications that this client claims to provide
- * @return handle to the mesh service NULL on error
- *         (in this case, init is never called)
- */
 struct GNUNET_MESH_Handle *
 GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, void *cls,
                      GNUNET_MESH_InboundTunnelNotificationHandler new_tunnel,
                      GNUNET_MESH_TunnelEndHandler cleaner,
-                     const struct GNUNET_MESH_MessageHandler *handlers,
-                     const GNUNET_MESH_ApplicationType *stypes)
+                     const struct GNUNET_MESH_MessageHandler *handlers)
 {
   struct GNUNET_MESH_Handle *h;
-  size_t size;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "GNUNET_MESH_connect()\n");
   h = GNUNET_malloc (sizeof (struct GNUNET_MESH_Handle));
@@ -1649,16 +1405,6 @@ GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, void *cls,
   h->reconnect_time = GNUNET_TIME_UNIT_MILLISECONDS;
   h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
 
-  /* count apps */
-  for (h->n_applications = 0;
-       stypes && stypes[h->n_applications];
-       h->n_applications++) ;
-  if (0 < h->n_applications)
-  {
-    size = h->n_applications * sizeof (GNUNET_MESH_ApplicationType *);
-    h->applications = GNUNET_malloc (size);
-    memcpy (h->applications, stypes, size);
-  }
   /* count handlers */
   for (h->n_handlers = 0;
        handlers && handlers[h->n_handlers].type;
@@ -1748,56 +1494,6 @@ GNUNET_MESH_disconnect (struct GNUNET_MESH_Handle *handle)
 }
 
 
-/**
- * Announce to ther peer the availability of services described by the regex,
- * in order to be reachable to other peers via connect_by_string.
- * 
- * Note that the first 8 characters are considered to be part of a prefix,
- * (for instance 'gnunet://'). If you put a variable part in there (*, +. ()),
- * all matching strings will be stored in the DHT.
- *
- * @param h Handle to mesh.
- * @param regex String with the regular expression describing local services.
- * @param compression_characters How many characters can be assigned to one
- *                               edge of the graph. The bigger the variability
- *                               of the data, the smaller this parameter should
- *                               be (down to 1).
- *                               For maximum compression, use strlen (regex)
- *                               or 0 (special value). Use with care!
- */
-void
-GNUNET_MESH_announce_regex (struct GNUNET_MESH_Handle *h,
-                            const char *regex,
-                            unsigned int compression_characters)
-{
-  struct GNUNET_MESH_RegexAnnounce *msg;
-  size_t payload;
-  size_t len;
-  size_t msgsize;
-  size_t offset;
-  char buffer[UINT16_MAX];
-
-  len = strlen (regex);
-  payload = UINT16_MAX - sizeof(struct GNUNET_MESH_RegexAnnounce);
-  msg = (struct GNUNET_MESH_RegexAnnounce *) buffer;
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_ANNOUNCE_REGEX);
-  msg->compression_characters = htons (compression_characters);
-  offset = 0;
-  do
-  {
-    msgsize = (len - offset > payload) ? payload : len - offset;
-    memcpy (&msg[1], &regex[offset], msgsize);
-    offset += msgsize;
-    msgsize += sizeof(struct GNUNET_MESH_RegexAnnounce);
-
-    msg->header.size = htons (msgsize);
-    msg->last = htons (offset >= len);
-
-    send_packet (h, &msg->header, NULL);
-  } while (len > offset);
-}
-
-
 struct GNUNET_MESH_Tunnel *
 GNUNET_MESH_tunnel_create (struct GNUNET_MESH_Handle *h, 
                            void *tunnel_ctx,
diff --git a/src/mesh/mesh2_protocol.h b/src/mesh/mesh2_protocol.h
new file mode 100644
index 000000000..01f7f3487
--- /dev/null
+++ b/src/mesh/mesh2_protocol.h
@@ -0,0 +1,376 @@
+/*
+     This file is part of GNUnet.
+     (C) 2001 - 2011 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
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     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.
+*/
+
+/**
+ * @author Bartlomiej Polot
+ * @file mesh/mesh_protocol.h
+ */
+
+#ifndef MESH_PROTOCOL_H_
+#define MESH_PROTOCOL_H_
+
+#ifdef __cplusplus
+extern "C"
+{
+#if 0
+  /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+#define MESH_TUNNEL_OPT_SPEED_MIN       0x1
+#define MESH_TUNNEL_OPT_NOBUFFER        0x2
+
+
+/******************************************************************************/
+/********************      MESH NETWORK MESSAGES     **************************/
+/******************************************************************************/
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Message for mesh path management
+ */
+struct GNUNET_MESH_ManipulatePath
+{
+    /**
+     * Type: GNUNET_MESSAGE_TYPE_MESH_PATH_[CREATE|CHANGE|ADD|DESTROY]
+     *
+     * Size: sizeof(struct GNUNET_MESH_ManipulatePath) +
+     *       path_length * sizeof (struct GNUNET_PeerIdentity)
+     */
+  struct GNUNET_MessageHeader header;
+
+    /**
+     * Global id of the tunnel this path belongs to,
+     * unique in conjunction with the origin.
+     */
+  uint32_t tid GNUNET_PACKED;
+
+    /**
+     * Tunnel options (MESH_TUNNEL_OPT_*).
+     */
+  uint32_t opt GNUNET_PACKED;
+
+    /**
+     * 64 bit alignment padding.
+     */
+  uint32_t reserved GNUNET_PACKED;
+
+    /**
+     * path_length structs defining the *whole* path from the origin [0] to the
+     * final destination [path_length-1].
+     */
+  /* struct GNUNET_PeerIdentity peers[path_length]; */
+};
+
+/**
+ * Message for mesh data traffic to all tunnel targets.
+ */
+struct GNUNET_MESH_Multicast
+{
+    /**
+     * Type: GNUNET_MESSAGE_TYPE_MESH_MULTICAST
+     */
+  struct GNUNET_MessageHeader header;
+
+    /**
+     * TID of the tunnel
+     */
+  uint32_t tid GNUNET_PACKED;
+
+    /**
+     * Number of hops to live
+     */
+  uint32_t ttl GNUNET_PACKED;
+
+    /**
+     * Unique ID of the packet
+     */
+  uint32_t pid GNUNET_PACKED;
+
+    /**
+     * OID of the tunnel
+     */
+  struct GNUNET_PeerIdentity oid;
+
+    /**
+     * Payload follows
+     */
+};
+
+
+/**
+ * Message for mesh data traffic to a particular destination from origin.
+ */
+struct GNUNET_MESH_Unicast
+{
+    /**
+     * Type: GNUNET_MESSAGE_TYPE_MESH_UNICAST
+     */
+  struct GNUNET_MessageHeader header;
+
+    /**
+     * TID of the tunnel
+     */
+  uint32_t tid GNUNET_PACKED;
+
+    /**
+     * Number of hops to live
+     */
+  uint32_t ttl GNUNET_PACKED;
+
+    /**
+     * Unique ID of the packet
+     */
+  uint32_t pid GNUNET_PACKED;
+
+    /**
+     * OID of the tunnel
+     */
+  struct GNUNET_PeerIdentity oid;
+
+    /**
+     * Destination.
+     */
+  struct GNUNET_PeerIdentity destination;
+
+    /**
+     * Payload follows
+     */
+};
+
+
+/**
+ * Message for mesh data traffic from a tunnel participant to origin.
+ */
+struct GNUNET_MESH_ToOrigin
+{
+    /**
+     * Type: GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN
+     */
+  struct GNUNET_MessageHeader header;
+
+    /**
+     * TID of the tunnel
+     */
+  uint32_t tid GNUNET_PACKED;
+
+    /**
+     * Number of hops to live
+     */
+  uint32_t ttl GNUNET_PACKED;
+
+    /**
+     * Unique ID of the packet
+     */
+  uint32_t pid GNUNET_PACKED;
+
+    /**
+     * OID of the tunnel
+     */
+  struct GNUNET_PeerIdentity oid;
+
+    /**
+     * Sender of the message.
+     */
+  struct GNUNET_PeerIdentity sender;
+
+    /**
+     * Payload follows
+     */
+};
+
+
+/**
+ * Message to acknowledge mesh data traffic.
+ */
+struct GNUNET_MESH_ACK
+{
+    /**
+     * Type: GNUNET_MESSAGE_TYPE_MESH_ACK
+     */
+  struct GNUNET_MessageHeader header;
+
+    /**
+     * TID of the tunnel
+     */
+  uint32_t tid GNUNET_PACKED;
+
+    /**
+     * OID of the tunnel
+     */
+  struct GNUNET_PeerIdentity oid;
+
+    /**
+     * Maximum packet ID authorized.
+     */
+  uint32_t pid;
+
+};
+
+/**
+ * Message to query a peer about its Flow Control status regarding a tunnel.
+ */
+struct GNUNET_MESH_Poll
+{
+  /**
+   * Type: GNUNET_MESSAGE_TYPE_MESH_POLL
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * TID of the tunnel
+   */
+  uint32_t tid GNUNET_PACKED;
+
+  /**
+   * OID of the tunnel
+   */
+  struct GNUNET_PeerIdentity oid;
+
+  /**
+   * Last ACK received.
+   */
+  uint32_t last_ack;
+};
+
+/**
+ * Message for ack'ing a path
+ */
+struct GNUNET_MESH_PathACK
+{
+    /**
+     * Type: GNUNET_MESSAGE_TYPE_MESH_PATH_ACK
+     */
+  struct GNUNET_MessageHeader header;
+
+    /**
+     * TID of the tunnel
+     */
+  uint32_t tid GNUNET_PACKED;
+
+    /**
+     * OID of the tunnel
+     */
+  struct GNUNET_PeerIdentity oid;
+
+    /**
+     * ID of the endpoint
+     */
+  struct GNUNET_PeerIdentity peer_id;
+
+  /* TODO: signature */
+};
+
+
+/**
+ * Message for notifying a disconnection in a path
+ */
+struct GNUNET_MESH_PathBroken
+{
+    /**
+     * Type: GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN
+     */
+  struct GNUNET_MessageHeader header;
+
+    /**
+     * TID of the tunnel
+     */
+  uint32_t tid GNUNET_PACKED;
+
+    /**
+     * OID of the tunnel
+     */
+  struct GNUNET_PeerIdentity oid;
+
+    /**
+     * ID of the endpoint
+     */
+  struct GNUNET_PeerIdentity peer1;
+
+    /**
+     * ID of the endpoint
+     */
+  struct GNUNET_PeerIdentity peer2;
+
+  /* TODO: signature */
+};
+
+
+/**
+ * Message to destroy a tunnel
+ */
+struct GNUNET_MESH_TunnelDestroy
+{
+    /**
+     * Type: GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY
+     */
+  struct GNUNET_MessageHeader header;
+
+    /**
+     * TID of the tunnel
+     */
+  uint32_t tid GNUNET_PACKED;
+
+    /**
+     * OID of the tunnel
+     */
+  struct GNUNET_PeerIdentity oid;
+
+  /* TODO: signature */
+};
+
+
+/**
+ * Message to destroy a tunnel
+ */
+struct GNUNET_MESH_TunnelKeepAlive
+{
+  /**
+   * Type: GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE
+   */
+  struct GNUNET_MessageHeader header;
+  
+  /**
+   * TID of the tunnel
+   */
+  uint32_t tid GNUNET_PACKED;
+  
+  /**
+   * OID of the tunnel
+   */
+  struct GNUNET_PeerIdentity oid;
+};
+
+
+
+GNUNET_NETWORK_STRUCT_END
+
+#if 0                           /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+/* ifndef MESH_PROTOCOL_H */
+#endif
+/* end of mesh_protocol.h */