/*
This file is part of GNUnet.
- (C) 2006, 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2006, 2009, 2015 GNUnet e.V.
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
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
*
* @author Matthias Wachs
*/
-
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_getopt_lib.h"
+#include "gnunet_util_lib.h"
#include "gnunet_hello_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_container_lib.h"
#include "gnunet_transport_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
-#define GNUNET_TRANSPORT_TESTING_ConnectRequest void *
+struct GNUNET_TRANSPORT_TESTING_ConnectRequest;
/**
* Callback when two peers are connected and both have called the connect callback
* to notify clients about a new peer
*/
-typedef void (*GNUNET_TRANSPORT_TESTING_start_cb) (struct PeerContext * p,
- void *cls);
+typedef void
+(*GNUNET_TRANSPORT_TESTING_start_cb) (struct PeerContext *p,
+ void *cls);
/**
* Callback when two peers are connected and both have called the connect callback
* to notify clients about a new peer
*/
-typedef void (*GNUNET_TRANSPORT_TESTING_connect_cb) (struct PeerContext * p1,
- struct PeerContext * p2,
- void *cls);
+typedef void
+(*GNUNET_TRANSPORT_TESTING_connect_cb) (struct PeerContext *p1,
+ struct PeerContext *p2,
+ void *cls);
/**
*/
struct GNUNET_TRANSPORT_Handle *th;
+ /**
+ * Peer's ATS handle.
+ */
+ struct GNUNET_ATS_ConnectivityHandle *ats;
+
/**
* Peer's transport get hello handle to retrieve peer's HELLO message
*/
*/
void *cb_cls;
- /**
- * Peer's service home directory
- */
- char *servicehome;
-
- /**
- * Hostkey file
- */
- char *hostkeyfile;
-
/**
* An unique number to identify the peer
*/
};
-struct ConnectingContext
+struct GNUNET_TRANSPORT_TESTING_ConnectRequest
{
- struct ConnectingContext *next;
- struct ConnectingContext *prev;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *next;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *prev;
struct PeerContext *p1;
struct PeerContext *p2;
- GNUNET_SCHEDULER_TaskIdentifier tct;
+ struct GNUNET_SCHEDULER_Task *tct;
+ struct GNUNET_ATS_ConnectivitySuggestHandle *ats_sh;
+ struct GNUNET_TRANSPORT_OfferHelloHandle *oh;
GNUNET_TRANSPORT_TESTING_connect_cb cb;
void *cb_cls;
- struct GNUNET_TRANSPORT_Handle *th_p1;
- struct GNUNET_TRANSPORT_Handle *th_p2;
int p1_c;
int p2_c;
};
struct GNUNET_TRANSPORT_TESTING_handle
{
- struct ConnectingContext *cc_head;
- struct ConnectingContext *cc_tail;
-
/**
* Testing library system handle
*/
struct GNUNET_TESTING_System *tl_system;
- char *hostkey_data;
- int hostkeys_total;
- int hostkeys_last;
+ /**
+ * head DLL of connect contexts
+ */
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc_head;
+
+ /**
+ * head DLL of connect contexts
+ */
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc_tail;
+ /**
+ * head DLL of peers
+ */
struct PeerContext *p_head;
+
+ /**
+ * tail DLL of peers
+ */
struct PeerContext *p_tail;
};
/**
-* Start a peer with the given configuration
-* @param tth the testing handle
-* @param cfgname configuration file
-* @param peer_id the peer_id
-* @param rec receive callback
-* @param nc connect callback
-* @param nd disconnect callback
-* @param start_cb start callback
-* @param cb_cls closure for callback
-* @return the peer context
-*/
+ * Start a peer with the given configuration
+ *
+ * @param tth the testing handle
+ * @param cfgname configuration file
+ * @param peer_id the peer_id
+ * @param rec receive callback
+ * @param nc connect callback
+ * @param nd disconnect callback
+ * @param start_cb start callback
+ * @param cb_cls closure for callback
+ * @return the peer context
+ */
struct PeerContext *
-GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_handle
- *tth, const char *cfgname, int peer_id,
+GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth,
+ const char *cfgname,
+ int peer_id,
GNUNET_TRANSPORT_ReceiveCallback rec,
GNUNET_TRANSPORT_NotifyConnect nc,
GNUNET_TRANSPORT_NotifyDisconnect nd,
/**
* shutdown the given peer
+ *
* @param tth the testing handle
* @param p the peer
*/
-
void
GNUNET_TRANSPORT_TESTING_stop_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth,
struct PeerContext *pc);
/**
-* Restart the given peer
-* @param tth testing handle
-* @param p the peer
-* @param cfgname the cfg file used to restart
-* @param restart_cb restart callback
-* @param cb_cls callback closure
-* @return GNUNET_OK in success otherwise GNUNET_SYSERR
-*/
+ * Restart the given peer
+ *
+ * @param p the peer
+ * @param cfgname the cfg file used to restart
+ * @param restart_cb restart callback
+ * @param cb_cls callback closure
+ * @return #GNUNET_OK in success otherwise #GNUNET_SYSERR
+ */
int
-GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle
- *tth, struct PeerContext *p,
+GNUNET_TRANSPORT_TESTING_restart_peer (struct PeerContext *p,
const char *cfgname,
- GNUNET_TRANSPORT_TESTING_start_cb
- restart_cb, void *cb_cls);
+ GNUNET_TRANSPORT_TESTING_start_cb restart_cb,
+ void *cb_cls);
+
/**
* Connect the given peers and call the callback when both peers report the
* @param cls callback cls
* @return a connect request handle
*/
-GNUNET_TRANSPORT_TESTING_ConnectRequest
+struct GNUNET_TRANSPORT_TESTING_ConnectRequest *
GNUNET_TRANSPORT_TESTING_connect_peers (struct GNUNET_TRANSPORT_TESTING_handle *tth,
struct PeerContext *p1,
struct PeerContext *p2,
GNUNET_TRANSPORT_TESTING_connect_cb cb,
void *cls);
+
/**
* Cancel the request to connect two peers
* Tou MUST cancel the request if you stop the peers before the peers connected succesfully
* @param tth testing
- * @param ccr a connect request handle
+ * @param cc a connect request handle
*/
void
-GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct
- GNUNET_TRANSPORT_TESTING_handle
- *tth,
- GNUNET_TRANSPORT_TESTING_ConnectRequest
- ccr);
+GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct GNUNET_TRANSPORT_TESTING_handle *tth,
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc);
/**
* Clean up the transport testing
* @return transport testing handle
*/
struct GNUNET_TRANSPORT_TESTING_handle *
-GNUNET_TRANSPORT_TESTING_init ();
+GNUNET_TRANSPORT_TESTING_init (void);
/*
* Some utility functions
* @param dest where to store result
*/
void
-GNUNET_TRANSPORT_TESTING_get_test_name (const char *file, char **dest);
+GNUNET_TRANSPORT_TESTING_get_test_name (const char *file,
+ char **dest);
/**
* This function takes the filename (e.g. argv[0), removes a "lt-"-prefix and
* @param count peer number
*/
void
-GNUNET_TRANSPORT_TESTING_get_config_name (const char *file, char **dest,
+GNUNET_TRANSPORT_TESTING_get_config_name (const char *file,
+ char **dest,
int count);
projects / oweals / gnunet.git / blobdiff