From 21eb8c5325edec855da64c2318590f5f0afa78a8 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 17 Jan 2015 21:38:46 +0000
Subject: eliminating callback argument and its implementation which are never
 called in the first place by ATS

---
 src/transport/gnunet-service-transport.c           |  8 ++++++--
 .../gnunet-service-transport_neighbours.c          | 22 +++-------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

(limited to 'src/transport')

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,
     return;
   }
 
-  GST_neighbours_switch_to_address (&address->peer, address, session, ats,
-      ats_count, bandwidth_in, bandwidth_out);
+  GST_neighbours_switch_to_address (&address->peer,
+                                    address,
+                                    session,
+                                    ats, ats_count,
+                                    bandwidth_in, bandwidth_out);
 }
 
+
 /**
  * Function called to notify transport users that another
  * 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)
   return n;
 }
 
-/* We received a address suggestion after requesting an address in
- * try_connect or after receiving a connect, switch to address
- */
-static void
-address_suggest_cont (void *cls,
-    const struct GNUNET_PeerIdentity *peer,
-    const struct GNUNET_HELLO_Address *address, struct Session *session,
-    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
-    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-    const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
-{
-  GST_neighbours_switch_to_address(peer, address, session, ats, ats_count,
-      bandwidth_in, bandwidth_out);
-}
-
 
 struct BlacklistCheckSwitchContext
 {
@@ -2217,8 +2202,7 @@ try_connect_bl_check_cont (void *cls,
                          GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
   GNUNET_ATS_reset_backoff (GST_ats, peer);
   n->suggest_handle = GNUNET_ATS_suggest_address (GST_ats,
-                                                  peer,
-                                                  &address_suggest_cont, n);
+                                                  peer);
 }
 
 
@@ -2361,7 +2345,7 @@ GST_neighbours_handle_session_syn (const struct GNUNET_MessageHeader *message,
     set_state_and_timeout (n, GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
         GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
     if (NULL == n->suggest_handle)
-      GNUNET_ATS_suggest_address (GST_ats, peer, address_suggest_cont, n);
+      GNUNET_ATS_suggest_address (GST_ats, peer);
     break;
   case GNUNET_TRANSPORT_PS_INIT_ATS:
     /* SYN message takes priority over us asking ATS for address:
@@ -2415,7 +2399,7 @@ GST_neighbours_handle_session_syn (const struct GNUNET_MessageHeader *message,
     n->ack_state = ACK_SEND_SYN_ACK;
     n->connect_ack_timestamp = ts;
     /* Request an address for the peer */
-    GNUNET_ATS_suggest_address (GST_ats, peer, address_suggest_cont, n);
+    GNUNET_ATS_suggest_address (GST_ats, peer);
     GNUNET_ATS_reset_backoff (GST_ats, peer);
     set_state (n, GNUNET_TRANSPORT_PS_SYN_RECV_ATS);
     break;
-- 
cgit v1.2.3