-rename enum MeshOption to GNUNET_MESH_ChannelOption to ensure we use GNUNET_MESH_ prefix as we should

11 files changed, 17 insertions, 17 deletions

diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index 8ffea5144..df8d4e9f2 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -1295,7 +1295,7 @@ static void *
 inbound_channel (void *cls,
                 struct GNUNET_MESH_Channel *channel,
                 const struct GNUNET_PeerIdentity *initiator,
-                uint32_t port, enum MeshOption options)
+                uint32_t port, enum GNUNET_MESH_ChannelOption options)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               _("Received incoming channel on port %u\n"),
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index 3bdac2d51..fb1e5ae38 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -3015,7 +3015,7 @@ static void *
 new_channel (void *cls,
             struct GNUNET_MESH_Channel *channel,
             const struct GNUNET_PeerIdentity *initiator,
-            uint32_t port, enum MeshOption options)
+            uint32_t port, enum GNUNET_MESH_ChannelOption options)
 {
   struct ChannelState *s = GNUNET_new (struct ChannelState);
 
diff --git a/src/fs/gnunet-service-fs_mesh_server.c b/src/fs/gnunet-service-fs_mesh_server.c
index fe2d43135..e157c40e6 100644
--- a/src/fs/gnunet-service-fs_mesh_server.c
+++ b/src/fs/gnunet-service-fs_mesh_server.c
@@ -465,7 +465,7 @@ static void *
 accept_cb (void *cls,
            struct GNUNET_MESH_Channel *channel,
            const struct GNUNET_PeerIdentity *initiator,
-           uint32_t port, enum MeshOption options)
+           uint32_t port, enum GNUNET_MESH_ChannelOption options)
 {
   struct MeshClient *sc;
 
diff --git a/src/include/gnunet_mesh_service.h b/src/include/gnunet_mesh_service.h
index e82d71bc1..785197471 100644
--- a/src/include/gnunet_mesh_service.h
+++ b/src/include/gnunet_mesh_service.h
@@ -59,7 +59,7 @@ struct GNUNET_MESH_Channel;
  * Channel options.
  * Second line indicates filed in the MeshChannelInfo union carrying the answer.
  */
-enum MeshOption
+enum GNUNET_MESH_ChannelOption
 {
   /**
    * Default options: unreliable, default buffering, not out of order.
@@ -166,7 +166,7 @@ typedef void *(GNUNET_MESH_InboundChannelNotificationHandler) (void *cls,
                                                                GNUNET_PeerIdentity
                                                                * initiator,
                                                                uint32_t port,
-                                                               enum MeshOption
+                                                               enum GNUNET_MESH_ChannelOption
                                                                options);
 
 
@@ -249,7 +249,7 @@ GNUNET_MESH_channel_create (struct GNUNET_MESH_Handle *h,
                             void *channel_ctx,
                             const struct GNUNET_PeerIdentity *peer,
                             uint32_t port,
-                            enum MeshOption options);
+                            enum GNUNET_MESH_ChannelOption options);
 
 
 /**
@@ -293,7 +293,7 @@ union GNUNET_MESH_ChannelInfo
  */
 const union GNUNET_MESH_ChannelInfo *
 GNUNET_MESH_channel_get_info (struct GNUNET_MESH_Channel *channel,
-                              enum MeshOption option, ...);
+                              enum GNUNET_MESH_ChannelOption option, ...);
 
 
 /**
diff --git a/src/mesh/gnunet-mesh.c b/src/mesh/gnunet-mesh.c
index 226440537..b349cf500 100644
--- a/src/mesh/gnunet-mesh.c
+++ b/src/mesh/gnunet-mesh.c
@@ -254,7 +254,7 @@ static void *
 channel_incoming (void *cls,
                   struct GNUNET_MESH_Channel * channel,
                   const struct GNUNET_PeerIdentity * initiator,
-                  uint32_t port, enum MeshOption options)
+                  uint32_t port, enum GNUNET_MESH_ChannelOption options)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Incoming channel %p on port %u\n",
diff --git a/src/mesh/mesh_api.c b/src/mesh/mesh_api.c
index 46dfe546f..d1f134659 100644
--- a/src/mesh/mesh_api.c
+++ b/src/mesh/mesh_api.c
@@ -279,7 +279,7 @@ struct GNUNET_MESH_Channel
     /**
      * Channel options: reliability, etc.
      */
-  enum MeshOption options;
+  enum GNUNET_MESH_ChannelOption options;
 
     /**
      * Are we allowed to send to the service?
@@ -1382,7 +1382,7 @@ GNUNET_MESH_channel_create (struct GNUNET_MESH_Handle *h,
                             void *channel_ctx,
                             const struct GNUNET_PeerIdentity *peer,
                             uint32_t port,
-                            enum MeshOption options)
+                            enum GNUNET_MESH_ChannelOption options)
 {
   struct GNUNET_MESH_Channel *ch;
   struct GNUNET_MESH_ChannelMessage msg;
@@ -1457,7 +1457,7 @@ GNUNET_MESH_channel_destroy (struct GNUNET_MESH_Channel *channel)
  */
 const union GNUNET_MESH_ChannelInfo *
 GNUNET_MESH_channel_get_info (struct GNUNET_MESH_Channel *channel,
-                              enum MeshOption option, ...)
+                              enum GNUNET_MESH_ChannelOption option, ...)
 {
   static int bool_flag;
   const union GNUNET_MESH_ChannelInfo *ret;
diff --git a/src/mesh/test_mesh_local.c b/src/mesh/test_mesh_local.c
index 35a16b0d9..14520aa28 100644
--- a/src/mesh/test_mesh_local.c
+++ b/src/mesh/test_mesh_local.c
@@ -148,7 +148,7 @@ data_callback (void *cls, struct GNUNET_MESH_Channel *channel,
 static void *
 inbound_channel (void *cls, struct GNUNET_MESH_Channel *channel,
                 const struct GNUNET_PeerIdentity *initiator,
-                uint32_t port, enum MeshOption options)
+                uint32_t port, enum GNUNET_MESH_ChannelOption options)
 {
   long id = (long) cls;
 
diff --git a/src/mesh/test_mesh_single.c b/src/mesh/test_mesh_single.c
index 689139b82..b40efa92b 100644
--- a/src/mesh/test_mesh_single.c
+++ b/src/mesh/test_mesh_single.c
@@ -169,7 +169,7 @@ data_callback (void *cls, struct GNUNET_MESH_Channel *channel,
 static void *
 inbound_channel (void *cls, struct GNUNET_MESH_Channel *channel,
                 const struct GNUNET_PeerIdentity *initiator,
-                uint32_t port, enum MeshOption options)
+                uint32_t port, enum GNUNET_MESH_ChannelOption options)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "received incoming channel on port %u\n",
diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c
index e63e343cf..f686a01f5 100644
--- a/src/mesh/test_mesh_small.c
+++ b/src/mesh/test_mesh_small.c
@@ -543,7 +543,7 @@ static struct GNUNET_MESH_MessageHandler handlers[] = {
 static void *
 incoming_channel (void *cls, struct GNUNET_MESH_Channel *channel,
                  const struct GNUNET_PeerIdentity *initiator,
-                 uint32_t port, enum MeshOption options)
+                 uint32_t port, enum GNUNET_MESH_ChannelOption options)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Incoming channel from %s to peer %d\n",
@@ -630,7 +630,7 @@ channel_cleaner (void *cls, const struct GNUNET_MESH_Channel *channel,
 static void
 do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  enum MeshOption flags;
+  enum GNUNET_MESH_ChannelOption flags;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test_task\n");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "add peer 2\n");
diff --git a/src/scalarproduct/gnunet-service-scalarproduct.c b/src/scalarproduct/gnunet-service-scalarproduct.c
index d6b0deeac..ad788bb57 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct.c
@@ -1852,7 +1852,7 @@ static void *
 channel_incoming_handler (void *cls,
                          struct GNUNET_MESH_Channel *channel,
                          const struct GNUNET_PeerIdentity *initiator,
-                         uint32_t port, enum MeshOption options)
+                         uint32_t port, enum GNUNET_MESH_ChannelOption options)
 {
   struct ServiceSession * c = GNUNET_new (struct ServiceSession);
 
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index e5dec36c3..cf03b06aa 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -1208,7 +1208,7 @@ static void *
 channel_new_cb (void *cls,
                struct GNUNET_MESH_Channel *channel,
                const struct GNUNET_PeerIdentity *initiator,
-               uint32_t port, enum MeshOption options)
+               uint32_t port, enum GNUNET_MESH_ChannelOption options)
 {
   struct Operation *incoming;
   static const struct SetVT incoming_vt = {