X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Ftests%2Ftest_silcnet.c;h=19d90a04a804bfcbd2065ae00547692f049c0c78;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hp=95c8e98695a5e6bb2a8c90e82e32c0fc8118f127;hpb=0f0340b9fbce9704cc7171f8f0104ce9103d2de6;p=silc.git

diff --git a/lib/silcutil/tests/test_silcnet.c b/lib/silcutil/tests/test_silcnet.c
index 95c8e986..19d90a04 100644
--- a/lib/silcutil/tests/test_silcnet.c
+++ b/lib/silcutil/tests/test_silcnet.c
@@ -1,6 +1,6 @@
 /* SILC Net API tests */
 
-#include "silcincludes.h"
+#include "silc.h"
 
 SilcSchedule schedule;
 
@@ -13,7 +13,7 @@ typedef struct {
   SilcNetStatus client_status;
   SilcStream server_stream;
   SilcNetStatus server_status;
-  bool success;
+  SilcBool success;
 } *Foo;
 
 SILC_FSM_STATE(test_st_start);
@@ -50,7 +50,7 @@ SILC_FSM_STATE(test_st_connect)
   SILC_LOG_DEBUG(("test_st_connect"));
   SILC_LOG_DEBUG(("Connecting to server"));
 
-  silc_fsm_next(fsm, test_st_connected);
+  silc_fsm_next(fsm, test_st_connected, NULL);
   SILC_FSM_CALL(silc_net_tcp_connect(NULL, "localhost", 5000,
 				     silc_fsm_get_schedule(fsm),
 				     test_connected, f));
@@ -88,18 +88,18 @@ SILC_FSM_STATE(test_st_start)
   if (!f->server) {
     /** Creating network listener failed */
     SILC_LOG_DEBUG(("Listener creation failed"));
-    silc_fsm_next(fsm, test_st_finish);
+    silc_fsm_next(fsm, test_st_finish, NULL);
     return SILC_FSM_CONTINUE;
   }
 
   /* Create thread to connect to the listener */
   silc_fsm_thread_init(&f->thread, fsm, f, NULL, NULL, FALSE);
-  silc_fsm_start(&f->thread, test_st_connect);
+  silc_fsm_start(&f->thread, test_st_connect, NULL);
 
   /** Start waiting connection */
   SILC_LOG_DEBUG(("Start waiting for incoming connections"));
   silc_fsm_sema_init(&f->sema, fsm, 0);
-  silc_fsm_next(fsm, test_st_second);
+  silc_fsm_next(fsm, test_st_second, NULL);
   return SILC_FSM_CONTINUE;
 }
 
@@ -116,7 +116,7 @@ SILC_FSM_STATE(test_st_second)
   if (f->client_status != SILC_NET_OK) {
     /** Accepting new connection failed */
     SILC_LOG_DEBUG(("Accepting failed %d", f->client_status));
-    silc_fsm_next(fsm, test_st_finish);
+    silc_fsm_next(fsm, test_st_finish, NULL);
     return SILC_FSM_CONTINUE;
   }
 
@@ -125,7 +125,7 @@ SILC_FSM_STATE(test_st_second)
 
   /** Finish */
   f->success = TRUE;
-  silc_fsm_next(fsm, test_st_finish);
+  silc_fsm_next(fsm, test_st_finish, NULL);
   return SILC_FSM_CONTINUE;
 }
 
@@ -161,7 +161,7 @@ static void destructor(SilcFSM fsm, void *fsm_context,
 
 int main(int argc, char **argv)
 {
-  bool success = FALSE;
+  SilcBool success = FALSE;
   SilcFSM fsm;
   Foo f;
 
@@ -182,7 +182,7 @@ int main(int argc, char **argv)
   fsm = silc_fsm_alloc(f, destructor, NULL, schedule);
   if (!fsm)
     goto err;
-  silc_fsm_start(fsm, test_st_start);
+  silc_fsm_start(fsm, test_st_start, NULL);
   f->fsm = fsm;
 
   SILC_LOG_DEBUG(("Running scheduler"));