diff options
Diffstat (limited to 'src/cadet/gnunet-service-cadet_connection.c')
-rw-r--r-- | src/cadet/gnunet-service-cadet_connection.c | 15 |
1 files changed, 0 insertions, 15 deletions
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 | |||
@@ -161,11 +161,6 @@ struct CadetConnection | |||
161 | enum CadetConnectionState state; | 161 | enum CadetConnectionState state; |
162 | 162 | ||
163 | /** | 163 | /** |
164 | * Options for the route, control buffering. | ||
165 | */ | ||
166 | enum GNUNET_CADET_ChannelOption options; | ||
167 | |||
168 | /** | ||
169 | * How many latency observations did we make for this connection? | 164 | * How many latency observations did we make for this connection? |
170 | */ | 165 | */ |
171 | unsigned int latency_datapoints; | 166 | unsigned int latency_datapoints; |
@@ -635,7 +630,6 @@ send_create (void *cls) | |||
635 | env = GNUNET_MQ_msg_extra (create_msg, | 630 | env = GNUNET_MQ_msg_extra (create_msg, |
636 | (2 + cc->off) * sizeof (struct GNUNET_PeerIdentity), | 631 | (2 + cc->off) * sizeof (struct GNUNET_PeerIdentity), |
637 | GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE); | 632 | GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE); |
638 | create_msg->options = htonl ((uint32_t) cc->options); | ||
639 | create_msg->cid = cc->cid; | 633 | create_msg->cid = cc->cid; |
640 | pids = (struct GNUNET_PeerIdentity *) &create_msg[1]; | 634 | pids = (struct GNUNET_PeerIdentity *) &create_msg[1]; |
641 | pids[0] = my_full_id; | 635 | pids[0] = my_full_id; |
@@ -825,7 +819,6 @@ manage_first_hop_mq (void *cls, | |||
825 | * @param destination where to go | 819 | * @param destination where to go |
826 | * @param path which path to take (may not be the full path) | 820 | * @param path which path to take (may not be the full path) |
827 | * @param off offset of @a destination on @a path | 821 | * @param off offset of @a destination on @a path |
828 | * @param options options for the connection | ||
829 | * @param ct which tunnel uses this connection | 822 | * @param ct which tunnel uses this connection |
830 | * @param init_state initial state for the connection | 823 | * @param init_state initial state for the connection |
831 | * @param ready_cb function to call when ready to transmit | 824 | * @param ready_cb function to call when ready to transmit |
@@ -836,7 +829,6 @@ static struct CadetConnection * | |||
836 | connection_create (struct CadetPeer *destination, | 829 | connection_create (struct CadetPeer *destination, |
837 | struct CadetPeerPath *path, | 830 | struct CadetPeerPath *path, |
838 | unsigned int off, | 831 | unsigned int off, |
839 | enum GNUNET_CADET_ChannelOption options, | ||
840 | struct CadetTConnection *ct, | 832 | struct CadetTConnection *ct, |
841 | const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid, | 833 | const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid, |
842 | enum CadetConnectionState init_state, | 834 | enum CadetConnectionState init_state, |
@@ -847,7 +839,6 @@ connection_create (struct CadetPeer *destination, | |||
847 | struct CadetPeer *first_hop; | 839 | struct CadetPeer *first_hop; |
848 | 840 | ||
849 | cc = GNUNET_new (struct CadetConnection); | 841 | cc = GNUNET_new (struct CadetConnection); |
850 | cc->options = options; | ||
851 | cc->state = init_state; | 842 | cc->state = init_state; |
852 | cc->ct = ct; | 843 | cc->ct = ct; |
853 | cc->cid = *cid; | 844 | cc->cid = *cid; |
@@ -890,7 +881,6 @@ connection_create (struct CadetPeer *destination, | |||
890 | * | 881 | * |
891 | * @param destination where to go | 882 | * @param destination where to go |
892 | * @param path which path to take (may not be the full path) | 883 | * @param path which path to take (may not be the full path) |
893 | * @param options options for the connection | ||
894 | * @param ct which tunnel uses this connection | 884 | * @param ct which tunnel uses this connection |
895 | * @param ready_cb function to call when ready to transmit | 885 | * @param ready_cb function to call when ready to transmit |
896 | * @param ready_cb_cls closure for @a cb | 886 | * @param ready_cb_cls closure for @a cb |
@@ -900,7 +890,6 @@ connection_create (struct CadetPeer *destination, | |||
900 | struct CadetConnection * | 890 | struct CadetConnection * |
901 | GCC_create_inbound (struct CadetPeer *destination, | 891 | GCC_create_inbound (struct CadetPeer *destination, |
902 | struct CadetPeerPath *path, | 892 | struct CadetPeerPath *path, |
903 | enum GNUNET_CADET_ChannelOption options, | ||
904 | struct CadetTConnection *ct, | 893 | struct CadetTConnection *ct, |
905 | const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid, | 894 | const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid, |
906 | GCC_ReadyCallback ready_cb, | 895 | GCC_ReadyCallback ready_cb, |
@@ -956,7 +945,6 @@ GCC_create_inbound (struct CadetPeer *destination, | |||
956 | return connection_create (destination, | 945 | return connection_create (destination, |
957 | path, | 946 | path, |
958 | off, | 947 | off, |
959 | options, | ||
960 | ct, | 948 | ct, |
961 | cid, | 949 | cid, |
962 | CADET_CONNECTION_CREATE_RECEIVED, | 950 | CADET_CONNECTION_CREATE_RECEIVED, |
@@ -972,7 +960,6 @@ GCC_create_inbound (struct CadetPeer *destination, | |||
972 | * @param destination where to go | 960 | * @param destination where to go |
973 | * @param path which path to take (may not be the full path) | 961 | * @param path which path to take (may not be the full path) |
974 | * @param off offset of @a destination on @a path | 962 | * @param off offset of @a destination on @a path |
975 | * @param options options for the connection | ||
976 | * @param ct tunnel that uses the connection | 963 | * @param ct tunnel that uses the connection |
977 | * @param ready_cb function to call when ready to transmit | 964 | * @param ready_cb function to call when ready to transmit |
978 | * @param ready_cb_cls closure for @a cb | 965 | * @param ready_cb_cls closure for @a cb |
@@ -982,7 +969,6 @@ struct CadetConnection * | |||
982 | GCC_create (struct CadetPeer *destination, | 969 | GCC_create (struct CadetPeer *destination, |
983 | struct CadetPeerPath *path, | 970 | struct CadetPeerPath *path, |
984 | unsigned int off, | 971 | unsigned int off, |
985 | enum GNUNET_CADET_ChannelOption options, | ||
986 | struct CadetTConnection *ct, | 972 | struct CadetTConnection *ct, |
987 | GCC_ReadyCallback ready_cb, | 973 | GCC_ReadyCallback ready_cb, |
988 | void *ready_cb_cls) | 974 | void *ready_cb_cls) |
@@ -995,7 +981,6 @@ GCC_create (struct CadetPeer *destination, | |||
995 | return connection_create (destination, | 981 | return connection_create (destination, |
996 | path, | 982 | path, |
997 | off, | 983 | off, |
998 | options, | ||
999 | ct, | 984 | ct, |
1000 | &cid, | 985 | &cid, |
1001 | CADET_CONNECTION_NEW, | 986 | CADET_CONNECTION_NEW, |