Merge commit 'origin/silc.1.1.branch'

[silc.git] / lib / silcclient / client_connect.h

diff --git a/lib/silcclient/client_connect.h b/lib/silcclient/client_connect.h
index c375ae06498cd2d8a358f03293eedc83c6bfd03b..9c825f39bea88a5256d634a3bf2d3cb09fb45419 100644 (file)
--- a/lib/silcclient/client_connect.h
+++ b/lib/silcclient/client_connect.h
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2006 Pekka Riikonen
+  Copyright (C) 2006 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,13 +20,19 @@
 #ifndef CLIENT_CONNECT_H
 #define CLIENT_CONNECT_H
 
-/* States */
+SILC_FSM_STATE(silc_client_connect_auth_request);
 SILC_FSM_STATE(silc_client_st_connect);
+SILC_FSM_STATE(silc_client_st_connect_set_stream);
 SILC_FSM_STATE(silc_client_st_connect_key_exchange);
 SILC_FSM_STATE(silc_client_st_connect_setup_udp);
-SILC_FSM_STATE(silc_client_st_connect_auth);
+SILC_FSM_STATE(silc_client_st_connect_auth_resolve);
+SILC_FSM_STATE(silc_client_st_connect_auth_data);
 SILC_FSM_STATE(silc_client_st_connect_auth_start);
 SILC_FSM_STATE(silc_client_st_connected);
 SILC_FSM_STATE(silc_client_st_connect_error);
+SILC_FSM_STATE(silc_client_st_rekey);
+
+SILC_TASK_CALLBACK(silc_client_connect_timeout);
+SILC_TASK_CALLBACK(silc_client_rekey_timer);
 
 #endif /* CLIENT_CONNECT_H */