[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26876 - in gnunet/src: arm include testbed testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26876 - in gnunet/src: arm include testbed testing |
Date: |
Sun, 14 Apr 2013 22:45:25 +0200 |
Author: grothoff
Date: 2013-04-14 22:45:25 +0200 (Sun, 14 Apr 2013)
New Revision: 26876
Modified:
gnunet/src/arm/arm_api.c
gnunet/src/arm/arm_monitor_api.c
gnunet/src/arm/gnunet-arm.c
gnunet/src/arm/test_arm_api.c
gnunet/src/arm/test_exponential_backoff.c
gnunet/src/arm/test_gnunet_service_arm.c
gnunet/src/include/gnunet_arm_service.h
gnunet/src/include/gnunet_peerinfo_service.h
gnunet/src/testbed/gnunet-service-testbed_peers.c
gnunet/src/testing/testing.c
Log:
-remove unnecessary arguments from ARM callbacks
Modified: gnunet/src/arm/arm_api.c
===================================================================
--- gnunet/src/arm/arm_api.c 2013-04-14 20:45:09 UTC (rev 26875)
+++ gnunet/src/arm/arm_api.c 2013-04-14 20:45:25 UTC (rev 26876)
@@ -230,7 +230,7 @@
*/
h->retry_backoff = GNUNET_TIME_STD_BACKOFF (h->retry_backoff);
if (NULL != h->conn_status)
- h->conn_status (h->conn_status_cls, h, GNUNET_NO);
+ h->conn_status (h->conn_status_cls, GNUNET_NO);
}
/**
@@ -311,7 +311,7 @@
end:
if ((GNUNET_YES == notify_connection) && (NULL != h->conn_status))
- h->conn_status (h->conn_status_cls, h, GNUNET_YES);
+ h->conn_status (h->conn_status_cls, GNUNET_YES);
return msize;
}
@@ -373,7 +373,7 @@
LOG (GNUNET_ERROR_TYPE_DEBUG,
"arm_api, GNUNET_CLIENT_connect returned NULL\n");
if (NULL != h->conn_status)
- h->conn_status (h->conn_status_cls, h, GNUNET_SYSERR);
+ h->conn_status (h->conn_status_cls, GNUNET_SYSERR);
return GNUNET_SYSERR;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -443,7 +443,7 @@
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != cm->timeout_task_id);
GNUNET_SCHEDULER_cancel (cm->timeout_task_id);
if (NULL != cm->result_cont)
- cm->result_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_DISCONNECTED,
+ cm->result_cont (cm->cont_cls, GNUNET_ARM_REQUEST_DISCONNECTED,
NULL, 0);
/* FIXME: What about list callback? */
GNUNET_free_non_null (cm->msg);
@@ -492,9 +492,9 @@
cm->h->control_sent_tail, cm);
}
if (NULL != cm->result_cont)
- cm->result_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_TIMEOUT, NULL, 0);
+ cm->result_cont (cm->cont_cls, GNUNET_ARM_REQUEST_TIMEOUT, NULL, 0);
else if (NULL != cm->list_cont)
- cm->list_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_TIMEOUT, 0, NULL);
+ cm->list_cont (cm->cont_cls, GNUNET_ARM_REQUEST_TIMEOUT, 0, NULL);
GNUNET_free_non_null (cm->msg);
GNUNET_free (cm);
}
@@ -535,7 +535,9 @@
"gnunet-service-arm");
/* arm is running! */
if (cm->result_cont)
- cm->result_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_SENT_OK, "arm",
GNUNET_ARM_RESULT_IS_STARTED_ALREADY);
+ cm->result_cont (cm->cont_cls,
+ GNUNET_ARM_REQUEST_SENT_OK, "arm",
+ GNUNET_ARM_RESULT_IS_STARTED_ALREADY);
}
if (GNUNET_NO == test_is_active)
{
@@ -566,7 +568,9 @@
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, "arm", "BINARY");
if (cm->result_cont)
- cm->result_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_SENT_OK, "arm",
GNUNET_ARM_RESULT_IS_NOT_KNOWN);
+ cm->result_cont (cm->cont_cls,
+ GNUNET_ARM_REQUEST_SENT_OK, "arm",
+ GNUNET_ARM_RESULT_IS_NOT_KNOWN);
GNUNET_free (cm);
GNUNET_free (loprefix);
GNUNET_free (lopostfix);
@@ -615,13 +619,13 @@
if (NULL == proc)
{
if (cm->result_cont)
- cm->result_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_SENT_OK, "arm",
+ cm->result_cont (cm->cont_cls, GNUNET_ARM_REQUEST_SENT_OK, "arm",
GNUNET_ARM_RESULT_START_FAILED);
GNUNET_free (cm);
return;
}
if (cm->result_cont)
- cm->result_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_SENT_OK, "arm",
+ cm->result_cont (cm->cont_cls, GNUNET_ARM_REQUEST_SENT_OK, "arm",
GNUNET_ARM_RESULT_STARTING);
GNUNET_OS_process_destroy (proc);
h = cm->h;
@@ -655,7 +659,7 @@
{
GNUNET_break (0);
if (cb != NULL)
- cb (cb_cls, h, GNUNET_ARM_REQUEST_TOO_LONG, NULL, 0);
+ cb (cb_cls, GNUNET_ARM_REQUEST_TOO_LONG, NULL, 0);
return;
}
LOG (GNUNET_ERROR_TYPE_DEBUG, "Requesting %s of service `%s'.\n",
@@ -718,7 +722,7 @@
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "ARM is already running\n");
if (NULL != cont)
- cont (cont_cls, h, GNUNET_ARM_REQUEST_SENT_OK, "arm",
GNUNET_ARM_RESULT_IS_STARTED_ALREADY);
+ cont (cont_cls, GNUNET_ARM_REQUEST_SENT_OK, "arm",
GNUNET_ARM_RESULT_IS_STARTED_ALREADY);
}
else if (GNUNET_NO == h->service_test_is_active)
{
@@ -760,7 +764,7 @@
*/
LOG (GNUNET_ERROR_TYPE_DEBUG, "Service test is already in progress,
we're busy\n");
if (NULL != cont)
- cont (cont_cls, h, GNUNET_ARM_REQUEST_BUSY, NULL, 0);
+ cont (cont_cls, GNUNET_ARM_REQUEST_BUSY, NULL, 0);
}
return;
}
@@ -966,12 +970,12 @@
(const char *) &cm->msg[1], ntohs (msg->type));
result = (enum GNUNET_ARM_Result) ntohl (res->result);
if (NULL != cm->result_cont)
- cm->result_cont (cm->cont_cls, h, GNUNET_ARM_REQUEST_SENT_OK,
+ cm->result_cont (cm->cont_cls, GNUNET_ARM_REQUEST_SENT_OK,
(const char *) &cm->msg[1], result);
break;
case GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT:
if (NULL != cm->list_cont)
- cm->list_cont (cm->cont_cls, h, GNUNET_ARM_REQUEST_SENT_OK, rcount,
+ cm->list_cont (cm->cont_cls, GNUNET_ARM_REQUEST_SENT_OK, rcount,
list);
GNUNET_free (list);
break;
Modified: gnunet/src/arm/arm_monitor_api.c
===================================================================
--- gnunet/src/arm/arm_monitor_api.c 2013-04-14 20:45:09 UTC (rev 26875)
+++ gnunet/src/arm/arm_monitor_api.c 2013-04-14 20:45:25 UTC (rev 26876)
@@ -221,7 +221,7 @@
LOG (GNUNET_ERROR_TYPE_DEBUG,
"arm_api, GNUNET_CLIENT_connect returned NULL\n");
if (NULL != h->service_status)
- h->service_status (h->cls, h, NULL, GNUNET_ARM_SERVICE_STOPPED);
+ h->service_status (h->cls, NULL, GNUNET_ARM_SERVICE_STOPPED);
return GNUNET_SYSERR;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -347,7 +347,7 @@
GNUNET_CLIENT_receive (h->monitor, &monitor_notify_handler, h,
GNUNET_TIME_UNIT_FOREVER_REL);
if (NULL != h->service_status)
- h->service_status (h->cls, h, (const char *) &res[1], status);
+ h->service_status (h->cls, (const char *) &res[1], status);
break;
default:
reconnect_arm_monitor_later (h);
Modified: gnunet/src/arm/gnunet-arm.c
===================================================================
--- gnunet/src/arm/gnunet-arm.c 2013-04-14 20:45:09 UTC (rev 26875)
+++ gnunet/src/arm/gnunet-arm.c 2013-04-14 20:45:25 UTC (rev 26876)
@@ -258,12 +258,11 @@
* Function called whenever we connect to or disconnect from ARM.
*
* @param cls closure
- * @param arm handle to the ARM connection
* @param connected GNUNET_YES if connected, GNUNET_NO if disconnected,
* GNUNET_SYSERR on error.
*/
static void
-conn_status (void *cls, struct GNUNET_ARM_Handle *arm,
+conn_status (void *cls,
int connected)
{
if (GNUNET_SYSERR == connected)
@@ -281,7 +280,7 @@
static void
-term_callback (void *cls, struct GNUNET_ARM_Handle *arm,
+term_callback (void *cls,
enum GNUNET_ARM_RequestStatus rs, const char *service,
enum GNUNET_ARM_Result result)
{
@@ -311,7 +310,7 @@
}
static void
-end_callback (void *cls, struct GNUNET_ARM_Handle *arm,
+end_callback (void *cls,
enum GNUNET_ARM_RequestStatus rs, const char *service,
enum GNUNET_ARM_Result result)
{
@@ -348,7 +347,7 @@
}
static void
-start_callback (void *cls, struct GNUNET_ARM_Handle *arm,
+start_callback (void *cls,
enum GNUNET_ARM_RequestStatus rs, const char *service,
enum GNUNET_ARM_Result result)
{
@@ -378,7 +377,7 @@
static void
-init_callback (void *cls, struct GNUNET_ARM_Handle *arm,
+init_callback (void *cls,
enum GNUNET_ARM_RequestStatus rs, const char *service,
enum GNUNET_ARM_Result result)
{
@@ -409,9 +408,9 @@
static void
-list_callback (void *cls, struct GNUNET_ARM_Handle *arm,
- enum GNUNET_ARM_RequestStatus rs, unsigned int count,
- const char *const*list)
+list_callback (void *cls,
+ enum GNUNET_ARM_RequestStatus rs, unsigned int count,
+ const char *const*list)
{
unsigned int i;
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
@@ -517,13 +516,12 @@
* Function called when a service starts or stops.
*
* @param cls closure
- * @param arm handle to the ARM connection
* @param service service name
* @param status status of the service
*/
static void
-srv_status (void *cls, struct GNUNET_ARM_MonitorHandle *arm,
- const char *service, enum GNUNET_ARM_ServiceStatus status)
+srv_status (void *cls,
+ const char *service, enum GNUNET_ARM_ServiceStatus status)
{
const char *msg;
switch (status)
Modified: gnunet/src/arm/test_arm_api.c
===================================================================
--- gnunet/src/arm/test_arm_api.c 2013-04-14 20:45:09 UTC (rev 26875)
+++ gnunet/src/arm/test_arm_api.c 2013-04-14 20:45:25 UTC (rev 26876)
@@ -47,7 +47,10 @@
static int phase = 0;
static void
-arm_stop_cb (void *cls, struct GNUNET_ARM_Handle *h, enum
GNUNET_ARM_RequestStatus status, const char *servicename, enum
GNUNET_ARM_Result result)
+arm_stop_cb (void *cls,
+ enum GNUNET_ARM_RequestStatus status,
+ const char *servicename,
+ enum GNUNET_ARM_Result result)
{
/* (6), a stop request should be sent to ARM successfully */
/* ARM should report that it is stopping */
@@ -58,8 +61,11 @@
LOG ("Sent 'STOP' request for arm to ARM %s\n", (status ==
GNUNET_ARM_REQUEST_SENT_OK) ? "successfully" : "unsuccessfully");
}
+
static void
-resolver_stop_cb (void *cls, struct GNUNET_ARM_Handle *h, enum
GNUNET_ARM_RequestStatus status, const char *servicename, enum
GNUNET_ARM_Result result)
+resolver_stop_cb (void *cls,
+ enum GNUNET_ARM_RequestStatus status,
+ const char *servicename, enum GNUNET_ARM_Result result)
{
/* (5), a stop request should be sent to ARM successfully.
* ARM should report that resolver is stopped.
@@ -77,6 +83,7 @@
#endif
}
+
static void
dns_notify (void *cls, const struct sockaddr *addr, socklen_t addrlen)
{
@@ -99,8 +106,12 @@
ok = 0;
}
+
static void
-resolver_start_cb (void *cls, struct GNUNET_ARM_Handle *h, enum
GNUNET_ARM_RequestStatus status, const char *servicename, enum
GNUNET_ARM_Result result)
+resolver_start_cb (void *cls,
+ enum GNUNET_ARM_RequestStatus status,
+ const char *servicename,
+ enum GNUNET_ARM_Result result)
{
/* (2), the start request for resolver should be sent successfully
* ARM should report that resolver service is starting.
@@ -113,6 +124,7 @@
GNUNET_RESOLVER_ip_get ("localhost", AF_INET, TIMEOUT, &dns_notify, NULL);
}
+
static void
trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
@@ -122,7 +134,6 @@
static void
arm_conn (void *cls,
- struct GNUNET_ARM_Handle *arm,
int connected)
{
if (GNUNET_SYSERR == connected)
@@ -157,7 +168,6 @@
static void
arm_start_cb (void *cls,
- struct GNUNET_ARM_Handle *h,
enum GNUNET_ARM_RequestStatus status,
const char *servicename,
enum GNUNET_ARM_Result result)
Modified: gnunet/src/arm/test_exponential_backoff.c
===================================================================
--- gnunet/src/arm/test_exponential_backoff.c 2013-04-14 20:45:09 UTC (rev
26875)
+++ gnunet/src/arm/test_exponential_backoff.c 2013-04-14 20:45:25 UTC (rev
26876)
@@ -284,7 +284,7 @@
static void
-arm_stop_cb (void *cls, struct GNUNET_ARM_Handle *h, enum
GNUNET_ARM_RequestStatus status, const char *servicename, enum
GNUNET_ARM_Result result)
+arm_stop_cb (void *cls, enum GNUNET_ARM_RequestStatus status, const char
*servicename, enum GNUNET_ARM_Result result)
{
GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
GNUNET_break (result == GNUNET_ARM_RESULT_STOPPING);
@@ -294,7 +294,7 @@
static void
-srv_status (void *cls, struct GNUNET_ARM_MonitorHandle *mon, const char
*service, enum GNUNET_ARM_ServiceStatus status)
+srv_status (void *cls, const char *service, enum GNUNET_ARM_ServiceStatus
status)
{
LOG ("Service %s is %u, phase %u\n", service, status, phase);
if (status == GNUNET_ARM_SERVICE_MONITORING_STARTED)
@@ -334,7 +334,7 @@
static void
-arm_start_cb (void *cls, struct GNUNET_ARM_Handle *h, enum
GNUNET_ARM_RequestStatus status, const char *servicename, enum
GNUNET_ARM_Result result)
+arm_start_cb (void *cls, enum GNUNET_ARM_RequestStatus status, const char
*servicename, enum GNUNET_ARM_Result result)
{
GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
GNUNET_break (result == GNUNET_ARM_RESULT_STARTING);
@@ -366,7 +366,7 @@
arm = GNUNET_ARM_connect (cfg, NULL, NULL);
if (NULL != arm)
{
- mon = GNUNET_ARM_monitor (cfg, srv_status, NULL);
+ mon = GNUNET_ARM_monitor (cfg, &srv_status, NULL);
if (NULL != mon)
{
#if START_ARM
Modified: gnunet/src/arm/test_gnunet_service_arm.c
===================================================================
--- gnunet/src/arm/test_gnunet_service_arm.c 2013-04-14 20:45:09 UTC (rev
26875)
+++ gnunet/src/arm/test_gnunet_service_arm.c 2013-04-14 20:45:25 UTC (rev
26876)
@@ -56,7 +56,6 @@
static void
arm_stop_cb (void *cls,
- struct GNUNET_ARM_Handle *h,
enum GNUNET_ARM_RequestStatus status,
const char *servicename,
enum GNUNET_ARM_Result result)
@@ -70,7 +69,7 @@
static void
-service_list (void *cls, struct GNUNET_ARM_Handle *arm,
+service_list (void *cls,
enum GNUNET_ARM_RequestStatus rs,
unsigned int count, const char *const*list)
{
@@ -109,7 +108,6 @@
static void
arm_start_cb (void *cls,
- struct GNUNET_ARM_Handle *h,
enum GNUNET_ARM_RequestStatus status,
const char *servicename,
enum GNUNET_ARM_Result result)
Modified: gnunet/src/include/gnunet_arm_service.h
===================================================================
--- gnunet/src/include/gnunet_arm_service.h 2013-04-14 20:45:09 UTC (rev
26875)
+++ gnunet/src/include/gnunet_arm_service.h 2013-04-14 20:45:25 UTC (rev
26876)
@@ -181,11 +181,8 @@
* @param cls closure
* @param connected GNUNET_YES if connected, GNUNET_NO if disconnected,
* GNUNET_SYSERR if there was an error.
- * @param error GNUNET_YES if we encountered a permanent error, and there
- * will be no re-connection.
*/
typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls,
- struct GNUNET_ARM_Handle
*arm,
int connected);
@@ -196,12 +193,14 @@
* 'rs' will indicate that, and 'service' and 'result' will be undefined.
*
* @param cls closure
- * @param arm handle to the arm connection
* @param rs status of the request
* @param service service name
* @param result result of the operation
*/
-typedef void (*GNUNET_ARM_ResultCallback) (void *cls, struct GNUNET_ARM_Handle
*arm, enum GNUNET_ARM_RequestStatus rs, const char *service, enum
GNUNET_ARM_Result result);
+typedef void (*GNUNET_ARM_ResultCallback) (void *cls,
+ enum GNUNET_ARM_RequestStatus rs,
+ const char *service,
+ enum GNUNET_ARM_Result result);
/**
@@ -211,12 +210,14 @@
* 'rs' will indicate that, and 'count' and 'list' will be undefined.
*
* @param cls closure
- * @param arm handle to the arm connection
* @param rs status of the request
* @param count number of strings in the list
* @param list list of running services
*/
-typedef void (*GNUNET_ARM_ServiceListCallback) (void *cls, struct
GNUNET_ARM_Handle *arm, enum GNUNET_ARM_RequestStatus rs, unsigned int count,
const char *const*list);
+typedef void (*GNUNET_ARM_ServiceListCallback) (void *cls,
+ enum GNUNET_ARM_RequestStatus
rs,
+ unsigned int count,
+ const char *const*list);
/**
@@ -232,7 +233,8 @@
*/
struct GNUNET_ARM_Handle *
GNUNET_ARM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
- GNUNET_ARM_ConnectionStatusCallback conn_status, void *cls);
+ GNUNET_ARM_ConnectionStatusCallback conn_status,
+ void *cls);
/**
@@ -254,8 +256,8 @@
*/
void
GNUNET_ARM_request_service_list (struct GNUNET_ARM_Handle *h,
- struct GNUNET_TIME_Relative timeout,
- GNUNET_ARM_ServiceListCallback cont, void *cont_cls);
+ struct GNUNET_TIME_Relative timeout,
+ GNUNET_ARM_ServiceListCallback cont, void
*cont_cls);
/**
@@ -274,8 +276,9 @@
*/
void
GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h,
- const char *service_name, struct GNUNET_TIME_Relative timeout,
- GNUNET_ARM_ResultCallback cont, void *cont_cls);
+ const char *service_name,
+ struct GNUNET_TIME_Relative timeout,
+ GNUNET_ARM_ResultCallback cont, void
*cont_cls);
/**
@@ -309,7 +312,9 @@
* @param service service name
* @param status status of the service
*/
-typedef void (*GNUNET_ARM_ServiceStatusCallback) (void *cls, struct
GNUNET_ARM_MonitorHandle *arm, const char *service, enum
GNUNET_ARM_ServiceStatus status);
+typedef void (*GNUNET_ARM_ServiceStatusCallback) (void *cls,
+ const char *service,
+ enum GNUNET_ARM_ServiceStatus
status);
/**
@@ -325,7 +330,8 @@
*/
struct GNUNET_ARM_MonitorHandle *
GNUNET_ARM_monitor (const struct GNUNET_CONFIGURATION_Handle *cfg,
- GNUNET_ARM_ServiceStatusCallback cont, void *cont_cls);
+ GNUNET_ARM_ServiceStatusCallback cont,
+ void *cont_cls);
/**
Modified: gnunet/src/include/gnunet_peerinfo_service.h
===================================================================
--- gnunet/src/include/gnunet_peerinfo_service.h 2013-04-14 20:45:09 UTC
(rev 26875)
+++ gnunet/src/include/gnunet_peerinfo_service.h 2013-04-14 20:45:25 UTC
(rev 26876)
@@ -163,7 +163,7 @@
*/
struct GNUNET_PEERINFO_IteratorContext *
GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,
-
int include_friend_only,
+ int include_friend_only,
const struct GNUNET_PeerIdentity *peer,
struct GNUNET_TIME_Relative timeout,
GNUNET_PEERINFO_Processor callback, void
*callback_cls);
@@ -203,7 +203,7 @@
*/
struct GNUNET_PEERINFO_NotifyContext *
GNUNET_PEERINFO_notify (const struct GNUNET_CONFIGURATION_Handle *cfg,
-
int include_friend_only,
+ int include_friend_only,
GNUNET_PEERINFO_Processor callback, void
*callback_cls);
Modified: gnunet/src/testbed/gnunet-service-testbed_peers.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_peers.c 2013-04-14 20:45:09 UTC
(rev 26875)
+++ gnunet/src/testbed/gnunet-service-testbed_peers.c 2013-04-14 20:45:25 UTC
(rev 26876)
@@ -774,7 +774,7 @@
* @param result result of the operation
*/
static void
-service_manage_result_cb (void *cls, struct GNUNET_ARM_Handle *arm,
+service_manage_result_cb (void *cls,
enum GNUNET_ARM_RequestStatus rs,
const char *service, enum GNUNET_ARM_Result result)
{
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2013-04-14 20:45:09 UTC (rev 26875)
+++ gnunet/src/testing/testing.c 2013-04-14 20:45:25 UTC (rev 26876)
@@ -1207,12 +1207,11 @@
* Function called whenever we connect to or disconnect from ARM.
*
* @param cls closure
- * @param arm handle to the ARM connection
* @param connected GNUNET_YES if connected, GNUNET_NO if disconnected,
* GNUNET_SYSERR on error.
*/
static void
-disconn_status (void *cls, struct GNUNET_ARM_Handle *arm,
+disconn_status (void *cls,
int connected)
{
struct GNUNET_TESTING_Peer *peer = cls;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26876 - in gnunet/src: arm include testbed testing,
gnunet <=