(no commit message)

[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 acf35614912f721c36b531a8f4f195768ef0b5ed..dc86a69e649c0a98ed5adf697ff4358da2412705 100644 (file)
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -67,15 +67,10 @@ 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.
  */
-struct GNUNET_CRYPTO_EccPrivateKey *GST_my_private_key;
+struct GNUNET_CRYPTO_EddsaPrivateKey *GST_my_private_key;
 
 /**
  * ATS handle.
@@ -233,6 +228,7 @@ GST_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
                         gettext_noop
                         ("# bytes total received"),
                             ntohs (message->size), GNUNET_NO);
+  GST_neighbours_notify_data_recv (peer, &address, session, message);
 
   switch (type)
   {
@@ -280,13 +276,14 @@ GST_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
                               gettext_noop
                               ("# bytes payload received"),
                               ntohs (message->size), GNUNET_NO);
+    GST_neighbours_notify_payload_recv (peer, &address, session, message);
     ret = process_payload (peer, &address, session, message);
     break;
   }
 end:
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Allowing receive from peer %s to continue in %s\n",
-              GNUNET_i2s (peer), 
+              GNUNET_i2s (peer),
              GNUNET_STRINGS_relative_time_to_string (ret, GNUNET_YES));
   return ret;
 }
@@ -465,22 +462,25 @@ GST_ats_update_metrics (const struct GNUNET_PeerIdentity *peer,
        struct GNUNET_ATS_Information *ats_new;
 
   if (GNUNET_NO == GNUNET_ATS_session_known (GST_ats, address, session))
-       return;
+    return;
 
-       /* Call to manipulation to manipulate ATS information */
-       ats_new = GST_manipulation_manipulate_metrics (peer, address, session, ats, ats_count);
-       if (NULL == ats_new)
-       {
-                       GNUNET_break (0);
-                       return;
-       }
-  if (GNUNET_NO == GNUNET_ATS_address_update (GST_ats, address, session, ats_new, ats_count))
+  /* Call to manipulation to manipulate ATS information */
+  ats_new = GST_manipulation_manipulate_metrics (peer, address, session, ats,
+      ats_count);
+  if (NULL == ats_new)
+  {
+    GNUNET_break(0);
+    return;
+  }
+  if (GNUNET_NO == GNUNET_ATS_address_update (GST_ats,
+      address, session, ats_new, ats_count))
   {
-       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                       _("Address or session unknown: failed to update properties for peer `%s' plugin `%s' address `%s' session %p\n"),
-                       GNUNET_i2s (peer), address->transport_name, GST_plugins_a2s (address), session);
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+        _("Address or session unknown: failed to update properties for peer `%s' plugin `%s' address `%s' session %p\n"),
+        GNUNET_i2s (peer), address->transport_name, GST_plugins_a2s (address),
+        session);
   }
-  GNUNET_free (ats_new);
+  GNUNET_free(ats_new);
 }
 
 
@@ -537,52 +537,37 @@ plugin_env_update_metrics (void *cls,
  */
 
 static void
-plugin_env_session_start (void *cls,
-          const struct GNUNET_PeerIdentity *peer,
-          const char *plugin,
-          const void *address,
-          uint16_t address_len,
-          struct Session *session,
-          const struct GNUNET_ATS_Information *ats,
-          uint32_t ats_count)
+plugin_env_session_start (void *cls, const struct GNUNET_PeerIdentity *peer,
+    const char *plugin, const void *address, uint16_t address_len,
+    struct Session *session, const struct GNUNET_ATS_Information *ats,
+    uint32_t ats_count)
 {
-       struct GNUNET_HELLO_Address *addr;
-       if (NULL == peer)
-       {
-               GNUNET_break (0);
-               return;
-       }
-       if (NULL == plugin)
-       {
-               GNUNET_break (0);
-               return;
-       }
-       if ((address_len != 0) && (NULL == address))
-       {
-               GNUNET_break (0);
-               return;
-       }
-       if (NULL == session)
-       {
-               GNUNET_break (0);
-               return;
-       }
-
-       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));
-       GST_ats_add_address (addr, session);
+  struct GNUNET_HELLO_Address *addr;
+  if (NULL == peer)
+  {
+    GNUNET_break(0);
+    return;
+  }
+  if (NULL == plugin)
+  {
+    GNUNET_break(0);
+    return;
+  }
+  if (NULL == session)
+  {
+    GNUNET_break(0);
+    return;
+  }
+
+  addr = GNUNET_HELLO_address_allocate (peer, plugin, address, 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));
+  GST_ats_add_address (addr, session);
 
-       if (0 < ats_count)
-               GST_ats_update_metrics (peer, addr, session, ats, ats_count);
-       GNUNET_free (addr);
+  if (0 < ats_count)
+    GST_ats_update_metrics (peer, addr, session, ats, ats_count);
+  GNUNET_free(addr);
 }
 
 /**
@@ -758,7 +743,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
   char *keyfile;
-  struct GNUNET_CRYPTO_EccPrivateKey *pk;
+  struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
   long long unsigned int max_fd_cfg;
   int max_fd_rlimit;
   int max_fd;
@@ -783,16 +768,15 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
     hello_expiration = GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION;
   }
   GST_server = server;
-  pk = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
+  pk = GNUNET_CRYPTO_eddsa_key_create_from_file (keyfile);
   GNUNET_free (keyfile);
   GNUNET_assert (NULL != pk);
   GST_my_private_key = pk;
 
   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_eddsa_key_get_public (GST_my_private_key,
+                                                 &GST_my_identity.public_key);
   GNUNET_assert (NULL != GST_my_private_key);
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,