#include "gnunet_service_lib.h"
#include "gnunet_crypto_lib.h"
-#include "plugin_transport.h"
+#include "gnunet_transport_plugin.h"
#include "gnunet_statistics_service.h"
#include "transport.h"
#include <curl/curl.h>
static char * key_file;
static char * cert_file;
+static char * servicehome;
+
/**
* Shutdown testcase
*/
static void
shutdown_clean ()
{
- struct Plugin_Address * cur;
struct Plugin_Address * tmp;
/* Evaluate results */
/* cleaning addresses */
while (addr_head != NULL)
{
- cur = addr_head;
tmp = addr_head->next;
GNUNET_free (addr_head->addr);
GNUNET_free (addr_head);
GNUNET_free(test_addr);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Unloading https plugin\n");
- GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_https", api));
+ GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_gnunet_transport_plugin.https", api));
GNUNET_SCHEDULER_shutdown();
- GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http");
+ GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin.http");
struct stat sbuf;
if (0 == stat (cert_file, &sbuf ))
GNUNET_free (cert_file);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Exiting testcase\n");
+
+ if (servicehome != NULL)
+ {
+ GNUNET_DISK_directory_remove (servicehome);
+ GNUNET_free (servicehome);
+ }
+
exit(fail);
return;
}
const struct GNUNET_PeerIdentity * target,
int result)
{
- struct Plugin_Address * tmp_addr;
- tmp_addr = addr_head;
-
if ((cls == &fail_msg_transmited_bigger_max_size) && (result == GNUNET_SYSERR))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message bigger max msg size was not sent!\n");
* Recieves messages from plugin, in real world transport
*/
static struct GNUNET_TIME_Relative
-receive (void *cls,
- const struct GNUNET_PeerIdentity * peer,
- const struct GNUNET_MessageHeader * message,
- uint32_t distance,
- struct Session *session,
- const char *sender_address,
- uint16_t sender_address_len)
+receive (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message,
+ const struct GNUNET_TRANSPORT_ATS_Information *ats,
+ uint32_t ats_count,
+ struct Session *session,
+ const char *sender_address,
+ uint16_t sender_address_len)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testcase recieved new message from peer `%s' with type %u and length %u, session %X\n", GNUNET_i2s(peer), ntohs(message->type), ntohs(message->size),session);
addr_head = NULL;
count_str_addr = 0;
/* parse configuration */
+ if (GNUNET_CONFIGURATION_have_value (c,"PATHS", "SERVICEHOME"))
+ GNUNET_CONFIGURATION_get_value_string (c, "PATHS", "SERVICEHOME", &servicehome);
+
+
if ((GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (c,
"TRANSPORT",
/* assertions before start */
GNUNET_assert ((port > 0) && (port <= 65535));
- GNUNET_assert(&my_public_key != NULL);
- GNUNET_assert(&my_identity.hashPubKey != NULL);
/* load plugins... */
setup_plugin_environment ();
};
int ret;
char *const argv_prog[] = {
- "test_plugin_transport_https",
+ "test_gnunet_transport_plugin.https",
"-c",
"test_plugin_transport_data_http.conf",
"-L",
#endif
NULL
};
- GNUNET_log_setup ("test_plugin_transport_https",
+ GNUNET_log_setup ("test_gnunet_transport_plugin.https",
#if VERBOSE
"DEBUG",
#else
#endif
NULL);
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+ cfg = GNUNET_CONFIGURATION_create ();
+
+ GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (cfg, "test_plugin_transport_data_http.conf"));
+ if (GNUNET_CONFIGURATION_have_value (cfg,"PATHS", "SERVICEHOME"))
+ GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS", "SERVICEHOME", &servicehome);
+ GNUNET_DISK_directory_remove (servicehome);
+ GNUNET_CONFIGURATION_destroy (cfg);
+
ret = (GNUNET_OK ==
GNUNET_PROGRAM_run (5,
argv_prog,
- "test_plugin_transport_https",
+ "test_gnunet_transport_plugin.https",
"testcase", options, &run, NULL)) ? GNUNET_NO : GNUNET_YES;
-
- GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_https");
-
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("\ndelete\n\n"));
+ if (servicehome != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("\ndelete\n\n"));
+ GNUNET_DISK_directory_remove (servicehome);
+ GNUNET_free (servicehome);
+ }
+ if (GNUNET_OK != ret)
+ return 1;
return fail;
}
-/* end of test_plugin_transport_http.c */
+/* end of test_plugin_transport_https.c */