diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-01-17 21:38:46 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-01-17 21:38:46 +0000 |
commit | 21eb8c5325edec855da64c2318590f5f0afa78a8 (patch) | |
tree | 1d7decf2eb2e8f1d2d437abe95cbea6a60dd9676 /src/transport | |
parent | c76f29f898f6b1a73f33ce6d2578e06ce8e0a24e (diff) | |
download | gnunet-21eb8c5325edec855da64c2318590f5f0afa78a8.tar.gz gnunet-21eb8c5325edec855da64c2318590f5f0afa78a8.zip |
eliminating callback argument and its implementation which are never called in the first place by ATS
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/gnunet-service-transport.c | 8 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 22 |
2 files changed, 9 insertions, 21 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index cd131ae39..03fbc95db 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -928,10 +928,14 @@ ats_request_address_change (void *cls, | |||
928 | return; | 928 | return; |
929 | } | 929 | } |
930 | 930 | ||
931 | GST_neighbours_switch_to_address (&address->peer, address, session, ats, | 931 | GST_neighbours_switch_to_address (&address->peer, |
932 | ats_count, bandwidth_in, bandwidth_out); | 932 | address, |
933 | session, | ||
934 | ats, ats_count, | ||
935 | bandwidth_in, bandwidth_out); | ||
933 | } | 936 | } |
934 | 937 | ||
938 | |||
935 | /** | 939 | /** |
936 | * Function called to notify transport users that another | 940 | * Function called to notify transport users that another |
937 | * peer connected to us. | 941 | * peer connected to us. |
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index b4db4c2cb..9f2f210fb 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -2143,21 +2143,6 @@ setup_neighbour (const struct GNUNET_PeerIdentity *peer) | |||
2143 | return n; | 2143 | return n; |
2144 | } | 2144 | } |
2145 | 2145 | ||
2146 | /* We received a address suggestion after requesting an address in | ||
2147 | * try_connect or after receiving a connect, switch to address | ||
2148 | */ | ||
2149 | static void | ||
2150 | address_suggest_cont (void *cls, | ||
2151 | const struct GNUNET_PeerIdentity *peer, | ||
2152 | const struct GNUNET_HELLO_Address *address, struct Session *session, | ||
2153 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, | ||
2154 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, | ||
2155 | const struct GNUNET_ATS_Information *ats, uint32_t ats_count) | ||
2156 | { | ||
2157 | GST_neighbours_switch_to_address(peer, address, session, ats, ats_count, | ||
2158 | bandwidth_in, bandwidth_out); | ||
2159 | } | ||
2160 | |||
2161 | 2146 | ||
2162 | struct BlacklistCheckSwitchContext | 2147 | struct BlacklistCheckSwitchContext |
2163 | { | 2148 | { |
@@ -2217,8 +2202,7 @@ try_connect_bl_check_cont (void *cls, | |||
2217 | GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT)); | 2202 | GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT)); |
2218 | GNUNET_ATS_reset_backoff (GST_ats, peer); | 2203 | GNUNET_ATS_reset_backoff (GST_ats, peer); |
2219 | n->suggest_handle = GNUNET_ATS_suggest_address (GST_ats, | 2204 | n->suggest_handle = GNUNET_ATS_suggest_address (GST_ats, |
2220 | peer, | 2205 | peer); |
2221 | &address_suggest_cont, n); | ||
2222 | } | 2206 | } |
2223 | 2207 | ||
2224 | 2208 | ||
@@ -2361,7 +2345,7 @@ GST_neighbours_handle_session_syn (const struct GNUNET_MessageHeader *message, | |||
2361 | set_state_and_timeout (n, GNUNET_TRANSPORT_PS_SYN_RECV_ATS, | 2345 | set_state_and_timeout (n, GNUNET_TRANSPORT_PS_SYN_RECV_ATS, |
2362 | GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT)); | 2346 | GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT)); |
2363 | if (NULL == n->suggest_handle) | 2347 | if (NULL == n->suggest_handle) |
2364 | GNUNET_ATS_suggest_address (GST_ats, peer, address_suggest_cont, n); | 2348 | GNUNET_ATS_suggest_address (GST_ats, peer); |
2365 | break; | 2349 | break; |
2366 | case GNUNET_TRANSPORT_PS_INIT_ATS: | 2350 | case GNUNET_TRANSPORT_PS_INIT_ATS: |
2367 | /* SYN message takes priority over us asking ATS for address: | 2351 | /* SYN message takes priority over us asking ATS for address: |
@@ -2415,7 +2399,7 @@ GST_neighbours_handle_session_syn (const struct GNUNET_MessageHeader *message, | |||
2415 | n->ack_state = ACK_SEND_SYN_ACK; | 2399 | n->ack_state = ACK_SEND_SYN_ACK; |
2416 | n->connect_ack_timestamp = ts; | 2400 | n->connect_ack_timestamp = ts; |
2417 | /* Request an address for the peer */ | 2401 | /* Request an address for the peer */ |
2418 | GNUNET_ATS_suggest_address (GST_ats, peer, address_suggest_cont, n); | 2402 | GNUNET_ATS_suggest_address (GST_ats, peer); |
2419 | GNUNET_ATS_reset_backoff (GST_ats, peer); | 2403 | GNUNET_ATS_reset_backoff (GST_ats, peer); |
2420 | set_state (n, GNUNET_TRANSPORT_PS_SYN_RECV_ATS); | 2404 | set_state (n, GNUNET_TRANSPORT_PS_SYN_RECV_ATS); |
2421 | break; | 2405 | break; |