projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wlan receive implemented
[oweals/gnunet.git]
/
src
/
transport
/
test_plugin_transport_https.c
diff --git
a/src/transport/test_plugin_transport_https.c
b/src/transport/test_plugin_transport_https.c
index caf7271054ca76534034828428a038ceecb79587..beda4c749b42d790cdb0e57fde1565499f7e739e 100644
(file)
--- a/
src/transport/test_plugin_transport_https.c
+++ b/
src/transport/test_plugin_transport_https.c
@@
-18,8
+18,8
@@
Boston, MA 02111-1307, USA.
*/
/**
Boston, MA 02111-1307, USA.
*/
/**
- * @file transport/test_
plugin_transport_
https.c
- * @brief testcase for
plugin_transport_
https.c
+ * @file transport/test_
gnunet_transport_plugin.
https.c
+ * @brief testcase for
gnunet_transport_plugin.
https.c
* @author Matthias Wachs
*/
* @author Matthias Wachs
*/
@@
-37,12
+37,10
@@
#include "gnunet_service_lib.h"
#include "gnunet_crypto_lib.h"
#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>
#include "gnunet_statistics_service.h"
#include "transport.h"
#include <curl/curl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
#define VERBOSE GNUNET_NO
#define DEBUG_CURL GNUNET_NO
#define VERBOSE GNUNET_NO
#define DEBUG_CURL GNUNET_NO
@@
-164,6
+162,10
@@
struct HTTP_Transfer
*/
struct IPv4HttpAddress
{
*/
struct IPv4HttpAddress
{
+ struct IPv4HttpAddress * next;
+
+ struct IPv4HttpAddress * prev;
+
/**
* IPv4 address, in network byte order.
*/
/**
* IPv4 address, in network byte order.
*/
@@
-182,6
+184,10
@@
struct IPv4HttpAddress
*/
struct IPv6HttpAddress
{
*/
struct IPv6HttpAddress
{
+ struct IPv6HttpAddress * next;
+
+ struct IPv6HttpAddress * prev;
+
/**
* IPv6 address.
*/
/**
* IPv6 address.
*/
@@
-224,11
+230,6
@@
static long long unsigned int port;
*/
static char * test_addr;
*/
static char * test_addr;
-/**
- * Our scheduler.
- */
-struct GNUNET_SCHEDULER_Handle *sched;
-
/**
* Our statistics handle.
*/
/**
* Our statistics handle.
*/
@@
-443,28
+444,28
@@
shutdown_clean ()
if (ti_send != GNUNET_SCHEDULER_NO_TASK)
{
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)
{
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)
{
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);
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_log (GNUNET_ERROR_TYPE_DEBUG, "Unloading http
s
plugin\n");
+ GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_
gnunet_transport_plugin.https
", 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");
struct stat sbuf;
if (0 == stat (cert_file, &sbuf ))
struct stat sbuf;
if (0 == stat (cert_file, &sbuf ))
@@
-798,8
+799,7
@@
static size_t send_prepare( struct HTTP_Transfer * result)
gws = GNUNET_NETWORK_fdset_create ();
GNUNET_NETWORK_fdset_copy_native (grs, &rs, max + 1);
GNUNET_NETWORK_fdset_copy_native (gws, &ws, max + 1);
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,
GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 0),
grs,
@@
-927,7
+927,6
@@
static void
setup_plugin_environment ()
{
env.cfg = cfg;
setup_plugin_environment ()
{
env.cfg = cfg;
- env.sched = sched;
env.stats = stats;
env.my_identity = &my_identity;
env.cls = &env;
env.stats = stats;
env.my_identity = &my_identity;
env.cls = &env;
@@
-1143,17
+1142,14
@@
static void run_connection_tests( int phase , void * cls)
* Runs the test.
*
* @param cls closure
* Runs the test.
*
* @param cls closure
- * @param s scheduler to use
* @param c configuration to use
*/
static void
run (void *cls,
* @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;
char *const *args,
const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
{
char * libname;
- sched = s;
cfg = c;
char *keyfile;
unsigned long long tneigh;
cfg = c;
char *keyfile;
unsigned long long tneigh;
@@
-1189,7
+1185,7
@@
run (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
("Transport service is lacking key configuration settings. Exiting.\n"));
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
("Transport service is lacking key configuration settings. Exiting.\n"));
- GNUNET_SCHEDULER_shutdown (
s
);
+ GNUNET_SCHEDULER_shutdown ();
fail = 1;
return;
}
fail = 1;
return;
}
@@
-1255,7
+1251,7
@@
run (void *cls,
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Transport service could not access hostkey. Exiting.\n"));
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Transport service could not access hostkey. Exiting.\n"));
- GNUNET_SCHEDULER_shutdown (
s
);
+ GNUNET_SCHEDULER_shutdown ();
fail = 1;
return;
}
fail = 1;
return;
}
@@
-1282,7
+1278,7
@@
run (void *cls,
return;
}
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);
/* testing plugin functionality */
GNUNET_assert (0!=fail_notify_address_count);
@@
-1309,12
+1305,7
@@
run (void *cls,
fail_pretty_printer=GNUNET_NO;
fail_addr_to_str=GNUNET_NO;
fail_pretty_printer=GNUNET_NO;
fail_addr_to_str=GNUNET_NO;
- /* Suggesting addresses with wrong port*/
struct IPv4HttpAddress failing_addr;
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);
/* Suggesting addresses with wrong size*/
failing_addr.ipv4_addr = htonl(INADDR_LOOPBACK);
@@
-1385,7
+1376,7
@@
main (int argc, char *const *argv)
};
int ret;
char *const argv_prog[] = {
};
int ret;
char *const argv_prog[] = {
- "test_
plugin_transport_
https",
+ "test_
gnunet_transport_plugin.
https",
"-c",
"test_plugin_transport_data_http.conf",
"-L",
"-c",
"test_plugin_transport_data_http.conf",
"-L",
@@
-1396,7
+1387,7
@@
main (int argc, char *const *argv)
#endif
NULL
};
#endif
NULL
};
- GNUNET_log_setup ("test_
plugin_transport_
https",
+ GNUNET_log_setup ("test_
gnunet_transport_plugin.
https",
#if VERBOSE
"DEBUG",
#else
#if VERBOSE
"DEBUG",
#else
@@
-1407,12
+1398,12
@@
main (int argc, char *const *argv)
ret = (GNUNET_OK ==
GNUNET_PROGRAM_run (5,
argv_prog,
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;
"testcase", options, &run, NULL)) ? GNUNET_NO : GNUNET_YES;
- GNUNET_DISK_directory_remove ("/tmp/test_
plugin_transport_
https");
+ GNUNET_DISK_directory_remove ("/tmp/test_
gnunet_transport_plugin.
https");
return fail;
}
return fail;
}
-/* end of test_
plugin_transport_
http.c */
+/* end of test_
gnunet_transport_plugin.
http.c */