[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: renames to avoid ambiguity
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: renames to avoid ambiguity |
|
Date: |
Sat, 21 Jan 2017 14:51:30 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 745cf54e6 renames to avoid ambiguity
745cf54e6 is described below
commit 745cf54e655a9fb40a4ba3643de09a3471ca6ef6
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Jan 21 14:51:28 2017 +0100
renames to avoid ambiguity
---
src/cadet/cadet.h | 8 ++++----
src/cadet/cadet_api.c | 24 ++++++++++++------------
src/cadet/gnunet-service-cadet-new.c | 16 ++++++++--------
src/cadet/gnunet-service-cadet-new_channel.c | 8 ++++----
src/cadet/gnunet-service-cadet_channel.c | 2 +-
src/cadet/gnunet-service-cadet_channel.h | 2 +-
src/cadet/gnunet-service-cadet_local.c | 26 +++++++++++++-------------
src/include/gnunet_protocols.h | 4 ++--
8 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/src/cadet/cadet.h b/src/cadet/cadet.h
index 205955b05..a8cd6831a 100644
--- a/src/cadet/cadet.h
+++ b/src/cadet/cadet.h
@@ -135,10 +135,10 @@ struct GNUNET_CADET_PortMessage
/**
* Message for a client to create channels.
*/
-struct GNUNET_CADET_TunnelCreateMessage
+struct GNUNET_CADET_LocalChannelCreateMessage
{
/**
- * Type: #GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_CREATE
+ * Type: #GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE
*
* Size: sizeof(struct GNUNET_CADET_ChannelOpenMessageMessage)
*/
@@ -169,10 +169,10 @@ struct GNUNET_CADET_TunnelCreateMessage
/**
* Message for or to a client to destroy tunnel.
*/
-struct GNUNET_CADET_TunnelDestroyMessage
+struct GNUNET_CADET_LocalChannelDestroyMessage
{
/**
- * Type: #GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_DESTROY
+ * Type: #GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY
*/
struct GNUNET_MessageHeader header;
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index fa67eb094..494aab612 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -588,7 +588,7 @@ request_data (void *cls)
*/
static void
handle_channel_created (void *cls,
- const struct GNUNET_CADET_TunnelCreateMessage *msg)
+ const struct GNUNET_CADET_LocalChannelCreateMessage
*msg)
{
struct GNUNET_CADET_Handle *h = cls;
struct GNUNET_CADET_Channel *ch;
@@ -628,12 +628,12 @@ handle_channel_created (void *cls,
}
else
{
- struct GNUNET_CADET_TunnelDestroyMessage *d_msg;
+ struct GNUNET_CADET_LocalChannelDestroyMessage *d_msg;
struct GNUNET_MQ_Envelope *env;
LOG (GNUNET_ERROR_TYPE_DEBUG, "No handler for incoming channels\n");
env = GNUNET_MQ_msg (d_msg,
- GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_DESTROY);
+ GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY);
d_msg->channel_id = msg->channel_id;
GNUNET_MQ_send (h->mq, env);
}
@@ -649,7 +649,7 @@ handle_channel_created (void *cls,
*/
static void
handle_channel_destroy (void *cls,
- const struct GNUNET_CADET_TunnelDestroyMessage *msg)
+ const struct GNUNET_CADET_LocalChannelDestroyMessage
*msg)
{
struct GNUNET_CADET_Handle *h = cls;
struct GNUNET_CADET_Channel *ch;
@@ -1282,12 +1282,12 @@ do_reconnect (struct GNUNET_CADET_Handle *h)
{
struct GNUNET_MQ_MessageHandler handlers[] = {
GNUNET_MQ_hd_fixed_size (channel_created,
- GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_CREATE,
- struct GNUNET_CADET_TunnelCreateMessage,
+ GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE,
+ struct GNUNET_CADET_LocalChannelCreateMessage,
h),
GNUNET_MQ_hd_fixed_size (channel_destroy,
- GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_DESTROY,
- struct GNUNET_CADET_TunnelDestroyMessage,
+ GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY,
+ struct GNUNET_CADET_LocalChannelDestroyMessage,
h),
GNUNET_MQ_hd_var_size (local_data,
GNUNET_MESSAGE_TYPE_CADET_LOCAL_DATA,
@@ -1576,7 +1576,7 @@ GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle
*h,
const struct GNUNET_HashCode *port,
enum GNUNET_CADET_ChannelOption options)
{
- struct GNUNET_CADET_TunnelCreateMessage *msg;
+ struct GNUNET_CADET_LocalChannelCreateMessage *msg;
struct GNUNET_MQ_Envelope *env;
struct GNUNET_CADET_Channel *ch;
struct GNUNET_CADET_ClientChannelNumber chid;
@@ -1592,7 +1592,7 @@ GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle
*h,
ch->ctx = channel_ctx;
ch->peer = GNUNET_PEER_intern (peer);
- env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_CREATE);
+ env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE);
msg->channel_id = ch->chid;
msg->port = *port;
msg->peer = *peer;
@@ -1608,7 +1608,7 @@ void
GNUNET_CADET_channel_destroy (struct GNUNET_CADET_Channel *channel)
{
struct GNUNET_CADET_Handle *h;
- struct GNUNET_CADET_TunnelDestroyMessage *msg;
+ struct GNUNET_CADET_LocalChannelDestroyMessage *msg;
struct GNUNET_MQ_Envelope *env;
struct GNUNET_CADET_TransmitHandle *th;
struct GNUNET_CADET_TransmitHandle *next;
@@ -1638,7 +1638,7 @@ GNUNET_CADET_channel_destroy (struct GNUNET_CADET_Channel
*channel)
}
env = GNUNET_MQ_msg (msg,
- GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_DESTROY);
+ GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY);
msg->channel_id = channel->chid;
GNUNET_MQ_send (h->mq, env);
diff --git a/src/cadet/gnunet-service-cadet-new.c
b/src/cadet/gnunet-service-cadet-new.c
index b6bdcc9fc..a60ef647a 100644
--- a/src/cadet/gnunet-service-cadet-new.c
+++ b/src/cadet/gnunet-service-cadet-new.c
@@ -277,7 +277,7 @@ GSC_bind (struct CadetClient *c,
uint32_t options)
{
struct GNUNET_MQ_Envelope *env;
- struct GNUNET_CADET_TunnelCreateMessage *msg;
+ struct GNUNET_CADET_LocalChannelCreateMessage *msg;
struct GNUNET_CADET_ClientChannelNumber lid;
lid = client_get_next_lid (c);
@@ -289,7 +289,7 @@ GSC_bind (struct CadetClient *c,
/* notify local client about incoming connection! */
env = GNUNET_MQ_msg (msg,
- GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_CREATE);
+ GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE);
msg->channel_id = lid;
msg->port = *port;
msg->opt = htonl (options);
@@ -469,7 +469,7 @@ handle_port_close (void *cls,
*/
static void
handle_tunnel_create (void *cls,
- const struct GNUNET_CADET_TunnelCreateMessage *tcm)
+ const struct GNUNET_CADET_LocalChannelCreateMessage *tcm)
{
struct CadetClient *c = cls;
struct CadetChannel *ch;
@@ -550,7 +550,7 @@ get_map_by_chid (struct CadetClient *c,
*/
static void
handle_tunnel_destroy (void *cls,
- const struct GNUNET_CADET_TunnelDestroyMessage *msg)
+ const struct GNUNET_CADET_LocalChannelDestroyMessage
*msg)
{
struct CadetClient *c = cls;
struct GNUNET_CADET_ClientChannelNumber chid;
@@ -1316,12 +1316,12 @@ GNUNET_SERVICE_MAIN
struct GNUNET_CADET_PortMessage,
NULL),
GNUNET_MQ_hd_fixed_size (tunnel_create,
- GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_CREATE,
- struct GNUNET_CADET_TunnelCreateMessage,
+ GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE,
+ struct GNUNET_CADET_LocalChannelCreateMessage,
NULL),
GNUNET_MQ_hd_fixed_size (tunnel_destroy,
- GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_DESTROY,
- struct GNUNET_CADET_TunnelDestroyMessage,
+ GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY,
+ struct GNUNET_CADET_LocalChannelDestroyMessage,
NULL),
GNUNET_MQ_hd_var_size (data,
GNUNET_MESSAGE_TYPE_CADET_LOCAL_DATA,
diff --git a/src/cadet/gnunet-service-cadet-new_channel.c
b/src/cadet/gnunet-service-cadet-new_channel.c
index aac0d604d..d7981656c 100644
--- a/src/cadet/gnunet-service-cadet-new_channel.c
+++ b/src/cadet/gnunet-service-cadet-new_channel.c
@@ -665,7 +665,7 @@ GCCH_bind (struct CadetChannel *ch,
struct CadetClient *c)
{
struct GNUNET_MQ_Envelope *env;
- struct GNUNET_CADET_TunnelCreateMessage *tcm;
+ struct GNUNET_CADET_LocalChannelCreateMessage *tcm;
uint32_t options;
if (NULL != ch->retry_task)
@@ -694,7 +694,7 @@ GCCH_bind (struct CadetChannel *ch,
ch);
/* give client it's initial supply of ACKs */
env = GNUNET_MQ_msg (tcm,
- GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_CREATE);
+ GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE);
tcm->channel_id = ch->lid;
tcm->peer = *GCP_get_id (GCT_get_destination (ch->t));
tcm->port = ch->port;
@@ -973,11 +973,11 @@ void
GCCH_handle_remote_destroy (struct CadetChannel *ch)
{
struct GNUNET_MQ_Envelope *env;
- struct GNUNET_CADET_TunnelDestroyMessage *tdm;
+ struct GNUNET_CADET_LocalChannelDestroyMessage *tdm;
ch->destroy = GNUNET_YES;
env = GNUNET_MQ_msg (tdm,
- GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_DESTROY);
+ GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY);
tdm->channel_id = ch->lid;
GSC_send_to_client ((NULL != ch->owner) ? ch->owner : ch->dest,
env);
diff --git a/src/cadet/gnunet-service-cadet_channel.c
b/src/cadet/gnunet-service-cadet_channel.c
index 750acd8fd..1de6ea865 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -1847,7 +1847,7 @@ GCCH_handle_local_destroy (struct CadetChannel *ch,
*/
int
GCCH_handle_local_create (struct CadetClient *c,
- struct GNUNET_CADET_TunnelCreateMessage *msg)
+ struct GNUNET_CADET_LocalChannelCreateMessage *msg)
{
struct CadetChannel *ch;
struct CadetTunnel *t;
diff --git a/src/cadet/gnunet-service-cadet_channel.h
b/src/cadet/gnunet-service-cadet_channel.h
index e3926995f..9d4893269 100644
--- a/src/cadet/gnunet-service-cadet_channel.h
+++ b/src/cadet/gnunet-service-cadet_channel.h
@@ -226,7 +226,7 @@ GCCH_handle_local_destroy (struct CadetChannel *ch,
*/
int
GCCH_handle_local_create (struct CadetClient *c,
- struct GNUNET_CADET_TunnelCreateMessage *msg);
+ struct GNUNET_CADET_LocalChannelCreateMessage *msg);
/**
* Handler for cadet network payload traffic.
diff --git a/src/cadet/gnunet-service-cadet_local.c
b/src/cadet/gnunet-service-cadet_local.c
index bfb4195a5..a993f5758 100644
--- a/src/cadet/gnunet-service-cadet_local.c
+++ b/src/cadet/gnunet-service-cadet_local.c
@@ -440,7 +440,7 @@ handle_channel_create (void *cls, struct
GNUNET_SERVER_Client *client,
LOG (GNUNET_ERROR_TYPE_DEBUG, " by client %u\n", c->id);
/* Message size sanity check */
- if (sizeof (struct GNUNET_CADET_TunnelCreateMessage)
+ if (sizeof (struct GNUNET_CADET_LocalChannelCreateMessage)
!= ntohs (message->size))
{
GNUNET_break (0);
@@ -450,7 +450,7 @@ handle_channel_create (void *cls, struct
GNUNET_SERVER_Client *client,
if (GNUNET_OK !=
GCCH_handle_local_create (c,
- (struct GNUNET_CADET_TunnelCreateMessage *)
+ (struct GNUNET_CADET_LocalChannelCreateMessage
*)
message))
{
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
@@ -472,7 +472,7 @@ static void
handle_channel_destroy (void *cls, struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
- const struct GNUNET_CADET_TunnelDestroyMessage *msg;
+ const struct GNUNET_CADET_LocalChannelDestroyMessage *msg;
struct CadetClient *c;
struct CadetChannel *ch;
struct GNUNET_CADET_ClientChannelNumber chid;
@@ -489,7 +489,7 @@ handle_channel_destroy (void *cls, struct
GNUNET_SERVER_Client *client,
LOG (GNUNET_ERROR_TYPE_DEBUG, " by client %u\n", c->id);
/* Message sanity check */
- if (sizeof (struct GNUNET_CADET_TunnelDestroyMessage)
+ if (sizeof (struct GNUNET_CADET_LocalChannelDestroyMessage)
!= ntohs (message->size))
{
GNUNET_break (0);
@@ -497,7 +497,7 @@ handle_channel_destroy (void *cls, struct
GNUNET_SERVER_Client *client,
return;
}
- msg = (const struct GNUNET_CADET_TunnelDestroyMessage *) message;
+ msg = (const struct GNUNET_CADET_LocalChannelDestroyMessage *) message;
/* Retrieve tunnel */
chid = msg->channel_id;
@@ -1127,10 +1127,10 @@ static struct GNUNET_SERVER_MessageHandler
client_handlers[] = {
sizeof (struct GNUNET_CADET_PortMessage)},
{&handle_port_close, NULL, GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_CLOSE,
sizeof (struct GNUNET_CADET_PortMessage)},
- {&handle_channel_create, NULL, GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_CREATE,
- sizeof (struct GNUNET_CADET_TunnelCreateMessage)},
- {&handle_channel_destroy, NULL,
GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_DESTROY,
- sizeof (struct GNUNET_CADET_TunnelDestroyMessage)},
+ {&handle_channel_create, NULL,
GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE,
+ sizeof (struct GNUNET_CADET_LocalChannelCreateMessage)},
+ {&handle_channel_destroy, NULL,
GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY,
+ sizeof (struct GNUNET_CADET_LocalChannelDestroyMessage)},
{&handle_data, NULL, GNUNET_MESSAGE_TYPE_CADET_LOCAL_DATA, 0},
{&handle_ack, NULL, GNUNET_MESSAGE_TYPE_CADET_LOCAL_ACK,
sizeof (struct GNUNET_CADET_LocalAck)},
@@ -1433,10 +1433,10 @@ GML_send_channel_create (struct CadetClient *c,
uint32_t opt,
const struct GNUNET_PeerIdentity *peer)
{
- struct GNUNET_CADET_TunnelCreateMessage msg;
+ struct GNUNET_CADET_LocalChannelCreateMessage msg;
msg.header.size = htons (sizeof (msg));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_CREATE);
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE);
msg.channel_id = id;
msg.port = *port;
msg.opt = htonl (opt);
@@ -1483,7 +1483,7 @@ void
GML_send_channel_destroy (struct CadetClient *c,
struct GNUNET_CADET_ClientChannelNumber id)
{
- struct GNUNET_CADET_TunnelDestroyMessage msg;
+ struct GNUNET_CADET_LocalChannelDestroyMessage msg;
if (NULL == c)
{
@@ -1493,7 +1493,7 @@ GML_send_channel_destroy (struct CadetClient *c,
if (GNUNET_YES == c->shutting_down)
return;
msg.header.size = htons (sizeof (msg));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_DESTROY);
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY);
msg.channel_id = id;
GNUNET_SERVER_notification_context_unicast (nc, c->handle,
&msg.header, GNUNET_NO);
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index cae19d5d8..4079aa0e4 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -2735,12 +2735,12 @@ extern "C"
/**
* Ask the cadet service to create a new channel.
*/
-#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_CREATE 1024
+#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE 1024
/**
* Tell client that a channel was destroyed.
*/
-#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_DESTROY 1025
+#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY 1025
/********************************** Monitor
*********************************/
--
To stop receiving notification emails like this one, please contact
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: renames to avoid ambiguity,
gnunet <=