- refactor channel nack

4 files changed, 37 insertions, 37 deletions

diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c
index 42d9bc1cf..cb5a27973 100644
--- a/src/mesh/gnunet-service-mesh_channel.c
+++ b/src/mesh/gnunet-service-mesh_channel.c
@@ -636,7 +636,7 @@ send_client_nack (struct MeshChannel *ch)
     GNUNET_break (0);
     return;
   }
-  GML_send_nack (ch->root, ch->lid_root);
+  GML_send_channel_nack (ch->root, ch->lid_root);
 }
 
 
diff --git a/src/mesh/gnunet-service-mesh_local.c b/src/mesh/gnunet-service-mesh_local.c
index f6b4b8149..8fc01f929 100644
--- a/src/mesh/gnunet-service-mesh_local.c
+++ b/src/mesh/gnunet-service-mesh_local.c
@@ -990,31 +990,6 @@ GML_send_ack (struct MeshClient *c, MESH_ChannelNumber id)
 }
 
 
-/**
- * Build a local channel NACK message and send it to a local client.
- *
- * @param c Client to whom send the NACK.
- * @param id Channel ID to use
- */
-void
-GML_send_nack (struct MeshClient *c, MESH_ChannelNumber id)
-{
-  struct GNUNET_MESH_LocalAck msg;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-              "send local nack on %X towards %p\n",
-              id, c);
-
-  msg.header.size = htons (sizeof (msg));
-  msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_NACK);
-  msg.channel_id = htonl (id);
-  GNUNET_SERVER_notification_context_unicast (nc,
-                                              c->handle,
-                                              &msg.header,
-                                              GNUNET_NO);
-
-}
-
 
 /**
  * Notify the client that a new incoming channel was created.
@@ -1044,6 +1019,31 @@ GML_send_channel_create (struct MeshClient *c,
 
 
 /**
+ * Build a local channel NACK message and send it to a local client.
+ *
+ * @param c Client to whom send the NACK.
+ * @param id Channel ID to use
+ */
+void
+GML_send_channel_nack (struct MeshClient *c, MESH_ChannelNumber id)
+{
+  struct GNUNET_MESH_LocalAck msg;
+
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "send local nack on %X towards %p\n",
+       id, c);
+
+  msg.header.size = htons (sizeof (msg));
+  msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_CHANNEL_NACK);
+  msg.channel_id = htonl (id);
+  GNUNET_SERVER_notification_context_unicast (nc,
+                                              c->handle,
+                                              &msg.header,
+                                              GNUNET_NO);
+
+}
+
+/**
  * Notify a client that a channel is no longer valid.
  *
  * @param c Client.
diff --git a/src/mesh/gnunet-service-mesh_local.h b/src/mesh/gnunet-service-mesh_local.h
index a78ef7af2..c5a0b367c 100644
--- a/src/mesh/gnunet-service-mesh_local.h
+++ b/src/mesh/gnunet-service-mesh_local.h
@@ -160,15 +160,6 @@ void
 GML_send_ack (struct MeshClient *c, MESH_ChannelNumber id);
 
 /**
- * Build a local channel NACK message and send it to a local client.
- *
- * @param c Client to whom send the NACK.
- * @param id Channel ID to use
- */
-void
-GML_send_nack (struct MeshClient *c, MESH_ChannelNumber id);
-
-/**
  * Notify the appropriate client that a new incoming channel was created.
  *
  * @param c Client to notify.
@@ -183,6 +174,15 @@ GML_send_channel_create (struct MeshClient *c,
                          const struct GNUNET_PeerIdentity *peer);
 
 /**
+ * Build a local channel NACK message and send it to a local client.
+ *
+ * @param c Client to whom send the NACK.
+ * @param id Channel ID to use
+ */
+void
+GML_send_channel_nack (struct MeshClient *c, MESH_ChannelNumber id);
+
+/**
  * Notify a client that a channel is no longer valid.
  *
  * @param c Client.
@@ -223,4 +223,4 @@ GML_2s (const struct MeshClient *c);
 
 /* ifndef GNUNET_MESH_SERVICE_LOCAL_H */
 #endif
-/* end of gnunet-mesh-service_LOCAL.h */
\ No newline at end of file
+/* end of gnunet-mesh-service_LOCAL.h */
diff --git a/src/mesh/mesh_api.c b/src/mesh/mesh_api.c
index f27e86b71..5f3f2da51 100644
--- a/src/mesh/mesh_api.c
+++ b/src/mesh/mesh_api.c
@@ -1146,7 +1146,7 @@ msg_received (void *cls, const struct GNUNET_MessageHeader *msg)
     break;
     /* Notify of a channel disconnection */
   case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY: /* TODO separate(gid problem)*/
-  case GNUNET_MESSAGE_TYPE_MESH_LOCAL_NACK:
+  case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_NACK:
     process_channel_destroy (h, (struct GNUNET_MESH_ChannelMessage *) msg);
     break;
   case GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA: