GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
#include "platform.h"
#include "gnunet_constants.h"
+#include "gnunet_common.h"
#include "gnunet_getopt_lib.h"
#include "gnunet_hello_lib.h"
#include "gnunet_os_lib.h"
#include "gnunet_program_lib.h"
#include "gnunet_signatures.h"
#include "gnunet_service_lib.h"
-#include "plugin_transport.h"
+#include "gnunet_crypto_lib.h"
+
+#include "gnunet_transport_plugin.h"
#include "gnunet_statistics_service.h"
#include "transport.h"
#include <curl/curl.h>
#define VERBOSE GNUNET_NO
-#define DEBUG 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?
*/
#define WAIT_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
+
+
+/**
+ * Struct for plugin addresses
+ */
+struct Plugin_Address
+{
+ /**
+ * Next field for linked list
+ */
+ struct Plugin_Address * next;
+
+ /**
+ * buffer containing data to send
+ */
+ void * addr;
+
+ /**
+ * amount of data to sent
+ */
+ size_t addrlen;
+};
+
/**
* Message to send using http
*/
struct HTTP_Message
{
- char *buf;
+ /**
+ * buffer
+ */
+ unsigned char buf[HTTP_BUFFER_SIZE];
+
+ /**
+ * current position in buffer
+ */
size_t pos;
+
+ /**
+ * buffer size
+ */
size_t size;
+
+ /**
+ * data size
+ */
size_t len;
};
+
+/**
+ * Struct for plugin addresses
+ */
+struct HTTP_Transfer
+{
+ /**
+ * amount of bytes we recieved
+ */
+ size_t data_size;
+
+ /**
+ * buffer for http transfers
+ */
+ unsigned char buf[HTTP_BUFFER_SIZE];
+
+ /**
+ * buffer size this transfer
+ */
+ size_t size;
+
+ /**
+ * amount of bytes we recieved
+ */
+ size_t pos;
+
+ /**
+ * HTTP Header result for transfer
+ */
+ unsigned int http_result_code;
+
+ /**
+ * did the test fail?
+ */
+ unsigned int test_failed;
+
+ /**
+ * was this test already executed?
+ */
+ unsigned int test_executed;
+};
+
+
+/**
+ * Network format for IPv4 addresses.
+ */
+struct IPv4HttpAddress
+{
+ struct IPv4HttpAddress * next;
+
+ struct IPv4HttpAddress * prev;
+
+ /**
+ * IPv4 address, in network byte order.
+ */
+ uint32_t ipv4_addr GNUNET_PACKED;
+
+ /**
+ * Port number, in network byte order.
+ */
+ uint16_t u_port GNUNET_PACKED;
+
+};
+
+
+/**
+ * Network format for IPv6 addresses.
+ */
+struct IPv6HttpAddress
+{
+ struct IPv6HttpAddress * next;
+
+ struct IPv6HttpAddress * prev;
+
+ /**
+ * IPv6 address.
+ */
+ struct in6_addr ipv6_addr GNUNET_PACKED;
+
+ /**
+ * Port number, in network byte order.
+ */
+ uint16_t u6_port GNUNET_PACKED;
+
+};
+
+
/**
* Our public key.
*/
*/
static struct GNUNET_CRYPTO_RsaPrivateKey *my_private_key;
+/**
+ * Peer's port
+ */
+static long long unsigned int port;
/**
- * Our scheduler.
+ * Peer's addr
*/
-struct GNUNET_SCHEDULER_Handle *sched;
+static char * test_addr;
/**
* Our statistics handle.
static GNUNET_SCHEDULER_TaskIdentifier ti_send;
-const struct GNUNET_PeerIdentity * p;
+//const struct GNUNET_PeerIdentity * p;
/**
- * Struct for plugin addresses
+ * buffer for data to send
*/
-struct Plugin_Address
-{
- /**
- * Next field for linked list
- */
- struct Plugin_Address * next;
-
- /**
- * buffer containing data to send
- */
- void * addr;
-
- /**
- * amount of data to sent
- */
- size_t addrlen;
-};
+static struct HTTP_Message buffer_out;
/**
- * Struct for plugin addresses
+ * buffer for data to recieve
*/
-struct HTTP_Transfer
-{
- /**
- * HTTP Header result for transfer
- */
- unsigned int http_result_code;
-
- /**
- * amount of bytes we recieved
- */
- size_t data_size;
-
- unsigned char buf[2048];
-
- /**
- * amount of bytes we recieved
- */
- size_t pos;
-
- size_t size;
-
- unsigned int test_failed;
+static struct HTTP_Message buffer_in;
-};
struct Plugin_Address * addr_head;
static int fail_addr_to_str;
/**
- * Did the test pass or fail?
+ * No. of msgs transmitted successfully to local addresses
+ */
+static int fail_msgs_transmited_to_local_addrs;
+
+/**
+ * Test: transmit msg of max. size
+ */
+static int fail_msg_transmited_bigger_max_size;
+
+/**
+ * Test: transmit msg of max. size
+ */
+static int fail_msg_transmited_max_size;
+
+/**
+ * Test: transmit 2 msgs. in in send operation
+ */
+static int fail_multiple_msgs_in_transmission;
+
+/**
+ * Test: connect to peer without peer identification
+ */
+static struct HTTP_Transfer test_no_ident;
+
+/**
+ * Test: connect to peer without peer identification
*/
-static struct HTTP_Transfer testtransfer_no_ident;
+static struct HTTP_Transfer test_too_short_ident;
+/**
+ * Test: connect to peer without peer identification
+ */
+static struct HTTP_Transfer test_too_long_ident;
+
+/**
+ * Test: connect to peer with valid peer identification
+ */
+static struct HTTP_Transfer test_valid_ident;
+
+/**
+ * Test: session selection, use any existing
+ */
+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
+ */
+static int fail_session_selection_reliable;
/**
* Did the test pass or fail?
static int fail;
/**
- * Recieved message already returned to sender?
+ * Number of local addresses
*/
-static int sent;
+static unsigned int count_str_addr;
CURL *curl_handle;
*/
static CURLM *multi_handle;
-/**
- * Test message to send
- */
-struct HTTP_Message * msg;
-
/**
* The task sending data
*/
static GNUNET_SCHEDULER_TaskIdentifier http_task_send;
+static char * servicehome;
+
/**
* Shutdown testcase
*/
static void
shutdown_clean ()
{
- if ((fail_notify_address == GNUNET_NO) && (fail_pretty_printer == GNUNET_NO) && (fail_addr_to_str == GNUNET_NO) && (testtransfer_no_ident.test_failed == GNUNET_NO))
- fail = 0;
- else
+ struct Plugin_Address * tmp;
+
+ /* Evaluate results */
+ fail = 0;
+ if ( (fail_notify_address == GNUNET_YES) ||
+ (fail_pretty_printer == GNUNET_YES) ||
+ (fail_addr_to_str == GNUNET_YES))
+ {
+ 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_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_ERROR,
+ "Phase 3: Test sending with plugin failed\n");
+ fail = 1;
+ }
+ if (fail != 1)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "All tests successful\n");
+ }
+
+ api->disconnect(api->cls,&my_identity);
curl_multi_cleanup(multi_handle);
if (NULL != curl_handle)
curl_easy_cleanup (curl_handle);
+ /* cleaning addresses */
+ while (addr_head != NULL)
+ {
+ tmp = addr_head->next;
+ GNUNET_free (addr_head->addr);
+ GNUNET_free (addr_head);
+ addr_head=tmp;
+ }
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_log (GNUNET_ERROR_TYPE_DEBUG, "Unloading http plugin\n");
- GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_http", api));
- GNUNET_SCHEDULER_shutdown(sched);
+ GNUNET_free(test_addr);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Unloading http plugin\n");
+ GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_gnunet_transport_plugin_http", api));
+
+ GNUNET_SCHEDULER_shutdown();
+ GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin_http");
- GNUNET_free(msg->buf);
- GNUNET_free(msg);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Exiting testcase\n");
+
+ if (servicehome != NULL)
+ {
+ GNUNET_DISK_directory_remove (servicehome);
+ GNUNET_free (servicehome);
+ }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Exiting testcase\n");
exit(fail);
return;
}
+
/**
* Continuation called after plugin send message
* @cls closure
* @target target
* @result GNUNET_OK or GNUNET_SYSERR
*/
-static void task_send_cont (void *cls,
- const struct GNUNET_PeerIdentity * target,
- int result)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message was sent!\n");
- fail = GNUNET_NO;
- shutdown_clean();
-}
-/**
- * Task sending recieved message back to peer
- * @cls closure
- * @tc task context
- */
static void
-task_send (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+task_send_cont (void *cls,
+ const struct GNUNET_PeerIdentity * target,
+ int result)
{
- ti_timeout = GNUNET_SCHEDULER_NO_TASK;
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
-
- if (GNUNET_YES==sent)
- return;
+ 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");
+ fail_msg_transmited_bigger_max_size = GNUNET_NO;
+ return;
+ }
- struct GNUNET_MessageHeader * msg = cls;
- unsigned int len = ntohs(msg->size);
- const char * msgc = (const char *) msg;
+ if ((cls == &fail_msg_transmited_max_size) && (result == GNUNET_OK))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Message with max msg size succesfully sent!\n",
+ fail_msgs_transmited_to_local_addrs);
+ fail_msg_transmited_max_size = GNUNET_NO;
+ }
+}
- api->send(api->cls, p, msgc, len, 0, TIMEOUT, NULL,NULL, 0, GNUNET_NO, &task_send_cont, NULL);
- sent = GNUNET_YES;
-}
+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));
-
- /* take recieved message and send it back to peer */
- p = peer;
- void * c = (void *) message;
- ti_send =GNUNET_SCHEDULER_add_delayed (sched, WAIT_INTERVALL, &task_send, c);
-
+ 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) )
+ {
+ fail_msgs_transmited_to_local_addrs++;
+ if (fail_msgs_transmited_to_local_addrs == count_str_addr)
+ run_connection_tests(2, session);
+ }
+ if ((ntohs(message->type)==20))
+ {
+ fail_session_selection_reliable = GNUNET_NO;
+ }
+ if ((ntohs(message->type)==21))
+ {
+ fail_session_selection_any = GNUNET_NO;
+ }
+ if ((ntohs(message->type)==22))
+ {
+ fail_session_selection_session = GNUNET_NO;
+ }
+ 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->type)==32) && (ntohs(message->size) == GNUNET_SERVER_MAX_MESSAGE_SIZE-1))
+ {
+ fail_msg_transmited_max_size = GNUNET_NO;
+ shutdown_clean();
+ }
return GNUNET_TIME_UNIT_ZERO;
}
- int done;
-static size_t
-putBuffer (void *stream, size_t size, size_t nmemb, void *ptr)
+
+static size_t
+send_function (void *stream, size_t size, size_t nmemb, void *ptr)
{
unsigned int len;
- struct HTTP_Message * cbc = ptr;
- len = cbc->len;
+ len = buffer_out.len;
- if (( cbc->pos == len) && (len < (size * nmemb)))
+ if (( buffer_out.pos == len) || (len > (size * nmemb)))
return 0;
- memcpy(stream, cbc->buf, len);
- cbc->pos = len;
+ memcpy(stream, buffer_out.buf, len);
+ buffer_out.pos = len;
return len;
+
}
-static size_t copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
+static size_t
+recv_function (void *ptr, size_t size, size_t nmemb, void *ctx)
{
- struct HTTP_Transfer * res = (struct HTTP_Transfer *) ctx;
-
- res->data_size = size * nmemb;
- if (res->pos + size * nmemb > res->size)
+ if (buffer_in.pos + size * nmemb > buffer_in.size)
return 0; /* overflow */
- memcpy (&res->buf[res->pos], ptr, size * nmemb);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Send completed. %s\n",res->buf);
- res->pos += size * nmemb;
- return size * nmemb;
+
+ buffer_in.len = size * nmemb;
+ memcpy (&buffer_in.buf[buffer_in.pos], ptr, size * nmemb);
+ buffer_in.pos += size * nmemb;
+ buffer_in.len = buffer_in.pos;
+ buffer_in.buf[buffer_in.pos] = '\0';
+ return buffer_in.pos;
}
-static size_t header_function( void *ptr, size_t size, size_t nmemb, void *stream)
+static size_t
+header_function( void *ptr, size_t size, size_t nmemb, void *stream)
{
- struct HTTP_Transfer * res = (struct HTTP_Transfer *) stream;
+ struct HTTP_Transfer * res = stream;
char * tmp;
unsigned int len = size * nmemb;
memcpy(tmp,ptr,len);
if (tmp[len-2] == 13)
tmp[len-2]= '\0';
+#if DEBUG_CURL
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Header: `%s'\n",
+ tmp);
+#endif
+ if (0==strcmp (tmp,"HTTP/1.1 100 Continue"))
+ {
+ res->http_result_code=100;
+ }
+ if (0==strcmp (tmp,"HTTP/1.1 200 OK"))
+ {
+ res->http_result_code=200;
+ }
+ if (0==strcmp (tmp,"HTTP/1.1 400 Bad Request"))
+ {
+ res->http_result_code=400;
+ }
if (0==strcmp (tmp,"HTTP/1.1 404 Not Found"))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "404\n");
- res->http_result_code=404;
+ res->http_result_code=404;
}
-
+ if (0==strcmp (tmp,"HTTP/1.1 413 Request entity too large"))
+ {
+ res->http_result_code=413;
+ }
+
GNUNET_free (tmp);
return size * nmemb;
}
-static size_t send_prepare( struct HTTP_Transfer * result);
-static void send_execute (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+static size_t
+send_prepare( struct HTTP_Transfer * result);
+
+
+static void
+send_execute (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct HTTP_Transfer *res;
{
msg = curl_multi_info_read (multi_handle, &running);
- GNUNET_break (msg != NULL);
if (msg == NULL)
break;
/* get session for affected curl handle */
__LINE__,
curl_easy_strerror (msg->data.result));
/* sending msg failed*/
+ curl_easy_cleanup(curl_handle);
+ curl_handle=NULL;
+
+ 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_DEBUG,
+ "Connecting to peer without any peer identification: test passed\n");
+ res->test_failed = GNUNET_NO;
}
- else
+ else
+ 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_DEBUG, "Send completed with code %u\n", res->data_size);
- /* sending completed */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connecting to peer with too short peer identification: test passed\n");
+ res->test_failed = GNUNET_NO;
}
- if ( (cls == &testtransfer_no_ident) && (res->http_result_code==404) && (res->data_size==208))
+ else
+ 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_DEBUG,
+ "Connecting to peer with too long peer identification: test passed\n");
res->test_failed = GNUNET_NO;
-
+ }
+ else
+ 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_DEBUG,
+ "Connecting to peer with valid peer identification: test passed\n");
+ res->test_failed = GNUNET_NO;
+ }
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Connecting to peer with valid peer identification: test failed\n");
+ }
curl_easy_cleanup(curl_handle);
curl_handle=NULL;
- shutdown_clean();
+ if ((res == &test_valid_ident) && (res->test_failed == GNUNET_NO))
+ run_connection_tests(1, NULL);
+ run_connection_tests(0, NULL);
return;
default:
break;
send_prepare(cls);
}
+
/**
* Function setting up file descriptors and scheduling task to run
* @param ses session to send data to
* @return bytes sent to peer
*/
-static size_t send_prepare( struct HTTP_Transfer * result)
+static size_t
+send_prepare( struct HTTP_Transfer * result)
{
fd_set rs;
fd_set ws;
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,
- GNUNET_SCHEDULER_NO_TASK,
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 0),
- grs,
- gws,
- &send_execute,
- result);
+ 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,
+ gws,
+ &send_execute,
+ result);
GNUNET_NETWORK_fdset_destroy (gws);
GNUNET_NETWORK_fdset_destroy (grs);
/**
* function to send data to server
*/
-static int send_data(struct HTTP_Message *msg, struct HTTP_Transfer * result, char * url)
+static int
+send_data(struct HTTP_Transfer * result,
+ char * url)
{
curl_handle = curl_easy_init();
if( NULL == curl_handle)
- {
- printf("easy_init failed \n");
- return GNUNET_SYSERR;
- }
+ {
+ printf("easy_init failed \n");
+ return GNUNET_SYSERR;
+ }
#if DEBUG_CURL
curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1L);
#endif
curl_easy_setopt(curl_handle, CURLOPT_PUT, 1L);
curl_easy_setopt (curl_handle, CURLOPT_HEADERFUNCTION, &header_function);
curl_easy_setopt (curl_handle, CURLOPT_WRITEHEADER, result);
- curl_easy_setopt (curl_handle, CURLOPT_WRITEFUNCTION, ©Buffer);
+ curl_easy_setopt (curl_handle, CURLOPT_WRITEFUNCTION, &recv_function);
curl_easy_setopt (curl_handle, CURLOPT_WRITEDATA, result);
- curl_easy_setopt (curl_handle, CURLOPT_READFUNCTION, &putBuffer);
- curl_easy_setopt (curl_handle, CURLOPT_READDATA, msg);
- curl_easy_setopt(curl_handle, CURLOPT_INFILESIZE_LARGE, (curl_off_t) msg->len);
+ curl_easy_setopt (curl_handle, CURLOPT_READFUNCTION, &send_function);
+ curl_easy_setopt (curl_handle, CURLOPT_READDATA, result);
+ curl_easy_setopt(curl_handle, CURLOPT_INFILESIZE_LARGE, (curl_off_t) buffer_out.len);
curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 30);
curl_easy_setopt(curl_handle, CURLOPT_CONNECTTIMEOUT, 20);
return GNUNET_OK;
}
-/**
- * Network format for IPv4 addresses.
- */
-struct IPv4HttpAddress
-{
- /**
- * IPv4 address, in network byte order.
- */
- uint32_t ipv4_addr;
-
- /**
- * Port number, in network byte order.
- */
- uint16_t u_port;
-
-};
-
-
-/**
- * Network format for IPv6 addresses.
- */
-struct IPv6HttpAddress
-{
- /**
- * IPv6 address.
- */
- struct in6_addr ipv6_addr;
-
- /**
- * Port number, in network byte order.
- */
- uint16_t u6_port;
-
-};
-
/**
* Plugin notifies transport (aka testcase) about its addresses
*/
-void
+static void
notify_address (void *cls,
- const char *name,
+ int add_remove,
const void *addr,
- uint16_t addrlen,
- struct GNUNET_TIME_Relative expires)
+ size_t addrlen)
{
char address[INET6_ADDRSTRLEN];
unsigned int port;
inet_ntop(AF_INET, (struct in_addr *) addr,address,INET_ADDRSTRLEN);
port = ntohs(((struct IPv4HttpAddress *) addr)->u_port);
}
- if (addrlen == (sizeof (struct IPv6HttpAddress)))
+ else if (addrlen == (sizeof (struct IPv6HttpAddress)))
{
inet_ntop(AF_INET6, (struct in6_addr *) addr,address,INET6_ADDRSTRLEN);
port = ntohs(((struct IPv6HttpAddress *) addr)->u6_port);
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Transport plugin notification for address: `%s':%u\n"),
- address,
- port);
+ else
+ {
+ 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,
+ _("Transport plugin notification for address: `%s':%u\n"),
+ address,
+ port);
pl_addr = GNUNET_malloc (sizeof (struct Plugin_Address) );
pl_addr->addrlen = addrlen;
pl_addr->addr = GNUNET_malloc(addrlen);
{
cur = addr_head;
while (NULL != cur->next)
- {
- cur = cur->next;
- }
+ {
+ cur = cur->next;
+ }
cur->next = pl_addr;
}
fail_notify_address_count++;
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;
}
return;
}
-static void pretty_printer_cb (void *cls,
- const char *address)
+
+static void
+pretty_printer_cb (void *cls,
+ const char *address)
{
if (NULL==address)
return;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Plugin returned pretty address: `%s'\n",address);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Plugin returned pretty address: `%s'\n",
+ address);
fail_pretty_printer_count++;
}
+/**
+ * Runs every single test to test the plugin
+ */
+static void
+run_connection_tests( int phase , void * cls)
+{
+ struct GNUNET_MessageHeader * msg;
+ unsigned int size;
+
+ if (phase==0)
+ {
+ char * host_str = NULL;
+ /* resetting buffers */
+ buffer_in.size = HTTP_BUFFER_SIZE;
+ buffer_in.pos = 0;
+ buffer_in.len = 0;
+
+ buffer_out.size = HTTP_BUFFER_SIZE;
+ buffer_out.pos = 0;
+ buffer_out.len = 0;
+
+ if (test_no_ident.test_executed == GNUNET_NO)
+ {
+ /* Connecting to peer without identification */
+ const char * ident = "";
+ 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);
+ return;
+ }
+ if (test_too_short_ident.test_executed == GNUNET_NO)
+ {
+ const char * ident = "AAAAAAAAAA";
+ /* Connecting to peer with too short identification */
+ 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);
+ return;
+ }
+
+ if (test_too_long_ident.test_executed == GNUNET_NO)
+ {
+ const char * ident = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+
+ /* Connecting to peer with too long identification */
+ 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);
+ return;
+ }
+ if (test_valid_ident.test_executed == GNUNET_NO)
+ {
+ struct GNUNET_CRYPTO_HashAsciiEncoded ident;
+ GNUNET_CRYPTO_hash_to_enc(&my_identity.hashPubKey,&ident);
+ 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);
+ return;
+ }
+ }
+ if (phase==1)
+ {
+ 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);
+
+ struct Plugin_Address * tmp_addr;
+ struct GNUNET_MessageHeader msg;
+ char * tmp = GNUNET_malloc(sizeof(struct GNUNET_MessageHeader));
+ char address[INET6_ADDRSTRLEN];
+ unsigned int port;
+ unsigned int type = 10;
+
+ msg.size=htons(sizeof(struct GNUNET_MessageHeader));
+ tmp_addr = addr_head;
+ /* send a message to all addresses advertised by plugin */
+
+ int count = 0;
+ while (tmp_addr != NULL)
+ {
+ if (tmp_addr->addrlen == (sizeof (struct IPv4HttpAddress)))
+ {
+ inet_ntop(AF_INET, (struct in_addr *) tmp_addr->addr,address,INET_ADDRSTRLEN);
+ port = ntohs(((struct IPv4HttpAddress *) tmp_addr->addr)->u_port);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message to addres no. %u: `%s':%u\n",
+ count,
+ address,
+ port);
+ }
+ if (tmp_addr->addrlen == (sizeof (struct IPv6HttpAddress)))
+ {
+ inet_ntop(AF_INET6, (struct in6_addr *) tmp_addr->addr,address,INET6_ADDRSTRLEN);
+ port = ntohs(((struct IPv6HttpAddress *) tmp_addr->addr)->u6_port);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message to addres no. %u: `%s':%u\n",
+ count,
+ address,
+ port);
+ }
+ msg.type=htons(type);
+ memcpy(tmp,&msg,sizeof(struct GNUNET_MessageHeader));
+ api->send(api->cls,
+ &my_identity,
+ tmp, sizeof(struct GNUNET_MessageHeader),
+ 0, TIMEOUT,
+ NULL,
+ tmp_addr->addr, tmp_addr->addrlen,
+ GNUNET_YES,
+ &task_send_cont, &fail_msgs_transmited_to_local_addrs);
+ tmp_addr = tmp_addr->next;
+ count++;
+ type++;
+ }
+ GNUNET_free(tmp);
+ return;
+ }
+
+ if (phase==2)
+ {
+ 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_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);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Phase 3: sending messages\n");
+ /* send a multiple GNUNET_messages at a time*/
+ 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(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 */
+
+ 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");
+ }
+}
+
/**
* 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;
struct Plugin_Address * cur;
- struct Plugin_Address * tmp;
const char * addr_str;
- unsigned int count_str_addr;
+
+
unsigned int suggest_res;
- unsigned int res;
fail_pretty_printer = GNUNET_YES;
fail_notify_address = GNUNET_YES;
fail_addr_to_str = GNUNET_YES;
+ fail_msgs_transmited_to_local_addrs = 0;
+ fail_msg_transmited_max_size = GNUNET_YES;
+ 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;
/* 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",
"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;
}
+
+ if ((GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (cfg,
+ "transport-http",
+ "PORT",
+ &port)) ||
+ (port > 65535) || (port == 0))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+ "http",
+ _
+ ("Require valid port number for transport plugin `%s' in configuration!\n"),
+ "transport-http");
+ }
+
max_connect_per_transport = (uint32_t) tneigh;
my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
GNUNET_free (keyfile);
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Transport service could not access hostkey. Exiting.\n"));
- GNUNET_SCHEDULER_shutdown (s);
+ GNUNET_SCHEDULER_shutdown ();
fail = 1;
return;
}
+
GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key);
- GNUNET_CRYPTO_hash (&my_public_key,
- sizeof (my_public_key), &my_identity.hashPubKey);
+ GNUNET_CRYPTO_hash (&my_public_key, sizeof (my_public_key), &my_identity.hashPubKey);
+
+ /* assertions before start */
+ GNUNET_assert ((port > 0) && (port <= 65535));
/* 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*/
- while (addr_head != NULL)
+ cur = addr_head;
+ while (cur != NULL)
{
- cur = addr_head;
-
- api->address_pretty_printer (NULL,"http",cur->addr,cur->addrlen,GNUNET_NO,TEST_TIMEOUT,&pretty_printer_cb,NULL);
- addr_str = api->address_to_string (NULL,cur->addr,cur->addrlen);
- suggest_res = api->check_address (NULL,cur->addr,cur->addrlen);
+ api->address_pretty_printer (api->cls, "http",
+ cur->addr,cur->addrlen, GNUNET_NO,TEST_TIMEOUT,
+ &pretty_printer_cb, NULL);
+ addr_str = api->address_to_string (api->cls, cur->addr, cur->addrlen);
+ suggest_res = api->check_address (api->cls, cur->addr, cur->addrlen);
GNUNET_assert (GNUNET_OK == suggest_res);
GNUNET_assert (NULL != addr_str);
count_str_addr++;
-
- tmp = addr_head->next;
- GNUNET_free (addr_head->addr);
- GNUNET_free (addr_head);
- GNUNET_free ((char *) addr_str);
- addr_head=tmp;
+ GNUNET_free ( (char *) addr_str);
+ cur = cur->next;
}
+ GNUNET_assert (fail_pretty_printer_count > 0);
GNUNET_assert (fail_pretty_printer_count==fail_notify_address_count);
GNUNET_assert (fail_pretty_printer_count==count_str_addr);
fail_pretty_printer=GNUNET_NO;
fail_addr_to_str=GNUNET_NO;
- /* Suggesting addresses with wrong port*/
struct IPv4HttpAddress failing_addr;
- failing_addr.ipv4_addr = INADDR_LOOPBACK;
- failing_addr.u_port = 0;
- suggest_res = api->check_address (NULL,&failing_addr,sizeof (struct IPv4HttpAddress));
- GNUNET_assert (GNUNET_SYSERR == suggest_res);
/* Suggesting addresses with wrong size*/
- failing_addr.ipv4_addr = INADDR_LOOPBACK;
- failing_addr.u_port = 0;
- suggest_res = api->check_address (NULL,&failing_addr,sizeof (struct IPv6HttpAddress));
+ failing_addr.ipv4_addr = htonl(INADDR_LOOPBACK);
+ failing_addr.u_port = htons(0);
+ suggest_res = api->check_address (api->cls,&failing_addr,sizeof (struct IPv6HttpAddress));
GNUNET_assert (GNUNET_SYSERR == suggest_res);
/* Suggesting addresses with wrong address*/
- failing_addr.ipv4_addr = 0;
- failing_addr.u_port = 12389;
- suggest_res = api->check_address (NULL,&failing_addr,sizeof (struct IPv4HttpAddress));
+ failing_addr.ipv4_addr = htonl(0xffc00000);
+ failing_addr.u_port = htons(12389);
+ suggest_res = api->check_address (api->cls,&failing_addr,100);
GNUNET_assert (GNUNET_SYSERR == suggest_res);
/* test sending to client */
multi_handle = curl_multi_init();
- /*building messages */
- msg = GNUNET_malloc (sizeof (struct HTTP_Message));
- msg->size = 2048;
- msg->pos = 0;
- msg->buf = GNUNET_malloc (2048);
- testtransfer_no_ident.size=2048;
- testtransfer_no_ident.test_failed = GNUNET_YES;
+ /* Setting up buffers */
+ buffer_in.size = HTTP_BUFFER_SIZE;
+ buffer_in.pos = 0;
+ buffer_in.len = 0;
- /* Connecting to peer without identification */
- res = send_data (msg, &testtransfer_no_ident, "http://localhost:12389/");
+ buffer_out.size = HTTP_BUFFER_SIZE;
+ buffer_out.pos = 0;
+ buffer_out.len = 0;
- /* Add more tests */
+ /* Setting up connection tests */
+ /* Test: connecting without a peer identification */
+ test_no_ident.test_executed = GNUNET_NO;
+ test_no_ident.test_failed = GNUNET_YES;
+
+ /* Test: connecting with too short peer identification */
+ test_too_short_ident.test_executed = GNUNET_NO;
+ test_too_short_ident.test_failed = GNUNET_YES;
+
+ /* Test: connecting with too long peer identification */
+ test_too_long_ident.test_executed = GNUNET_NO;
+ test_too_long_ident.test_failed = GNUNET_YES;
+
+ /* Test: connecting with valid identification */
+ test_valid_ident.test_executed = GNUNET_NO;
+ test_valid_ident.test_failed = GNUNET_YES;
+
+ test_addr = (char *) api->address_to_string (api->cls,addr_head->addr,addr_head->addrlen);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Phase 0\n\n"));
+ run_connection_tests(0, NULL);
/* testing finished */
- return;
}
int
main (int argc, char *const *argv)
{
-
static struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
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
#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_http",
+ "test_gnunet_transport_plugin_http",
"testcase", options, &run, NULL)) ? GNUNET_NO : GNUNET_YES;
- GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http");
-
+ if (servicehome != NULL)
+ {
+ GNUNET_DISK_directory_remove (servicehome);
+ GNUNET_free (servicehome);
+ }
+ if (ret != GNUNET_OK)
+ return 1;
return fail;
}
-/* end of test_plugin_transport_http.c */
+/* end of test_gnunet_transport_plugin_http.c */
projects / oweals / gnunet.git / blobdiff