new operation queue for limiting overlay connects

[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 bb6a54b31784daa7f9b963d0c3a7b01e74ff72cc..b532c92b634e52097c93dc8491038b0de5d421ad 100644 (file)
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -61,11 +61,15 @@ struct GNUNET_PeerIdentity GST_my_identity;
  */
 struct GNUNET_PEERINFO_Handle *GST_peerinfo;
 
-
 /**
  * Hostkey generation context
  */
-struct GNUNET_CRYPTO_RsaKeyGenerationContext * GST_keygen;
+struct GNUNET_CRYPTO_RsaKeyGenerationContext *GST_keygen;
+
+/**
+ * Handle to our service's server.
+ */
+static struct GNUNET_SERVER_Handle *GST_server;
 
 /**
  * Our public key.
@@ -315,16 +319,17 @@ end:
  * @param addr one of the addresses of the host
  *        the specific address format depends on the transport
  * @param addrlen length of the address
+ * @param dest_plugin destination plugin to use this address with
  */
 static void
 plugin_env_address_change_notification (void *cls, int add_remove,
-                                        const void *addr, size_t addrlen)
+                                        const void *addr, size_t addrlen,
+                                        const char *dest_plugin)
 {
-  const char *plugin_name = cls;
   struct GNUNET_HELLO_Address address;
 
   address.peer = GST_my_identity;
-  address.transport_name = plugin_name;
+  address.transport_name = dest_plugin;
   address.address = addr;
   address.address_length = addrlen;
   GST_hello_modify_addresses (add_remove, &address);
@@ -549,7 +554,6 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_CRYPTO_rsa_key_create_stop (GST_keygen);
     GST_keygen = NULL;
   }
-
   GST_neighbours_stop ();
   GST_validation_stop ();
   GST_plugins_unload ();
@@ -560,35 +564,37 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GST_blacklist_stop ();
   GST_hello_stop ();
 
-  if (GST_peerinfo != NULL)
+  if (NULL != GST_peerinfo)
   {
     GNUNET_PEERINFO_disconnect (GST_peerinfo);
     GST_peerinfo = NULL;
   }
-  if (GST_stats != NULL)
+  if (NULL != GST_stats)
   {
     GNUNET_STATISTICS_destroy (GST_stats, GNUNET_NO);
     GST_stats = NULL;
   }
-  if (GST_my_private_key != NULL)
+  if (NULL != GST_my_private_key)
   {
     GNUNET_CRYPTO_rsa_key_free (GST_my_private_key);
     GST_my_private_key = NULL;
   }
+  GST_server = NULL;
 }
 
-struct KeyGenerationContext
-{
-  struct GNUNET_SERVER_Handle *server;
-  const struct GNUNET_CONFIGURATION_Handle *c;
-
-};
 
-static void key_generation_cb (void *cls,
-                               struct GNUNET_CRYPTO_RsaPrivateKey *pk,
-                               const char *emsg)
+/**
+ * Callback for hostkey read/generation
+ *
+ * @param cls NULL
+ * @param pk the private key
+ * @param emsg error message
+ */
+static void
+key_generation_cb (void *cls,
+                   struct GNUNET_CRYPTO_RsaPrivateKey *pk,
+                   const char *emsg)
 {
-  struct KeyGenerationContext *scx = cls;
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded tmp;
 
   GST_keygen = NULL;
@@ -597,14 +603,13 @@ static void key_generation_cb (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Transport service could not access hostkey: %s. Exiting.\n"),
                 emsg);
-    GNUNET_free (scx);
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
   GST_my_private_key = pk;
 
-  GST_stats = GNUNET_STATISTICS_create ("transport", scx->c);
-  GST_peerinfo = GNUNET_PEERINFO_connect (scx->c);
+  GST_stats = GNUNET_STATISTICS_create ("transport", GST_cfg);
+  GST_peerinfo = GNUNET_PEERINFO_connect (GST_cfg);
   memset (&GST_my_public_key, '\0', sizeof (GST_my_public_key));
   memset (&tmp, '\0', sizeof (tmp));
   GNUNET_CRYPTO_rsa_key_get_public (GST_my_private_key, &GST_my_public_key);
@@ -616,7 +621,7 @@ static void key_generation_cb (void *cls,
 
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
                                 NULL);
-  if (GST_peerinfo == NULL)
+  if (NULL == GST_peerinfo)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Could not access PEERINFO service.  Exiting.\n"));
@@ -627,7 +632,7 @@ static void key_generation_cb (void *cls,
   /* start subsystems */
   GST_hello_start (&process_hello_update, NULL);
   GNUNET_assert (NULL != GST_hello_get());
-  GST_blacklist_start (scx->server);
+  GST_blacklist_start (GST_server);
   GST_ats =
       GNUNET_ATS_scheduling_init (GST_cfg, &ats_request_address_change, NULL);
   GST_plugins_load (&plugin_env_receive_callback,
@@ -638,9 +643,10 @@ static void key_generation_cb (void *cls,
                         &neighbours_connect_notification,
                         &neighbours_disconnect_notification,
                         &neighbours_address_notification);
-  GST_clients_start (scx->server);
+  GST_clients_start (GST_server);
   GST_validation_start ();
-  GNUNET_free (scx);
+  if (NULL != GST_server)
+    GNUNET_SERVER_resume (GST_server);
 }
 
 
@@ -655,7 +661,6 @@ static void
 run (void *cls, struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  struct KeyGenerationContext *scx;
   char *keyfile;
 
   /* setup globals */
@@ -670,10 +675,9 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  scx = GNUNET_malloc (sizeof (struct KeyGenerationContext));
-  scx->c = c;
-  scx->server = server;
-  GST_keygen = GNUNET_CRYPTO_rsa_key_create_start (keyfile, key_generation_cb, scx);
+  GST_server = server;
+  GNUNET_SERVER_suspend (server);
+  GST_keygen = GNUNET_CRYPTO_rsa_key_create_start (keyfile, &key_generation_cb, NULL);
   GNUNET_free (keyfile);
   if (NULL == GST_keygen)
   {