#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>
-#define VERBOSE GNUNET_YES
-#define DEBUG GNUNET_NO
+#define VERBOSE GNUNET_NO
#define DEBUG_CURL GNUNET_NO
#define HTTP_BUFFER_SIZE 2048
+#define PROTOCOL_PREFIX "http"
+
#define PLUGIN libgnunet_plugin_transport_template
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
/**
- * How long until we give up on transmitting the message?
+ * Testcase timeout
*/
-#define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+#define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20)
/**
* How long between recieve and send?
*/
struct IPv4HttpAddress
{
+ struct IPv4HttpAddress * next;
+
+ struct IPv4HttpAddress * prev;
+
/**
* IPv4 address, in network byte order.
*/
*/
struct IPv6HttpAddress
{
+ struct IPv6HttpAddress * next;
+
+ struct IPv6HttpAddress * prev;
+
/**
* IPv6 address.
*/
};
+
/**
* Our public key.
*/
static long long unsigned int port;
/**
- * Peer's port
+ * Peer's addr
*/
static char * test_addr;
-/**
- * Our scheduler.
- */
-struct GNUNET_SCHEDULER_Handle *sched;
-
/**
* Our statistics handle.
*/
*/
static int fail_session_selection_any;
+/**
+ * Test: session selection, use existing inbound session
+ */
+static int fail_session_selection_session;
+
+/**
+ * Test: session selection, use existing inbound session
+ * max message, not fitting in send & recv buffers at one time
+ */
+static int fail_session_selection_session_big;
/**
* Test: session selection, use reliable existing
fail = 0;
if ((fail_notify_address == GNUNET_YES) || (fail_pretty_printer == GNUNET_YES) || (fail_addr_to_str == GNUNET_YES))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test plugin functions failed\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Phase 0: Test plugin functions failed\n");
fail = 1;
}
if ((test_no_ident.test_failed == GNUNET_YES) || (test_too_short_ident.test_failed == GNUNET_YES) || (test_too_long_ident.test_failed == GNUNET_YES) || (test_valid_ident.test_failed == GNUNET_YES))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test connect with wrong data failed\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Phase 1: Test connect with wrong data failed\n");
+ fail = 1;
+ }
+ if ((fail_session_selection_any != GNUNET_NO) || (fail_session_selection_reliable != GNUNET_NO) || (fail_session_selection_session != GNUNET_NO) || (fail_session_selection_session_big != GNUNET_NO))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Phase 2: Test session selection failed\n");
fail = 1;
}
if ((fail_msgs_transmited_to_local_addrs != count_str_addr) || (fail_multiple_msgs_in_transmission != 2) || (fail_msg_transmited_max_size == GNUNET_YES))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test sending with plugin failed\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Phase 3: Test sending with plugin failed\n");
fail = 1;
}
if (fail != 1)
if (ti_send != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel(sched,ti_send);
+ GNUNET_SCHEDULER_cancel(ti_send);
ti_send = GNUNET_SCHEDULER_NO_TASK;
}
if (http_task_send != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel(sched,http_task_send);
+ GNUNET_SCHEDULER_cancel(http_task_send);
http_task_send = GNUNET_SCHEDULER_NO_TASK;
}
if (ti_timeout != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel(sched,ti_timeout);
+ GNUNET_SCHEDULER_cancel(ti_timeout);
ti_timeout = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_free(test_addr);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Unloading http plugin\n");
- GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_http", api));
+ GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_gnunet_transport_plugin_http", api));
- GNUNET_SCHEDULER_shutdown(sched);
- GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http");
+ GNUNET_SCHEDULER_shutdown();
+ GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin_http");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Exiting testcase\n");
exit(fail);
}
-static void run_connection_tests( int );
+static void run_connection_tests( int phase , void * cls);
/**
* 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\n", GNUNET_i2s(peer), ntohs(message->type), ntohs(message->size));
+ 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);
- if ((ntohs(message->type)>=10) && (ntohs(message->type)<=20))
+ if ((ntohs(message->type)>=10) && (ntohs(message->type)<20))
{
fail_msgs_transmited_to_local_addrs++;
if (fail_msgs_transmited_to_local_addrs == count_str_addr)
- run_connection_tests(2);
+ run_connection_tests(2, session);
}
- if ((ntohs(message->type)==60))
+ if ((ntohs(message->type)==20))
{
fail_session_selection_reliable = GNUNET_NO;
}
- if ((ntohs(message->type)==61))
+ if ((ntohs(message->type)==21))
{
fail_session_selection_any = GNUNET_NO;
- run_connection_tests(3);
+ }
+ if ((ntohs(message->type)==22))
+ {
+ fail_session_selection_session = GNUNET_NO;
}
- if ((ntohs(message->type)==40) || (ntohs(message->type)==41))
+ if ((ntohs(message->type)==23))
+ {
+ fail_session_selection_session_big = GNUNET_NO;
+ run_connection_tests(3, NULL);
+ }
+
+ if ((ntohs(message->type)==30) || (ntohs(message->type)==31))
{
fail_multiple_msgs_in_transmission ++;
}
- if (ntohs(message->size) == GNUNET_SERVER_MAX_MESSAGE_SIZE-1)
+ if ((ntohs(message->type)==32) && (ntohs(message->size) == GNUNET_SERVER_MAX_MESSAGE_SIZE-1))
{
fail_msg_transmited_max_size = GNUNET_NO;
shutdown_clean();
static size_t send_prepare( struct HTTP_Transfer * result);
-static void run_connection_tests( );
+
static void send_execute (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
curl_easy_cleanup(curl_handle);
curl_handle=NULL;
- run_connection_tests(0);
+ run_connection_tests(0, NULL);
}
if (res == &test_no_ident)
{
if ((res->http_result_code==404) && (buffer_in.len==208))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connecting to peer without any peer identification: test passed\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to peer without any peer identification: test passed\n");
res->test_failed = GNUNET_NO;
}
else
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connecting to peer without any peer identification: test failed\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Connecting to peer without any peer identification: test failed\n"));
}
if (res == &test_too_short_ident)
{
if ((res->http_result_code==404) && (buffer_in.len==208))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connecting to peer with too short peer identification: test passed\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to peer with too short peer identification: test passed\n");
res->test_failed = GNUNET_NO;
}
else
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connecting to peer with too short peer identification: test failed\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Connecting to peer with too short peer identification: test failed\n"));
}
if (res == &test_too_long_ident)
{
if ((res->http_result_code==404) && (buffer_in.len==208))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connecting to peer with too long peer identification: test passed\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to peer with too long peer identification: test passed\n");
res->test_failed = GNUNET_NO;
}
else
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connecting to peer with too long peer identification: test failed\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Connecting to peer with too long peer identification: test failed\n"));
}
if (res == &test_valid_ident)
{
if ((res->http_result_code==200))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connecting to peer with valid peer identification: test passed\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to peer with valid peer identification: test passed\n");
res->test_failed = GNUNET_NO;
}
else
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connecting to peer with valid peer identification: test failed\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Connecting to peer with valid peer identification: test failed\n");
}
curl_easy_cleanup(curl_handle);
curl_handle=NULL;
if ((res == &test_valid_ident) && (res->test_failed == GNUNET_NO))
- run_connection_tests(1);
- run_connection_tests(0);
+ run_connection_tests(1, NULL);
+ run_connection_tests(0, NULL);
return;
default:
break;
gws = GNUNET_NETWORK_fdset_create ();
GNUNET_NETWORK_fdset_copy_native (grs, &rs, max + 1);
GNUNET_NETWORK_fdset_copy_native (gws, &ws, max + 1);
- http_task_send = GNUNET_SCHEDULER_add_select (sched,
- GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ http_task_send = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 0),
grs,
}
else
{
- GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"),
+ sizeof (struct IPv6HttpAddress),
+ sizeof (struct IPv4HttpAddress),
+ addrlen);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Transport plugin notification for address: `%s':%u\n"),
address,
port);
fail_notify_address = GNUNET_NO;
}
+static void
+plugin_env_session_end (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ struct Session *session)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Pluging tells me: session %X to peer `%s' ended\n", session, GNUNET_i2s(peer));
+}
+
+
/**
* Setup plugin environment
*/
setup_plugin_environment ()
{
env.cfg = cfg;
- env.sched = sched;
env.stats = stats;
env.my_identity = &my_identity;
env.cls = &env;
env.receive = &receive;
env.notify_address = ¬ify_address;
env.max_connections = max_connect_per_transport;
+ env.session_end = &plugin_env_session_end;
}
/**
* Runs every single test to test the plugin
*/
-static void run_connection_tests( int phase )
+static void run_connection_tests( int phase , void * cls)
{
+ struct GNUNET_MessageHeader * msg;
+ unsigned int size;
+
if (phase==0)
{
char * host_str = NULL;
{
/* Connecting to peer without identification */
char * ident = "";
- GNUNET_asprintf (&host_str, "http://%s/%s",test_addr,ident);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connecting to peer without any peer identification.\n"));
+ GNUNET_asprintf (&host_str, "%s://%s/%s",PROTOCOL_PREFIX, test_addr,ident);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Connecting to peer without any peer identification.\n"));
test_no_ident.test_executed = GNUNET_YES;
send_data ( &test_no_ident, host_str);
GNUNET_free (host_str);
{
char * ident = "AAAAAAAAAA";
/* Connecting to peer with too short identification */
- GNUNET_asprintf (&host_str, "http://%s/%s",test_addr,ident);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connecting to peer with too short peer identification.\n"));
+ GNUNET_asprintf (&host_str, "%s://%s/%s",PROTOCOL_PREFIX,test_addr,ident);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Connecting to peer with too short peer identification.\n"));
test_too_short_ident.test_executed = GNUNET_YES;
send_data ( &test_too_short_ident, host_str);
GNUNET_free (host_str);
char * ident = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
/* Connecting to peer with too long identification */
- GNUNET_asprintf (&host_str, "http://%s/%s",test_addr,ident);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connecting to peer with too long peer identification.\n"));
+ GNUNET_asprintf (&host_str, "%s://%s/%s",PROTOCOL_PREFIX, test_addr,ident);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Connecting to peer with too long peer identification.\n"));
test_too_long_ident.test_executed = GNUNET_YES;
send_data ( &test_too_long_ident, host_str);
GNUNET_free (host_str);
{
struct GNUNET_CRYPTO_HashAsciiEncoded ident;
GNUNET_CRYPTO_hash_to_enc(&my_identity.hashPubKey,&ident);
- GNUNET_asprintf (&host_str, "http://%s/%s%s",test_addr,(char *) &ident,";0");
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connecting to peer with valid peer identification.\n"));
+ GNUNET_asprintf (&host_str, "%s://%s/%s%s",PROTOCOL_PREFIX, test_addr,(char *) &ident,";0");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Connecting to peer with valid peer identification.\n"));
test_valid_ident.test_executed = GNUNET_YES;
send_data ( &test_valid_ident, host_str);
GNUNET_free (host_str);
}
if (phase==1)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("\nPhase 1: transmit data to all suggested addresses\n\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\nPhase 1: transmit data to all suggested addresses\n\n");
/* Using one of the addresses the plugin proposed */
GNUNET_assert (addr_head->addr != NULL);
count ++;
type ++;
}
-
- msg.type = htons(60);
- memcpy(tmp,&msg,sizeof(struct GNUNET_MessageHeader));
- api->send(api->cls, &my_identity, tmp, sizeof(struct GNUNET_MessageHeader), 0, TIMEOUT, NULL, NULL, 0, GNUNET_NO, &task_send_cont, &fail_msgs_transmited_to_local_addrs);
-
- msg.type = htons(61);
- memcpy(tmp,&msg,sizeof(struct GNUNET_MessageHeader));
- api->send(api->cls, &my_identity, tmp, sizeof(struct GNUNET_MessageHeader), 0, TIMEOUT, NULL, NULL, 0, GNUNET_SYSERR, &task_send_cont, &fail_msgs_transmited_to_local_addrs);
+ GNUNET_free(tmp);
return;
}
if (phase==2)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("\nPhase 2: session selection\n\n"));
-
- struct GNUNET_MessageHeader msg;
- msg.size=htons(sizeof(struct GNUNET_MessageHeader));
- msg.type = htons(60);
- api->send(api->cls, &my_identity, (const char *) &msg, sizeof(struct GNUNET_MessageHeader), 0, TIMEOUT, NULL, NULL, 0, GNUNET_NO, &task_send_cont, NULL);
-
- msg.type = htons(61);
- api->send(api->cls, &my_identity, (const char *) &msg, sizeof(struct GNUNET_MessageHeader), 0, TIMEOUT, NULL, NULL, 0, GNUNET_SYSERR, &task_send_cont, NULL);
+ struct Session * session = cls;
+ msg = GNUNET_malloc (sizeof(struct GNUNET_MessageHeader));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Phase 2: session selection\n\n");
+ size = sizeof(struct GNUNET_MessageHeader);
+ msg->size=htons(size);
+ msg->type = htons(20);
+ api->send(api->cls, &my_identity, (const char *) msg, size, 0, TIMEOUT, NULL, NULL, 0, GNUNET_NO, &task_send_cont, NULL);
+
+ msg->type = htons(21);
+ api->send(api->cls, &my_identity, (const char *) msg, size, 0, TIMEOUT, NULL, NULL, 0, GNUNET_SYSERR, &task_send_cont, NULL);
+
+ /* answer on session*/
+ size = sizeof( struct GNUNET_MessageHeader);
+ msg->size = htons(size);
+ msg->type = htons(22);
+ api->send(api->cls, &my_identity, (const char *) msg, size, 0, TIMEOUT, session, NULL, 0, GNUNET_SYSERR, &task_send_cont, NULL);
+
+ GNUNET_free(msg);
+
+ /* answer on session with big message not fitting in mhd send buffer*/
+ size = GNUNET_SERVER_MAX_MESSAGE_SIZE-1;
+ msg = GNUNET_malloc (size);
+ msg->size=htons(size);
+ msg->type = htons(23);
+ api->send(api->cls, &my_identity, (const char *) msg, size, 0, TIMEOUT, session, NULL, 0, GNUNET_NO, &task_send_cont, NULL);
+ GNUNET_free(msg);
+ return;
}
if (phase==3)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("\nPhase 3: send multiple or big messages after disconnect\n\n"));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Phase 3: send multiple or big messages after disconnect\n\n");
/* disconnect from peer, so new connections are created */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Disconnect from peer: `%s'\n", GNUNET_i2s(&my_identity));
api->disconnect(api->cls, &my_identity);
- struct GNUNET_MessageHeader msg;
- char * tmp = GNUNET_malloc(sizeof(struct GNUNET_MessageHeader));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Phase 3: sending messages\n");
/* send a multiple GNUNET_messages at a time*/
- GNUNET_free(tmp);
- tmp = GNUNET_malloc(4 * sizeof(struct GNUNET_MessageHeader));
- struct GNUNET_MessageHeader * msg1 = (struct GNUNET_MessageHeader *) tmp;
- msg1->size = htons(2 * sizeof(struct GNUNET_MessageHeader));
- msg1->type = htons(40);
- struct GNUNET_MessageHeader * msg2 = &msg1[2];
+ size = 2 * sizeof(struct GNUNET_MessageHeader);
+ msg = GNUNET_malloc( 2* size);
+ msg->size = htons(size);
+ msg->type = htons(30);
+ struct GNUNET_MessageHeader * msg2 = &msg[2];
msg2->size = htons(2 * sizeof(struct GNUNET_MessageHeader));
- msg2->type = htons(41);
- api->send(api->cls, &my_identity, tmp, 4 * sizeof(struct GNUNET_MessageHeader), 0, TIMEOUT, NULL,addr_head->addr, addr_head->addrlen, GNUNET_NO, &task_send_cont, &fail_multiple_msgs_in_transmission);
-
+ msg2->type = htons(31);
+ api->send(api->cls, &my_identity, (const char *) msg, 4 * sizeof(struct GNUNET_MessageHeader), 0, TIMEOUT, NULL,addr_head->addr, addr_head->addrlen, GNUNET_NO, &task_send_cont, &fail_multiple_msgs_in_transmission);
+ GNUNET_free(msg);
/* send a message with size GNUNET_SERVER_MAX_MESSAGE_SIZE-1 */
- GNUNET_free(tmp);
- tmp = GNUNET_malloc(GNUNET_SERVER_MAX_MESSAGE_SIZE-1);
- uint16_t t = (uint16_t)GNUNET_SERVER_MAX_MESSAGE_SIZE-1;
- msg.size = htons(t);
- memcpy(tmp,&msg,sizeof(struct GNUNET_MessageHeader));
- api->send(api->cls, &my_identity, tmp, GNUNET_SERVER_MAX_MESSAGE_SIZE-1, 0, TIMEOUT, NULL,addr_head->addr, addr_head->addrlen, GNUNET_NO, &task_send_cont, &fail_msg_transmited_max_size);
- GNUNET_free(tmp);
- /* send a message without address, use existing session */
- tmp = GNUNET_malloc(GNUNET_SERVER_MAX_MESSAGE_SIZE-1);
- t = (uint16_t)GNUNET_SERVER_MAX_MESSAGE_SIZE-1;
- msg.size = htons(t);
- msg.type = htons(50);
- memcpy(tmp,&msg,sizeof(struct GNUNET_MessageHeader));
- api->send(api->cls, &my_identity, tmp, GNUNET_SERVER_MAX_MESSAGE_SIZE-1, 0, TIMEOUT, NULL, NULL, 0, GNUNET_NO, &task_send_cont, &fail_msg_transmited_max_size);
- GNUNET_free(tmp);
+
+ size = GNUNET_SERVER_MAX_MESSAGE_SIZE-1;
+ msg = GNUNET_malloc(size);
+ msg->size = htons(size);
+ msg->type = htons(32);
+ api->send(api->cls, &my_identity, (const char *) msg, size, 0, TIMEOUT, NULL,addr_head->addr, addr_head->addrlen, GNUNET_NO, &task_send_cont, &fail_msg_transmited_max_size);
+ GNUNET_free(msg);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No more tests to run\n");
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No more tests to run\n");
}
* Runs the test.
*
* @param cls closure
- * @param s scheduler to use
* @param c configuration to use
*/
static void
run (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
char *const *args,
const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
{
char * libname;
- sched = s;
cfg = c;
char *keyfile;
unsigned long long tneigh;
fail_multiple_msgs_in_transmission = 0;
fail_session_selection_reliable = GNUNET_YES;
fail_session_selection_reliable = GNUNET_YES;
+ fail_session_selection_session = GNUNET_YES;
+ fail_session_selection_session_big = GNUNET_YES;
addr_head = NULL;
count_str_addr = 0;
"HOSTKEY", &keyfile)))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("Transport service is lacking key configuration settings. Exiting.\n"));
- GNUNET_SCHEDULER_shutdown (s);
+ _("Transport service is lacking key configuration settings. Exiting.\n"));
+ GNUNET_SCHEDULER_shutdown ();
fail = 1;
return;
}
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Transport service could not access hostkey. Exiting.\n"));
- GNUNET_SCHEDULER_shutdown (s);
+ GNUNET_SCHEDULER_shutdown ();
fail = 1;
return;
}
/* load plugins... */
setup_plugin_environment ();
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading HTTP transport plugin `%s'\n"),"libgnunet_plugin_transport_http");
GNUNET_asprintf (&libname, "libgnunet_plugin_transport_http");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading HTTP transport plugin `%s'\n"),libname);
api = GNUNET_PLUGIN_load (libname, &env);
GNUNET_free (libname);
if (api == NULL)
return;
}
- ti_timeout = GNUNET_SCHEDULER_add_delayed (sched, TEST_TIMEOUT, &task_timeout, NULL);
+
+ ti_timeout = GNUNET_SCHEDULER_add_delayed (TEST_TIMEOUT, &task_timeout, NULL);
/* testing plugin functionality */
GNUNET_assert (0!=fail_notify_address_count);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Transport plugin returned %u addresses to connect to\n"), fail_notify_address_count);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transport plugin returned %u addresses to connect to\n", fail_notify_address_count);
/* testing pretty printer with all addresses obtained from the plugin*/
cur = addr_head;
fail_pretty_printer=GNUNET_NO;
fail_addr_to_str=GNUNET_NO;
- /* Suggesting addresses with wrong port*/
struct IPv4HttpAddress failing_addr;
- failing_addr.ipv4_addr = htonl(INADDR_LOOPBACK);
- failing_addr.u_port = htons(0);
- suggest_res = api->check_address (api->cls,&failing_addr,sizeof (struct IPv4HttpAddress));
- GNUNET_assert (GNUNET_SYSERR == suggest_res);
/* Suggesting addresses with wrong size*/
failing_addr.ipv4_addr = htonl(INADDR_LOOPBACK);
GNUNET_assert (GNUNET_SYSERR == suggest_res);
/* Suggesting addresses with wrong address*/
- failing_addr.ipv4_addr = htonl(INADDR_LOOPBACK);
+ failing_addr.ipv4_addr = htonl(0xffc00000);
failing_addr.u_port = htons(12389);
- suggest_res = api->check_address (api->cls,&failing_addr,sizeof (struct IPv4HttpAddress));
+ suggest_res = api->check_address (api->cls,&failing_addr,100);
GNUNET_assert (GNUNET_SYSERR == suggest_res);
/* test sending to client */
test_addr = (char *) api->address_to_string (api->cls,addr_head->addr,addr_head->addrlen);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("\nPhase 0\n\n"));
- run_connection_tests(0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Phase 0\n\n"));
+ run_connection_tests(0, NULL);
/* testing finished */
};
int ret;
char *const argv_prog[] = {
- "test_plugin_transport_http",
+ "test_gnunet_transport_plugin_http",
"-c",
"test_plugin_transport_data_http.conf",
"-L",
#endif
NULL
};
- GNUNET_log_setup ("test_plugin_transport_http",
+ GNUNET_log_setup ("test_gnunet_transport_plugin_http",
#if VERBOSE
"DEBUG",
#else
ret = (GNUNET_OK ==
GNUNET_PROGRAM_run (5,
argv_prog,
- "test_plugin_transport_http",
+ "test_gnunet_transport_plugin_http",
"testcase", options, &run, NULL)) ? GNUNET_NO : GNUNET_YES;
- GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http");
+ GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin_http");
return fail;
}
-/* end of test_plugin_transport_http.c */
+/* end of test_gnunet_transport_plugin_http.c */
projects / oweals / gnunet.git / blobdiff