-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 f9585e5124795f2ff19518b6ffdd2aa6cac68218..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_EccPublicKey GST_my_public_key;
-
 /**
  * Our private key.
  */
@@ -153,7 +148,6 @@ process_payload (const struct GNUNET_PeerIdentity *peer,
       sizeof (struct InboundMessage) + msg_size;
   char buf[size] GNUNET_ALIGN;
 
-  ret = GNUNET_TIME_UNIT_ZERO;
   do_forward = GNUNET_SYSERR;
   ret = GST_neighbours_calculate_receive_delay (peer, msg_size, &do_forward);
 
@@ -286,8 +280,9 @@ GST_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
   }
 end:
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Allowing receive from peer %s to continue in %llu ms\n",
-              GNUNET_i2s (peer), (unsigned long long) ret.rel_value);
+              "Allowing receive from peer %s to continue in %s\n",
+              GNUNET_i2s (peer), 
+             GNUNET_STRINGS_relative_time_to_string (ret, GNUNET_YES));
   return ret;
 }
 
@@ -523,6 +518,19 @@ plugin_env_update_metrics (void *cls,
   GST_ats_update_metrics (peer, &haddress, session, ats, ats_count);
 }
 
+/**
+ * Plugin tells transport service about a new (inbound) session
+ *
+ * @param cls unused
+ * @param peer the peer
+ * @param plugin plugin name
+ * @param address address
+ * @param address_len address length
+ * @param session the new session
+ * @param ats ats information
+ * @param ats_count number of ats information
+ */
+
 static void
 plugin_env_session_start (void *cls,
           const struct GNUNET_PeerIdentity *peer,
@@ -533,6 +541,7 @@ plugin_env_session_start (void *cls,
           const struct GNUNET_ATS_Information *ats,
           uint32_t ats_count)
 {
+       struct GNUNET_HELLO_Address *addr;
        if (NULL == peer)
        {
                GNUNET_break (0);
@@ -554,8 +563,13 @@ plugin_env_session_start (void *cls,
                return;
        }
 
-       struct GNUNET_HELLO_Address *addr;
        addr = GNUNET_HELLO_address_allocate (peer, plugin, address, address_len);
+       if (0 != address_len)
+       {
+               GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                               "Inbound session from plugin `%s' about new session %p from peer `%s' address `%s' does not have address length 0 but %u\n",
+                               plugin, session, GNUNET_i2s (peer), GST_plugins_a2s(addr), address_len);
+       }
        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                        "Notification from plugin `%s' about new session %p from peer `%s' address `%s'\n",
                        plugin, session, GNUNET_i2s (peer), GST_plugins_a2s(addr));
@@ -576,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
  */
@@ -596,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);
@@ -718,7 +734,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
   if (NULL != GST_my_private_key)
   {
-    GNUNET_CRYPTO_ecc_key_free (GST_my_private_key);
+    GNUNET_free (GST_my_private_key);
     GST_my_private_key = NULL;
   }
   GST_server = NULL;
@@ -769,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 (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,
@@ -789,7 +804,6 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
 
   max_fd_rlimit = 0;
   max_fd_cfg = 0;
-  max_fd = 0;
 #if HAVE_GETRLIMIT
   struct rlimit r_file;
   if (0 == getrlimit (RLIMIT_NOFILE, &r_file))