[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31192 - in gnunet/src: conversation exit fs include mesh s
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31192 - in gnunet/src: conversation exit fs include mesh scalarproduct set |
Date: |
Sun, 8 Dec 2013 23:52:12 +0100 |
Author: grothoff
Date: 2013-12-08 23:52:12 +0100 (Sun, 08 Dec 2013)
New Revision: 31192
Modified:
gnunet/src/conversation/gnunet-service-conversation.c
gnunet/src/exit/gnunet-daemon-exit.c
gnunet/src/fs/gnunet-service-fs_mesh_server.c
gnunet/src/include/gnunet_mesh_service.h
gnunet/src/mesh/gnunet-mesh.c
gnunet/src/mesh/mesh_api.c
gnunet/src/mesh/test_mesh_local.c
gnunet/src/mesh/test_mesh_single.c
gnunet/src/mesh/test_mesh_small.c
gnunet/src/scalarproduct/gnunet-service-scalarproduct.c
gnunet/src/set/gnunet-service-set.c
Log:
-rename enum MeshOption to GNUNET_MESH_ChannelOption to ensure we use
GNUNET_MESH_ prefix as we should
Modified: gnunet/src/conversation/gnunet-service-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-service-conversation.c 2013-12-08
22:51:19 UTC (rev 31191)
+++ gnunet/src/conversation/gnunet-service-conversation.c 2013-12-08
22:52:12 UTC (rev 31192)
@@ -1295,7 +1295,7 @@
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"),
Modified: gnunet/src/exit/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/exit/gnunet-daemon-exit.c 2013-12-08 22:51:19 UTC (rev
31191)
+++ gnunet/src/exit/gnunet-daemon-exit.c 2013-12-08 22:52:12 UTC (rev
31192)
@@ -3015,7 +3015,7 @@
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);
Modified: gnunet/src/fs/gnunet-service-fs_mesh_server.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_mesh_server.c 2013-12-08 22:51:19 UTC
(rev 31191)
+++ gnunet/src/fs/gnunet-service-fs_mesh_server.c 2013-12-08 22:52:12 UTC
(rev 31192)
@@ -465,7 +465,7 @@
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;
Modified: gnunet/src/include/gnunet_mesh_service.h
===================================================================
--- gnunet/src/include/gnunet_mesh_service.h 2013-12-08 22:51:19 UTC (rev
31191)
+++ gnunet/src/include/gnunet_mesh_service.h 2013-12-08 22:52:12 UTC (rev
31192)
@@ -59,7 +59,7 @@
* 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 @@
GNUNET_PeerIdentity
* initiator,
uint32_t port,
- enum MeshOption
+ enum
GNUNET_MESH_ChannelOption
options);
@@ -249,7 +249,7 @@
void *channel_ctx,
const struct GNUNET_PeerIdentity *peer,
uint32_t port,
- enum MeshOption options);
+ enum GNUNET_MESH_ChannelOption options);
/**
@@ -293,7 +293,7 @@
*/
const union GNUNET_MESH_ChannelInfo *
GNUNET_MESH_channel_get_info (struct GNUNET_MESH_Channel *channel,
- enum MeshOption option, ...);
+ enum GNUNET_MESH_ChannelOption option, ...);
/**
Modified: gnunet/src/mesh/gnunet-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-mesh.c 2013-12-08 22:51:19 UTC (rev 31191)
+++ gnunet/src/mesh/gnunet-mesh.c 2013-12-08 22:52:12 UTC (rev 31192)
@@ -254,7 +254,7 @@
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",
Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c 2013-12-08 22:51:19 UTC (rev 31191)
+++ gnunet/src/mesh/mesh_api.c 2013-12-08 22:52:12 UTC (rev 31192)
@@ -279,7 +279,7 @@
/**
* Channel options: reliability, etc.
*/
- enum MeshOption options;
+ enum GNUNET_MESH_ChannelOption options;
/**
* Are we allowed to send to the service?
@@ -1382,7 +1382,7 @@
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 @@
*/
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;
Modified: gnunet/src/mesh/test_mesh_local.c
===================================================================
--- gnunet/src/mesh/test_mesh_local.c 2013-12-08 22:51:19 UTC (rev 31191)
+++ gnunet/src/mesh/test_mesh_local.c 2013-12-08 22:52:12 UTC (rev 31192)
@@ -148,7 +148,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)
{
long id = (long) cls;
Modified: gnunet/src/mesh/test_mesh_single.c
===================================================================
--- gnunet/src/mesh/test_mesh_single.c 2013-12-08 22:51:19 UTC (rev 31191)
+++ gnunet/src/mesh/test_mesh_single.c 2013-12-08 22:52:12 UTC (rev 31192)
@@ -169,7 +169,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_DEBUG,
"received incoming channel on port %u\n",
Modified: gnunet/src/mesh/test_mesh_small.c
===================================================================
--- gnunet/src/mesh/test_mesh_small.c 2013-12-08 22:51:19 UTC (rev 31191)
+++ gnunet/src/mesh/test_mesh_small.c 2013-12-08 22:52:12 UTC (rev 31192)
@@ -543,7 +543,7 @@
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 @@
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");
Modified: gnunet/src/scalarproduct/gnunet-service-scalarproduct.c
===================================================================
--- gnunet/src/scalarproduct/gnunet-service-scalarproduct.c 2013-12-08
22:51:19 UTC (rev 31191)
+++ gnunet/src/scalarproduct/gnunet-service-scalarproduct.c 2013-12-08
22:52:12 UTC (rev 31192)
@@ -1852,7 +1852,7 @@
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);
Modified: gnunet/src/set/gnunet-service-set.c
===================================================================
--- gnunet/src/set/gnunet-service-set.c 2013-12-08 22:51:19 UTC (rev 31191)
+++ gnunet/src/set/gnunet-service-set.c 2013-12-08 22:52:12 UTC (rev 31192)
@@ -1208,7 +1208,7 @@
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 = {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31192 - in gnunet/src: conversation exit fs include mesh scalarproduct set,
gnunet <=