-getting ATS and transport to compile again (part of #3047)

[oweals/gnunet.git] / src / transport / gnunet-service-transport.c

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 7d385dd41eaef809544ebecbd76c9973646d79d1..3adf5b35d469571724da15435e73c66cff46c668 100644 (file)
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -67,11 +67,6 @@ struct GNUNET_PEERINFO_Handle *GST_peerinfo;
  */
 static struct GNUNET_SERVER_Handle *GST_server;
 
-/**
- * Our public key.
- */
-struct GNUNET_CRYPTO_EccPublicSignKey GST_my_public_key;
-
 /**
  * Our private key.
  */
@@ -595,8 +590,10 @@ plugin_env_session_start (void *cls,
  * @param cls closure
  * @param address address to use (for peer given in address)
  * @param session session to use (if available)
- * @param bandwidth_out assigned outbound bandwidth for the connection, 0 to disconnect from peer
- * @param bandwidth_in assigned inbound bandwidth for the connection, 0 to disconnect from peer
+ * @param bandwidth_out assigned outbound bandwidth for the connection in NBO,
+ *     0 to disconnect from peer
+ * @param bandwidth_in assigned inbound bandwidth for the connection in NBO,
+ *     0 to disconnect from peer
  * @param ats ATS information
  * @param ats_count number of ATS elements
  */
@@ -615,7 +612,7 @@ ats_request_address_change (void *cls,
   /* ATS tells me to disconnect from peer */
   if ((bw_in == 0) && (bw_out == 0))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "ATS tells me to disconnect from peer `%s'\n",
                 GNUNET_i2s (&address->peer));
     GST_neighbours_force_disconnect (&address->peer);
@@ -788,9 +785,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
 
   GST_stats = GNUNET_STATISTICS_create ("transport", GST_cfg);
   GST_peerinfo = GNUNET_PEERINFO_connect (GST_cfg);
-  GNUNET_CRYPTO_ecc_key_get_public_for_signature (GST_my_private_key, &GST_my_public_key);
-  GNUNET_CRYPTO_hash (&GST_my_public_key, sizeof (GST_my_public_key),
-                      &GST_my_identity.hashPubKey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (GST_my_private_key,
+                                                 &GST_my_identity.public_key);
   GNUNET_assert (NULL != GST_my_private_key);
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,