#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define HOSTKEYFILESIZE 914
+static const char *
+get_host_key (struct GNUNET_TRANSPORT_TESTING_handle *tth)
+{
+ if (tth->hostkey_data == NULL)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+ "No precomputed hostkeys available\n");
+ return NULL;
+ }
+ if (tth->hostkeys_total > tth->hostkeys_last)
+ {
+ tth->hostkeys_last++;
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+ "Used hostkey %u of %u available hostkeys\n",
+ tth->hostkeys_last, tth->hostkeys_total);
+ return &tth->hostkey_data[(tth->hostkeys_last - 1) * HOSTKEYFILESIZE];
+ }
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+ "No hostkey available (%u of %u already used)\n",
+ tth->hostkeys_last, tth->hostkeys_total);
+ return NULL;
+}
static struct PeerContext *
find_peer_context (struct GNUNET_TRANSPORT_TESTING_handle *tth,
/**
* Start a peer with the given configuration
+ * @param tth the testing handle
+ * @param cfgname configuration file
+ * @param peer_id the peer_id
* @param rec receive callback
* @param nc connect callback
* @param nd disconnect callback
+ * @param start_cb start callback
* @param cb_cls closure for callback
* @return the peer context
*/
GNUNET_TRANSPORT_TESTING_start_cb start_cb,
void *cb_cls)
{
+ const char *hostkey = NULL;
+ struct GNUNET_DISK_FileHandle *fn;
+
GNUNET_assert (tth != NULL);
if (GNUNET_DISK_file_test (cfgname) == GNUNET_NO)
{
struct PeerContext *p = GNUNET_malloc (sizeof (struct PeerContext));
p->cfg = GNUNET_CONFIGURATION_create ();
-
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+
if (GNUNET_CONFIGURATION_have_value (p->cfg, "PATHS", "SERVICEHOME"))
GNUNET_assert (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS",
"SERVICEHOME",
&p->servicehome));
+
if (NULL != p->servicehome)
GNUNET_DISK_directory_remove (p->servicehome);
+
+ hostkey = get_host_key (tth);
+ if (hostkey != NULL)
+ {
+
+ GNUNET_asprintf (&p->hostkeyfile, "%s/.hostkey", p->servicehome);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_DISK_directory_create_for_file (p->hostkeyfile));
+ fn = GNUNET_DISK_file_open (p->hostkeyfile,
+ GNUNET_DISK_OPEN_READWRITE |
+ GNUNET_DISK_OPEN_CREATE,
+ GNUNET_DISK_PERM_USER_READ |
+ GNUNET_DISK_PERM_USER_WRITE);
+ GNUNET_assert (fn != NULL);
+ GNUNET_assert (HOSTKEYFILESIZE ==
+ GNUNET_DISK_file_write (fn, hostkey, HOSTKEYFILESIZE));
+ GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fn));
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+ "Wrote hostkey to file: `%s' \n", p->hostkeyfile);
+ }
+
p->arm_proc =
GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
"gnunet-service-arm", "-c", cfgname,
return p;
}
+/**
+* Restart the given peer
+* @param tth testing handle
+* @param p the peer
+* @param cfgname the cfg file used to restart
+* @param restart_cb callback to call when restarted
+* @param cb_cls callback closure
+* @return GNUNET_OK in success otherwise GNUNET_SYSERR
+*/
+int
+GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle
+ *tth, struct PeerContext *p,
+ const char *cfgname,
+ GNUNET_TRANSPORT_TESTING_start_cb
+ restart_cb, void *cb_cls)
+{
+ struct GNUNET_DISK_FileHandle *fn;
+
+ GNUNET_assert (tth != NULL);
+ GNUNET_assert (p != NULL);
+ GNUNET_assert (p->hostkeyfile != NULL);
+ GNUNET_assert (p->servicehome != NULL);
+
+ /* shutdown */
+#if VERBOSE
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+ "Stopping peer %u (`%s')\n", p->no, GNUNET_i2s (&p->id));
+#endif
+ if (p->ghh != NULL)
+ GNUNET_TRANSPORT_get_hello_cancel (p->ghh);
+ p->ghh = NULL;
+
+ if (p->th != NULL)
+ GNUNET_TRANSPORT_disconnect (p->th);
+
+ if (NULL != p->arm_proc)
+ {
+ if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ GNUNET_OS_process_wait (p->arm_proc);
+ GNUNET_OS_process_close (p->arm_proc);
+ p->arm_proc = NULL;
+ }
+ if (p->hello != NULL)
+ GNUNET_free (p->hello);
+ p->hello = NULL;
+
+ if (p->cfg != NULL)
+ GNUNET_CONFIGURATION_destroy (p->cfg);
+ p->cfg = NULL;
+
+
+ /* start */
+#if VERBOSE
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+ "Restarting peer %u (`%s')\n", p->no, GNUNET_i2s (&p->id));
+#endif
+
+ sleep (5); // YUCK!
+
+ if (GNUNET_DISK_file_test (cfgname) == GNUNET_NO)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
+ "File not found: `%s' \n", cfgname);
+ goto fail;
+ }
+
+ p->cfg = GNUNET_CONFIGURATION_create ();
+ GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+
+ if (!GNUNET_CONFIGURATION_have_value (p->cfg, "PATHS", "SERVICEHOME"))
+ goto fail;
+
+ fn = GNUNET_DISK_file_open (p->hostkeyfile,
+ GNUNET_DISK_OPEN_READWRITE |
+ GNUNET_DISK_OPEN_CREATE,
+ GNUNET_DISK_PERM_USER_READ |
+ GNUNET_DISK_PERM_USER_WRITE);
+ if (fn == NULL)
+ goto fail;
+ if (GNUNET_OK != GNUNET_DISK_file_close (fn))
+ goto fail;
+
+ p->arm_proc =
+ GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+ "gnunet-service-arm", "-c", cfgname,
+#if VERBOSE_PEERS
+ "-L", "DEBUG",
+#else
+ "-L", "ERROR",
+#endif
+ NULL);
+
+ p->th =
+ GNUNET_TRANSPORT_connect (p->cfg, NULL, p, ¬ify_receive,
+ ¬ify_connect, ¬ify_disconnect);
+ GNUNET_assert (p->th != NULL);
+
+ p->start_cb = restart_cb;
+ p->cb_cls = cb_cls;
+
+ p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &get_hello, p);
+ GNUNET_assert (p->ghh != NULL);
+ return GNUNET_OK;
+
+fail:
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+ "Restarting peer %u (`%s') failed, removing peer\n", p->no,
+ GNUNET_i2s (&p->id));
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
+ return GNUNET_SYSERR;
+}
+
/**
* shutdown the given peer
+ * @param tth testing handle
* @param p the peer
*/
void
p->arm_proc = NULL;
}
+ if (p->hostkeyfile != NULL)
+ {
+ GNUNET_DISK_directory_remove (p->hostkeyfile);
+ GNUNET_free (p->hostkeyfile);
+ }
+
if (p->servicehome != NULL)
{
GNUNET_DISK_directory_remove (p->servicehome);
if (p->hello != NULL)
GNUNET_free (p->hello);
+ p->hello = NULL;
if (p->cfg != NULL)
GNUNET_CONFIGURATION_destroy (p->cfg);
+ p->cfg = NULL;
GNUNET_CONTAINER_DLL_remove (tth->p_head, tth->p_tail, p);
/**
* Cancel the request to connect two peers
* Tou MUST cancel the request if you stop the peers before the peers connected succesfully
- * @param cc a connect request handle
+ *
+ * @param tth transport testing handle
+ * @param ccr a connect request handle
*/
void
GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct
p = t;
}
+ GNUNET_free_non_null (tth->hostkey_data);
+
GNUNET_free (tth);
tth = NULL;
}
struct GNUNET_TRANSPORT_TESTING_handle *
GNUNET_TRANSPORT_TESTING_init ()
{
- struct GNUNET_TRANSPORT_TESTING_handle *tth =
- GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_TESTING_handle));
+ struct GNUNET_TRANSPORT_TESTING_handle *tth;
+ struct GNUNET_DISK_FileHandle *fd;
+ uint64_t fs;
+ uint64_t total_hostkeys;
+
+
+ /* prepare hostkeys */
+ tth = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_TESTING_handle));
+ tth->hostkey_data = NULL;
+ const char *hostkeys_file = "../../contrib/testing_hostkeys.dat";
+
+ if (GNUNET_YES != GNUNET_DISK_file_test (hostkeys_file))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Could not read hostkeys file!\n"));
+ }
+ else
+ {
+ /* Check hostkey file size, read entire thing into memory */
+ fd = GNUNET_DISK_file_open (hostkeys_file, GNUNET_DISK_OPEN_READ,
+ GNUNET_DISK_PERM_NONE);
+ if (NULL == fd)
+ {
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "open", hostkeys_file);
+ GNUNET_free (tth);
+ return NULL;
+ }
+
+ if (GNUNET_YES != GNUNET_DISK_file_size (hostkeys_file, &fs, GNUNET_YES))
+ fs = 0;
+
+ if (0 != (fs % HOSTKEYFILESIZE))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
+ "File size %llu seems incorrect for hostkeys...\n", fs);
+ }
+ else
+ {
+ total_hostkeys = fs / HOSTKEYFILESIZE;
+ tth->hostkey_data = GNUNET_malloc_large (fs);
+ GNUNET_assert (fs == GNUNET_DISK_file_read (fd, tth->hostkey_data, fs));
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+ "Read %llu hostkeys from file\n", total_hostkeys);
+ tth->hostkeys_total = total_hostkeys;
+ }
+ GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fd));
+ }
return tth;
}
/**
* This function takes the filename (e.g. argv[0), removes a "lt-"-prefix and
* if existing ".exe"-prefix and adds the peer-number
+ *
* @param file filename of the test, e.g. argv[0]
- * @param cfgname where to write the result
+ * @param dest where to write the filename
* @param count peer number
*/
void
projects / oweals / gnunet.git / blobdiff