From c4fa51bb2d924fe3f7fc94f3c1cbdda179b8a4d5 Mon Sep 17 00:00:00 2001 From: t3sserakt Date: Mon, 24 Jun 2019 11:47:25 +0200 Subject: removed GNUNET_CADET_ChannelOption --- src/cadet/cadet_api.c | 48 ++++++++++++++--------------- src/cadet/gnunet-cadet.c | 3 -- src/cadet/gnunet-service-cadet_channel.c | 21 ------------- src/cadet/gnunet-service-cadet_connection.c | 15 --------- src/cadet/gnunet-service-cadet_connection.h | 5 --- src/cadet/gnunet-service-cadet_core.c | 7 ++--- src/cadet/gnunet-service-cadet_tunnels.h | 2 -- src/include/gnunet_cadet_service.h | 47 ---------------------------- 8 files changed, 26 insertions(+), 122 deletions(-) diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c index e141787a0..4bd5911ce 100644 --- a/src/cadet/cadet_api.c +++ b/src/cadet/cadet_api.c @@ -32,6 +32,17 @@ #define LOG(kind, ...) GNUNET_log_from (kind, "cadet-api", __VA_ARGS__) +enum GNUNET_CADET_ChannelInfoOption +{ + /** + * Who is the peer at the other end of the channel. + * Only for use in @c GNUNET_CADET_channel_get_info + * struct GNUNET_PeerIdentity *peer + */ + GNUNET_CADET_OPTION_PEER = 0x0 + +}; + /** * Opaque handle to the service. */ @@ -133,11 +144,6 @@ struct GNUNET_CADET_Channel */ struct GNUNET_CADET_ClientChannelNumber ccn; - /** - * Channel options: reliability, etc. - */ - enum GNUNET_CADET_ChannelOption options; - /** * How many messages are we allowed to send to the service right now? */ @@ -578,7 +584,6 @@ handle_channel_created ( ch = create_channel (h, &ccn); ch->peer = msg->peer; ch->incoming_port = port; - ch->options = ntohl (msg->opt); LOG (GNUNET_ERROR_TYPE_DEBUG, "Creating incoming channel %X [%s] %p\n", ntohl (ccn.channel_of_client), @@ -938,29 +943,21 @@ GNUNET_CADET_channel_destroy (struct GNUNET_CADET_Channel *channel) */ const union GNUNET_CADET_ChannelInfo * GNUNET_CADET_channel_get_info (struct GNUNET_CADET_Channel *channel, - enum GNUNET_CADET_ChannelOption option, + enum GNUNET_CADET_ChannelInfoOption option, ...) { static int bool_flag; switch (option) { - case GNUNET_CADET_OPTION_NOBUFFER: - case GNUNET_CADET_OPTION_RELIABLE: - case GNUNET_CADET_OPTION_OUT_OF_ORDER: - if (0 != (option & channel->options)) - bool_flag = GNUNET_YES; - else - bool_flag = GNUNET_NO; - return (const union GNUNET_CADET_ChannelInfo *) &bool_flag; - break; - case GNUNET_CADET_OPTION_PEER: - return (const union GNUNET_CADET_ChannelInfo *) &channel->peer; - break; - default: - GNUNET_break (0); - return NULL; + case GNUNET_CADET_OPTION_PEER: + return (const union GNUNET_CADET_ChannelInfo *) &channel->peer; + break; + default: + GNUNET_break (0); + return NULL; } + return (const union GNUNET_CADET_ChannelInfo *) &channel->peer; } @@ -1089,7 +1086,6 @@ GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h, void *channel_cls, const struct GNUNET_PeerIdentity *destination, const struct GNUNET_HashCode *port, - enum GNUNET_CADET_ChannelOption options, GNUNET_CADET_WindowSizeEventHandler window_changes, GNUNET_CADET_DisconnectEventHandler disconnects, const struct GNUNET_MQ_MessageHandler *handlers) @@ -1106,7 +1102,6 @@ GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h, ch = create_channel (h, NULL); ch->ctx = channel_cls; ch->peer = *destination; - ch->options = options; ch->window_changes = window_changes; ch->disconnects = disconnects; @@ -1125,8 +1120,13 @@ GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h, msg->ccn = ch->ccn; msg->port = *port; msg->peer = *destination; +<<<<<<< 17611641fe7da3d2711e1f20eaf2ee81faf0e702 msg->opt = htonl (options); GNUNET_MQ_send (h->mq, env); +======= + GNUNET_MQ_send (h->mq, + env); +>>>>>>> removed GNUNET_CADET_ChannelOption return ch; } diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c index 932d069a1..262cdf64d 100644 --- a/src/cadet/gnunet-cadet.c +++ b/src/cadet/gnunet-cadet.c @@ -784,7 +784,6 @@ run (void *cls, if (NULL != target_id) { struct GNUNET_PeerIdentity pid; - enum GNUNET_CADET_ChannelOption opt; if (GNUNET_OK != GNUNET_CRYPTO_eddsa_public_key_from_string (target_id, @@ -801,7 +800,6 @@ run (void *cls, "Connecting to `%s:%s'\n", target_id, target_port); - opt = GNUNET_CADET_OPTION_DEFAULT | GNUNET_CADET_OPTION_RELIABLE; GNUNET_CRYPTO_hash (target_port, strlen(target_port), &porthash); @@ -809,7 +807,6 @@ run (void *cls, NULL, &pid, &porthash, - opt, NULL /* window changes */, &channel_ended, handlers); diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c index a1f6e37c2..4136dd5dd 100644 --- a/src/cadet/gnunet-service-cadet_channel.c +++ b/src/cadet/gnunet-service-cadet_channel.c @@ -591,22 +591,13 @@ send_channel_open (void *cls) { struct CadetChannel *ch = cls; struct GNUNET_CADET_ChannelOpenMessage msgcc; - uint32_t options; ch->retry_control_task = NULL; LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending CHANNEL_OPEN message for %s\n", GCCH_2s (ch)); - options = 0; - if (ch->nobuffer) - options |= GNUNET_CADET_OPTION_NOBUFFER; - if (ch->reliable) - options |= GNUNET_CADET_OPTION_RELIABLE; - if (ch->out_of_order) - options |= GNUNET_CADET_OPTION_OUT_OF_ORDER; msgcc.header.size = htons (sizeof (msgcc)); msgcc.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_CHANNEL_OPEN); - msgcc.opt = htonl (options); msgcc.h_port = ch->h_port; msgcc.ctn = ch->ctn; ch->state = CADET_CHANNEL_OPEN_SENT; @@ -670,9 +661,6 @@ GCCH_channel_local_new (struct CadetClient *owner, ch = GNUNET_new (struct CadetChannel); ch->mid_recv.mid = htonl (1); /* The OPEN_ACK counts as message 0! */ - ch->nobuffer = (0 != (options & GNUNET_CADET_OPTION_NOBUFFER)); - ch->reliable = (0 != (options & GNUNET_CADET_OPTION_RELIABLE)); - ch->out_of_order = (0 != (options & GNUNET_CADET_OPTION_OUT_OF_ORDER)); ch->max_pending_messages = (ch->nobuffer) ? 1 : 4; /* FIXME: 4!? Do not hardcode! */ ch->owner = ccco; ch->port = *port; @@ -771,9 +759,6 @@ GCCH_channel_incoming_new (struct CadetTunnel *t, ch->t = t; ch->ctn = ctn; ch->retry_time = CADET_INITIAL_RETRANSMIT_TIME; - ch->nobuffer = (0 != (options & GNUNET_CADET_OPTION_NOBUFFER)); - ch->reliable = (0 != (options & GNUNET_CADET_OPTION_RELIABLE)); - ch->out_of_order = (0 != (options & GNUNET_CADET_OPTION_OUT_OF_ORDER)); ch->max_pending_messages = (ch->nobuffer) ? 1 : 4; /* FIXME: 4!? Do not hardcode! */ GNUNET_STATISTICS_update (stats, "# channels", @@ -998,12 +983,6 @@ GCCH_bind (struct CadetChannel *ch, ch->retry_control_task = NULL; } options = 0; - if (ch->nobuffer) - options |= GNUNET_CADET_OPTION_NOBUFFER; - if (ch->reliable) - options |= GNUNET_CADET_OPTION_RELIABLE; - if (ch->out_of_order) - options |= GNUNET_CADET_OPTION_OUT_OF_ORDER; cccd = GNUNET_new (struct CadetChannelClient); GNUNET_assert (NULL == ch->dest); ch->dest = cccd; diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c index 1f7e86d60..7b3a0b975 100644 --- a/src/cadet/gnunet-service-cadet_connection.c +++ b/src/cadet/gnunet-service-cadet_connection.c @@ -160,11 +160,6 @@ struct CadetConnection */ enum CadetConnectionState state; - /** - * Options for the route, control buffering. - */ - enum GNUNET_CADET_ChannelOption options; - /** * How many latency observations did we make for this connection? */ @@ -635,7 +630,6 @@ send_create (void *cls) env = GNUNET_MQ_msg_extra (create_msg, (2 + cc->off) * sizeof (struct GNUNET_PeerIdentity), GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE); - create_msg->options = htonl ((uint32_t) cc->options); create_msg->cid = cc->cid; pids = (struct GNUNET_PeerIdentity *) &create_msg[1]; pids[0] = my_full_id; @@ -825,7 +819,6 @@ manage_first_hop_mq (void *cls, * @param destination where to go * @param path which path to take (may not be the full path) * @param off offset of @a destination on @a path - * @param options options for the connection * @param ct which tunnel uses this connection * @param init_state initial state for the connection * @param ready_cb function to call when ready to transmit @@ -836,7 +829,6 @@ static struct CadetConnection * connection_create (struct CadetPeer *destination, struct CadetPeerPath *path, unsigned int off, - enum GNUNET_CADET_ChannelOption options, struct CadetTConnection *ct, const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid, enum CadetConnectionState init_state, @@ -847,7 +839,6 @@ connection_create (struct CadetPeer *destination, struct CadetPeer *first_hop; cc = GNUNET_new (struct CadetConnection); - cc->options = options; cc->state = init_state; cc->ct = ct; cc->cid = *cid; @@ -890,7 +881,6 @@ connection_create (struct CadetPeer *destination, * * @param destination where to go * @param path which path to take (may not be the full path) - * @param options options for the connection * @param ct which tunnel uses this connection * @param ready_cb function to call when ready to transmit * @param ready_cb_cls closure for @a cb @@ -900,7 +890,6 @@ connection_create (struct CadetPeer *destination, struct CadetConnection * GCC_create_inbound (struct CadetPeer *destination, struct CadetPeerPath *path, - enum GNUNET_CADET_ChannelOption options, struct CadetTConnection *ct, const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid, GCC_ReadyCallback ready_cb, @@ -956,7 +945,6 @@ GCC_create_inbound (struct CadetPeer *destination, return connection_create (destination, path, off, - options, ct, cid, CADET_CONNECTION_CREATE_RECEIVED, @@ -972,7 +960,6 @@ GCC_create_inbound (struct CadetPeer *destination, * @param destination where to go * @param path which path to take (may not be the full path) * @param off offset of @a destination on @a path - * @param options options for the connection * @param ct tunnel that uses the connection * @param ready_cb function to call when ready to transmit * @param ready_cb_cls closure for @a cb @@ -982,7 +969,6 @@ struct CadetConnection * GCC_create (struct CadetPeer *destination, struct CadetPeerPath *path, unsigned int off, - enum GNUNET_CADET_ChannelOption options, struct CadetTConnection *ct, GCC_ReadyCallback ready_cb, void *ready_cb_cls) @@ -995,7 +981,6 @@ GCC_create (struct CadetPeer *destination, return connection_create (destination, path, off, - options, ct, &cid, CADET_CONNECTION_NEW, diff --git a/src/cadet/gnunet-service-cadet_connection.h b/src/cadet/gnunet-service-cadet_connection.h index 7cdbc9dee..d3de3347c 100644 --- a/src/cadet/gnunet-service-cadet_connection.h +++ b/src/cadet/gnunet-service-cadet_connection.h @@ -1,4 +1,3 @@ - /* This file is part of GNUnet. Copyright (C) 2001-2017 GNUnet e.V. @@ -89,7 +88,6 @@ GCC_lookup (const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid); * @param destination where to go * @param path which path to take (may not be the full path) * @param off offset of @a destination on @a path - * @param options options for the connection * @param ct which tunnel uses this connection * @param ready_cb function to call when ready to transmit * @param ready_cb_cls closure for @a cb @@ -99,7 +97,6 @@ struct CadetConnection * GCC_create (struct CadetPeer *destination, struct CadetPeerPath *path, unsigned int off, - enum GNUNET_CADET_ChannelOption options, struct CadetTConnection *ct, GCC_ReadyCallback ready_cb, void *ready_cb_cls); @@ -112,7 +109,6 @@ GCC_create (struct CadetPeer *destination, * * @param destination where to go * @param path which path to take (may not be the full path) - * @param options options for the connection * @param ct which tunnel uses this connection * @param ready_cb function to call when ready to transmit * @param ready_cb_cls closure for @a cb @@ -122,7 +118,6 @@ GCC_create (struct CadetPeer *destination, struct CadetConnection * GCC_create_inbound (struct CadetPeer *destination, struct CadetPeerPath *path, - enum GNUNET_CADET_ChannelOption options, struct CadetTConnection *ct, const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid, GCC_ReadyCallback ready_cb, diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/cadet/gnunet-service-cadet_core.c index 879230d29..c5d2f195a 100644 --- a/src/cadet/gnunet-service-cadet_core.c +++ b/src/cadet/gnunet-service-cadet_core.c @@ -180,10 +180,7 @@ struct CadetRoute */ struct GNUNET_CONTAINER_HeapNode *hn; - /** - * Options for the route, control buffering. - */ - enum GNUNET_CADET_ChannelOption options; + }; @@ -899,7 +896,7 @@ handle_connection_create (void *cls, GCP_2s (origin), GNUNET_sh2s (&msg->cid.connection_of_tunnel)); path = GCPP_get_path_from_route (path_length - 1, - pids); + pids); if (GNUNET_OK != GCT_add_inbound_connection (GCP_get_tunnel (origin, GNUNET_YES), diff --git a/src/cadet/gnunet-service-cadet_tunnels.h b/src/cadet/gnunet-service-cadet_tunnels.h index c1bf2fcd5..47d9f98bf 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.h +++ b/src/cadet/gnunet-service-cadet_tunnels.h @@ -119,7 +119,6 @@ GCT_destroy_tunnel_now (struct CadetTunnel *t); * * @param t a tunnel * @param cid connection identifer to use for the connection - * @param options options for the connection * @param path path to use for the connection * @return #GNUNET_OK on success, * #GNUNET_SYSERR on failure (duplicate connection) @@ -127,7 +126,6 @@ GCT_destroy_tunnel_now (struct CadetTunnel *t); int GCT_add_inbound_connection (struct CadetTunnel *t, const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid, - enum GNUNET_CADET_ChannelOption options, struct CadetPeerPath *path); diff --git a/src/include/gnunet_cadet_service.h b/src/include/gnunet_cadet_service.h index a11c5f3cb..fd591924a 100644 --- a/src/include/gnunet_cadet_service.h +++ b/src/include/gnunet_cadet_service.h @@ -93,49 +93,6 @@ struct GNUNET_CADET_ChannelTunnelNumber uint32_t cn GNUNET_PACKED; }; - -/** - * Channel options. Second line indicates filed in the - * CadetChannelInfo union carrying the answer. - * - * @deprecated we should replace channel options with per-envelope - * options, and then re-use the options from `enum GNUNET_MQ_PriorityPreferences`. - */ -enum GNUNET_CADET_ChannelOption -{ - /** - * Default options: unreliable, default buffering, not out of order. - */ - GNUNET_CADET_OPTION_DEFAULT = 0x0, - - /** - * Disable buffering on intermediate nodes (for minimum latency). - * Yes/No. - */ - GNUNET_CADET_OPTION_NOBUFFER = 0x1, - - /** - * Enable channel reliability, lost messages will be retransmitted. - * Yes/No. - */ - GNUNET_CADET_OPTION_RELIABLE = 0x2, - - /** - * Enable out of order delivery of messages. - * Set bit for out-of-order delivery. - */ - GNUNET_CADET_OPTION_OUT_OF_ORDER = 0x4, - - /** - * Who is the peer at the other end of the channel. - * Only for use in @c GNUNET_CADET_channel_get_info - * struct GNUNET_PeerIdentity *peer - */ - GNUNET_CADET_OPTION_PEER = 0x8 - -}; - - /** * Method called whenever a peer connects to a port in MQ-based CADET. * @@ -259,7 +216,6 @@ GNUNET_CADET_close_port (struct GNUNET_CADET_Port *p); * - Each message type callback in @a handlers * @param destination Peer identity the channel should go to. * @param port Identification of the destination port. - * @param options CadetOption flag field, with all desired option bits set to 1. * @param window_changes Function called when the transmit window size changes. * Can be NULL if this data is of no interest. * TODO Not yet implemented. @@ -272,7 +228,6 @@ GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h, void *channel_cls, const struct GNUNET_PeerIdentity *destination, const struct GNUNET_HashCode *port, - enum GNUNET_CADET_ChannelOption options, GNUNET_CADET_WindowSizeEventHandler window_changes, GNUNET_CADET_DisconnectEventHandler disconnects, const struct GNUNET_MQ_MessageHandler *handlers); @@ -347,13 +302,11 @@ union GNUNET_CADET_ChannelInfo * Get information about a channel. * * @param channel Channel handle. - * @param option Query type GNUNET_CADET_OPTION_* * @param ... dependant on option, currently not used * @return Union with an answer to the query. */ const union GNUNET_CADET_ChannelInfo * GNUNET_CADET_channel_get_info (struct GNUNET_CADET_Channel *channel, - enum GNUNET_CADET_ChannelOption option, ...); -- cgit v1.2.3