- correct port

[oweals/gnunet.git] / src / transport / transport-testing.h

diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h
index 2aaff26b0a1ef76e4a23d0ecd841c44a084ae0ac..20e802dfa78e2c08dbc50e11d2d87223831e6bc3 100644 (file)
--- a/src/transport/transport-testing.h
+++ b/src/transport/transport-testing.h
@@ -34,6 +34,7 @@
 #include "gnunet_container_lib.h"
 #include "gnunet_transport_service.h"
 
+
 #define GNUNET_TRANSPORT_TESTING_ConnectRequest void *
 
 
@@ -58,17 +59,18 @@ typedef void (*GNUNET_TRANSPORT_TESTING_connect_cb) (struct PeerContext * p1,
                                                      void *cls);
 
 
-struct TransportTestingHandle;
+
+struct GNUNET_TRANSPORT_TESTING_handle;
 
 /**
  * Context for a single peer
  */
 struct PeerContext
 {
-  struct PeerContext * next;
-  struct PeerContext * prev;
+  struct PeerContext *next;
+  struct PeerContext *prev;
 
-  struct TransportTestingHandle * tth;
+  struct GNUNET_TRANSPORT_TESTING_handle *tth;
 
   struct GNUNET_CONFIGURATION_Handle *cfg;
 
@@ -94,14 +96,16 @@ struct PeerContext
 
   char *servicehome;
 
+  char *hostkeyfile;
+
   unsigned int no;
 };
 
 
 struct ConnectingContext
 {
-  struct ConnectingContext * next;
-  struct ConnectingContext * prev;
+  struct ConnectingContext *next;
+  struct ConnectingContext *prev;
   struct PeerContext *p1;
   struct PeerContext *p2;
   GNUNET_SCHEDULER_TaskIdentifier tct;
@@ -113,30 +117,35 @@ struct ConnectingContext
   int p2_c;
 };
 
-struct TransportTestingHandle
+struct GNUNET_TRANSPORT_TESTING_handle
 {
-  struct ConnectingContext * cc_head;
-  struct ConnectingContext * cc_tail;
+  struct ConnectingContext *cc_head;
+  struct ConnectingContext *cc_tail;
 
-  struct PeerContext * p_head;
-  struct PeerContext * p_tail;
-};
+  char *hostkey_data;
+  int hostkeys_total;
+  int hostkeys_last;
 
+  struct PeerContext *p_head;
+  struct PeerContext *p_tail;
+};
 
 
 /**
- * Start a peer with the given configuration
- * @param rec receive callback
- * @param nc connect callback
- * @param nd disconnect callback
- * @param cb_cls closure for callback
- *   if NULL passed the PeerContext * will be used!
- * @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 TransportTestingHandle * 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,
@@ -146,26 +155,45 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct TransportTestingHandle * tth,
 
 /**
  * shutdown the given peer
+ * @param tth the testing handle
  * @param p the peer
  */
 
 void
-GNUNET_TRANSPORT_TESTING_stop_peer (struct TransportTestingHandle * tth,
+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
+*/
+int
+GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle
+                                       *tth, struct PeerContext *p,
+                                       const char *cfgname,
+                                       GNUNET_TRANSPORT_TESTING_start_cb
+                                       restart_cb, void *cb_cls);
+
 /**
  * Connect the given peers and call the callback when both peers report the
  * inbound connection. Remarks: start_peer's notify_connect callback can be called
  * before.
+ *
+ * @param tth transport testing handle
  * @param p1 peer 1
  * @param p2 peer 2
- * @param cb the callback to call
- * @param cb_cls callback cls
+ * @param cb the callback to call when both peers notified that they are connected
+ * @param cls callback cls
  * @return a connect request handle
  */
 GNUNET_TRANSPORT_TESTING_ConnectRequest
-GNUNET_TRANSPORT_TESTING_connect_peers (struct TransportTestingHandle * tth,
+GNUNET_TRANSPORT_TESTING_connect_peers (struct GNUNET_TRANSPORT_TESTING_handle *tth,
                                         struct PeerContext *p1,
                                         struct PeerContext *p2,
                                         GNUNET_TRANSPORT_TESTING_connect_cb cb,
@@ -174,17 +202,28 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct TransportTestingHandle * tth,
 /**
  * Cancel the request to connect two peers
  * Tou MUST cancel the request if you stop the peers before the peers connected succesfully
- * @param cc a connect request handle
+ * @param tth testing
+ * @param ccr a connect request handle
  */
 void
-GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct TransportTestingHandle *,
-                                               void *cc);
-
+GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct
+                                               GNUNET_TRANSPORT_TESTING_handle
+                                               *tth,
+                                               GNUNET_TRANSPORT_TESTING_ConnectRequest
+                                               ccr);
 
+/**
+ * Clean up the transport testing
+ * @param tth transport testing handle
+ */
 void
-GNUNET_TRANSPORT_TESTING_done (struct TransportTestingHandle * tth);
+GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_handle *tth);
 
-struct TransportTestingHandle *
+/**
+ * Initialize the transport testing
+ * @return transport testing handle
+ */
+struct GNUNET_TRANSPORT_TESTING_handle *
 GNUNET_TRANSPORT_TESTING_init ();
 
 /*
@@ -202,12 +241,13 @@ 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
  * if existing ".exe"-prefix and adds the peer-number
+ *
  * @param file filename of the test, e.g. argv[0]
- * @param cfgname where to write the result
+ * @param dest where to write the filename
  * @param count peer number
  */
 void
-GNUNET_TRANSPORT_TESTING_get_config_name (const char *file, char **cfgname,
+GNUNET_TRANSPORT_TESTING_get_config_name (const char *file, char **dest,
                                           int count);