X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fclient.c;h=e4191d37ee35d1cd48d508ce36f4091f9c5b5492;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hp=d4546038895c4c10d7c0c85f9b1d234e72f609e5;hpb=c257b555225193e54d85daf541d29578b3c93882;p=silc.git

diff --git a/lib/silcclient/client.c b/lib/silcclient/client.c
index d4546038..e4191d37 100644
--- a/lib/silcclient/client.c
+++ b/lib/silcclient/client.c
@@ -18,7 +18,7 @@
 */
 /* $Id$ */
 
-#include "silcincludes.h"
+#include "silc.h"
 #include "silcclient.h"
 #include "client_internal.h"
 
@@ -28,12 +28,12 @@ SILC_TASK_CALLBACK(silc_client_connect_to_server_second);
 SILC_TASK_CALLBACK(silc_client_connect_to_server_final);
 SILC_TASK_CALLBACK(silc_client_rekey_final);
 
-static bool silc_client_packet_parse(SilcPacketParserContext *parser_context,
+static SilcBool silc_client_packet_parse(SilcPacketParserContext *parser_context,
 				     void *context);
 static void silc_client_packet_parse_type(SilcClient client,
 					  SilcSocketConnection sock,
 					  SilcPacketContext *packet);
-void silc_client_resolve_auth_method(bool success,
+void silc_client_resolve_auth_method(SilcBool success,
 				     SilcProtocolAuthMeth auth_meth,
 				     const unsigned char *auth_data,
 				     SilcUInt32 auth_data_len, void *context);
@@ -111,7 +111,7 @@ void silc_client_free(SilcClient client)
    the client ready to be run. One must call silc_client_run to run the
    client. Returns FALSE if error occured, TRUE otherwise. */
 
-bool silc_client_init(SilcClient client)
+SilcBool silc_client_init(SilcClient client)
 {
   SILC_LOG_DEBUG(("Initializing client"));
 
@@ -254,11 +254,11 @@ silc_client_add_connection(SilcClient client,
   conn->remote_port = port;
   conn->context = context;
   conn->internal->client_cache =
-    silc_idcache_alloc(0, SILC_ID_CLIENT, NULL, FALSE, TRUE);
+    silc_idcache_alloc(0, SILC_ID_CLIENT, NULL, NULL, FALSE, TRUE);
   conn->internal->channel_cache = silc_idcache_alloc(0, SILC_ID_CHANNEL, NULL,
-						     FALSE, TRUE);
+						     NULL, FALSE, TRUE);
   conn->internal->server_cache = silc_idcache_alloc(0, SILC_ID_SERVER, NULL,
-						    FALSE, TRUE);
+						    NULL, FALSE, TRUE);
   conn->internal->pending_commands = silc_dlist_init();
   conn->internal->ftp_sessions = silc_dlist_init();
 
@@ -298,7 +298,7 @@ void silc_client_del_connection(SilcClient client, SilcClientConnection conn)
       SilcIDCacheList list;
       SilcIDCacheEntry entry;
       SilcClientCommandPending *r;
-      bool ret;
+      SilcBool ret;
 
       if (silc_idcache_get_all(conn->internal->client_cache, &list)) {
 	ret = silc_idcache_list_first(list, &entry);
@@ -748,7 +748,7 @@ SILC_TASK_CALLBACK(silc_client_connect_to_server_second)
    client operation to resolve the authentication method. We will continue
    the executiong of the protocol in this function. */
 
-void silc_client_resolve_auth_method(bool success,
+void silc_client_resolve_auth_method(SilcBool success,
 				     SilcProtocolAuthMeth auth_meth,
 				     const unsigned char *auth_data,
 				     SilcUInt32 auth_data_len, void *context)
@@ -928,7 +928,7 @@ SILC_TASK_CALLBACK(silc_client_connect_to_server_final)
 
 int silc_client_packet_send_real(SilcClient client,
 				 SilcSocketConnection sock,
-				 bool force_send)
+				 SilcBool force_send)
 {
   int ret;
 
@@ -1049,7 +1049,7 @@ SILC_TASK_CALLBACK_GLOBAL(silc_client_packet_process)
 /* Parser callback called by silc_packet_receive_process. Thie merely
    registers timeout that will handle the actual parsing when appropriate. */
 
-static bool silc_client_packet_parse(SilcPacketParserContext *parser_context,
+static SilcBool silc_client_packet_parse(SilcPacketParserContext *parser_context,
 				     void *context)
 {
   SilcClient client = (SilcClient)context;
@@ -1412,7 +1412,7 @@ void silc_client_packet_send(SilcClient client,
 			     SilcHmac hmac,
 			     unsigned char *data,
 			     SilcUInt32 data_len,
-			     bool force_send)
+			     SilcBool force_send)
 {
   SilcPacketContext packetdata;
   const SilcBufferStruct packet;
@@ -1504,7 +1504,7 @@ void silc_client_packet_send(SilcClient client,
 /* Packet sending routine for application.  This is the only routine that
    is provided for application to send SILC packets. */
 
-bool silc_client_send_packet(SilcClient client,
+SilcBool silc_client_send_packet(SilcClient client,
 			     SilcClientConnection conn,
 			     SilcPacketType type,
 			     const unsigned char *data,
@@ -1705,7 +1705,7 @@ SILC_TASK_CALLBACK(silc_client_send_auto_nick)
 
 static void silc_client_resume_session_cb(SilcClient client,
 					  SilcClientConnection conn,
-					  bool success,
+					  SilcBool success,
 					  void *context)
 {
   SilcBuffer sidp;