splitting 'struct GNUNET_CRYPTO_EccPublicKey' into one struct for signing and another...

[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..6291266f6354e5e36a8d110b5f1832ce58b26795 100644 (file)
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -70,7 +70,7 @@ static struct GNUNET_SERVER_Handle *GST_server;
 /**
  * Our public key.
  */
-struct GNUNET_CRYPTO_EccPublicKey GST_my_public_key;
+struct GNUNET_CRYPTO_EccPublicSignKey GST_my_public_key;
 
 /**
  * Our private key.
@@ -153,7 +153,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 +285,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;
 }
 
@@ -718,7 +718,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,7 +769,7 @@ 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_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_assert (NULL != GST_my_private_key);
@@ -789,7 +789,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))