- fixing channel functions

1 files changed, 58 insertions, 0 deletions

diff --git a/src/mesh/gnunet-service-mesh_local.c b/src/mesh/gnunet-service-mesh_local.c
index 9d7db28bc..3fea3a714 100644
--- a/src/mesh/gnunet-service-mesh_local.c
+++ b/src/mesh/gnunet-service-mesh_local.c
@@ -848,6 +848,7 @@ GML_shutdown (void)
   }
 }
 
+
 /**
  * Get a chennel from a client
  *
@@ -870,6 +871,49 @@ GML_channel_get (struct MeshClient *c, MESH_ChannelNumber chid)
   return GNUNET_CONTAINER_multihashmap32_get (c->own_channels, chid);
 }
 
+
+/**
+ * Add a channel to a client
+ *
+ * @param client Client.
+ * @param chid Channel ID.
+ * @param ch Channel.
+ */
+void
+GML_channel_add (struct MeshClient *client,
+                 uint32_t chid,
+                 struct MeshChannel *ch)
+{
+  if (chid >= GNUNET_MESH_LOCAL_CHANNEL_ID_SERV)
+    GNUNET_CONTAINER_multihashmap32_put (client->incoming_channels, chid, ch,
+                                         GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+  else if (chid >= GNUNET_MESH_LOCAL_CHANNEL_ID_CLI)
+    GNUNET_CONTAINER_multihashmap32_put (client->own_channels, chid, ch,
+                                         GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+  else
+    GNUNET_break (0);
+}
+
+/**
+ * Remove a channel from a client
+ *
+ * @param client Client.
+ * @param chid Channel ID.
+ * @param ch Channel.
+ */
+void
+GML_channel_remove (struct MeshClient *client,
+                    uint32_t chid,
+                    struct MeshChannel *ch)
+{
+  if (chid >= GNUNET_MESH_LOCAL_CHANNEL_ID_SERV)
+    GNUNET_CONTAINER_multihashmap32_remove (c->incoming_channels, chid, ch);
+  else if (chid >= GNUNET_MESH_LOCAL_CHANNEL_ID_CLI)
+    GNUNET_CONTAINER_multihashmap32_remove (c->own_channels, chid, ch);
+  else
+    GNUNET_break (0);
+}
+
 /**
  * Check if client has registered with the service and has not disconnected
  *
@@ -1056,4 +1100,18 @@ GML_send_data (struct MeshClient *c,
 }
 
 
+/**
+ * Get the static string to represent a client.
+ *
+ * @param c Client.
+ *
+ * @return Static string for the client.
+ */
+const char *
+GML_2s (const struct MeshClient *c)
+{
+  static char buf[32];
 
+  sprintf (buf, "%u", c->id);
+  return buf;
+}