diff options
author | t3sserakt <t3ss@posteo.de> | 2019-06-24 11:47:25 +0200 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2019-06-24 11:47:25 +0200 |
commit | d2ed51b63d955a590a461e911a3d6fa6a9248fe5 (patch) | |
tree | 3a9b7293435e61706986d84d0f6b80f385657ebb /src/cadet/gnunet-service-cadet_channel.c | |
parent | a31cd73472ac1b4c899a6e1d7e53851c20677f7d (diff) | |
download | gnunet-d2ed51b63d955a590a461e911a3d6fa6a9248fe5.tar.gz gnunet-d2ed51b63d955a590a461e911a3d6fa6a9248fe5.zip |
removed GNUNET_CADET_ChannelOption
Diffstat (limited to 'src/cadet/gnunet-service-cadet_channel.c')
-rw-r--r-- | src/cadet/gnunet-service-cadet_channel.c | 21 |
1 files changed, 0 insertions, 21 deletions
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) | |||
591 | { | 591 | { |
592 | struct CadetChannel *ch = cls; | 592 | struct CadetChannel *ch = cls; |
593 | struct GNUNET_CADET_ChannelOpenMessage msgcc; | 593 | struct GNUNET_CADET_ChannelOpenMessage msgcc; |
594 | uint32_t options; | ||
595 | 594 | ||
596 | ch->retry_control_task = NULL; | 595 | ch->retry_control_task = NULL; |
597 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 596 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
598 | "Sending CHANNEL_OPEN message for %s\n", | 597 | "Sending CHANNEL_OPEN message for %s\n", |
599 | GCCH_2s (ch)); | 598 | GCCH_2s (ch)); |
600 | options = 0; | ||
601 | if (ch->nobuffer) | ||
602 | options |= GNUNET_CADET_OPTION_NOBUFFER; | ||
603 | if (ch->reliable) | ||
604 | options |= GNUNET_CADET_OPTION_RELIABLE; | ||
605 | if (ch->out_of_order) | ||
606 | options |= GNUNET_CADET_OPTION_OUT_OF_ORDER; | ||
607 | msgcc.header.size = htons (sizeof (msgcc)); | 599 | msgcc.header.size = htons (sizeof (msgcc)); |
608 | msgcc.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_CHANNEL_OPEN); | 600 | msgcc.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_CHANNEL_OPEN); |
609 | msgcc.opt = htonl (options); | ||
610 | msgcc.h_port = ch->h_port; | 601 | msgcc.h_port = ch->h_port; |
611 | msgcc.ctn = ch->ctn; | 602 | msgcc.ctn = ch->ctn; |
612 | ch->state = CADET_CHANNEL_OPEN_SENT; | 603 | ch->state = CADET_CHANNEL_OPEN_SENT; |
@@ -670,9 +661,6 @@ GCCH_channel_local_new (struct CadetClient *owner, | |||
670 | 661 | ||
671 | ch = GNUNET_new (struct CadetChannel); | 662 | ch = GNUNET_new (struct CadetChannel); |
672 | ch->mid_recv.mid = htonl (1); /* The OPEN_ACK counts as message 0! */ | 663 | ch->mid_recv.mid = htonl (1); /* The OPEN_ACK counts as message 0! */ |
673 | ch->nobuffer = (0 != (options & GNUNET_CADET_OPTION_NOBUFFER)); | ||
674 | ch->reliable = (0 != (options & GNUNET_CADET_OPTION_RELIABLE)); | ||
675 | ch->out_of_order = (0 != (options & GNUNET_CADET_OPTION_OUT_OF_ORDER)); | ||
676 | ch->max_pending_messages = (ch->nobuffer) ? 1 : 4; /* FIXME: 4!? Do not hardcode! */ | 664 | ch->max_pending_messages = (ch->nobuffer) ? 1 : 4; /* FIXME: 4!? Do not hardcode! */ |
677 | ch->owner = ccco; | 665 | ch->owner = ccco; |
678 | ch->port = *port; | 666 | ch->port = *port; |
@@ -771,9 +759,6 @@ GCCH_channel_incoming_new (struct CadetTunnel *t, | |||
771 | ch->t = t; | 759 | ch->t = t; |
772 | ch->ctn = ctn; | 760 | ch->ctn = ctn; |
773 | ch->retry_time = CADET_INITIAL_RETRANSMIT_TIME; | 761 | ch->retry_time = CADET_INITIAL_RETRANSMIT_TIME; |
774 | ch->nobuffer = (0 != (options & GNUNET_CADET_OPTION_NOBUFFER)); | ||
775 | ch->reliable = (0 != (options & GNUNET_CADET_OPTION_RELIABLE)); | ||
776 | ch->out_of_order = (0 != (options & GNUNET_CADET_OPTION_OUT_OF_ORDER)); | ||
777 | ch->max_pending_messages = (ch->nobuffer) ? 1 : 4; /* FIXME: 4!? Do not hardcode! */ | 762 | ch->max_pending_messages = (ch->nobuffer) ? 1 : 4; /* FIXME: 4!? Do not hardcode! */ |
778 | GNUNET_STATISTICS_update (stats, | 763 | GNUNET_STATISTICS_update (stats, |
779 | "# channels", | 764 | "# channels", |
@@ -998,12 +983,6 @@ GCCH_bind (struct CadetChannel *ch, | |||
998 | ch->retry_control_task = NULL; | 983 | ch->retry_control_task = NULL; |
999 | } | 984 | } |
1000 | options = 0; | 985 | options = 0; |
1001 | if (ch->nobuffer) | ||
1002 | options |= GNUNET_CADET_OPTION_NOBUFFER; | ||
1003 | if (ch->reliable) | ||
1004 | options |= GNUNET_CADET_OPTION_RELIABLE; | ||
1005 | if (ch->out_of_order) | ||
1006 | options |= GNUNET_CADET_OPTION_OUT_OF_ORDER; | ||
1007 | cccd = GNUNET_new (struct CadetChannelClient); | 986 | cccd = GNUNET_new (struct CadetChannelClient); |
1008 | GNUNET_assert (NULL == ch->dest); | 987 | GNUNET_assert (NULL == ch->dest); |
1009 | ch->dest = cccd; | 988 | ch->dest = cccd; |