Merged silc_1_0_branch to trunk.

[silc.git] / apps / irssi / src / silc / core / client_ops.h

diff --git a/apps/irssi/src/silc/core/client_ops.h b/apps/irssi/src/silc/core/client_ops.h
index 31f5ad2989bc03af515ee948be049a5af09ec0eb..d9c181822a50034fa1731a333c3a4d07ff2ecaf0 100644 (file)
--- a/apps/irssi/src/silc/core/client_ops.h
+++ b/apps/irssi/src/silc/core/client_ops.h
@@ -10,7 +10,7 @@
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
-  
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -21,25 +21,28 @@
 #ifndef CLIENT_OPS_H
 #define CLIENT_OPS_H
 
-void silc_say(SilcClient client, SilcClientConnection conn, 
+#include "silc-servers.h"
+
+void silc_say(SilcClient client, SilcClientConnection conn,
              SilcClientMessageType type, char *msg, ...);
 void silc_say_error(char *msg, ...);
 void silc_channel_message(SilcClient client, SilcClientConnection conn,
-                         SilcClientEntry sender, 
-                         SilcChannelEntry channel, 
+                         SilcClientEntry sender,
+                         SilcChannelEntry channel,
                          SilcMessagePayload payload,
-                         SilcMessageFlags flags, 
+                         SilcChannelPrivateKey key,
+                         SilcMessageFlags flags,
                          const unsigned char *message,
                          SilcUInt32 message_len);
 void silc_private_message(SilcClient client, SilcClientConnection conn,
-                         SilcClientEntry sender, 
+                         SilcClientEntry sender,
                          SilcMessagePayload payload,
-                         SilcMessageFlags flags, 
+                         SilcMessageFlags flags,
                          const unsigned char *message,
                          SilcUInt32 message_len);
-void silc_notify(SilcClient client, SilcClientConnection conn, 
+void silc_notify(SilcClient client, SilcClientConnection conn,
                 SilcNotifyType type, ...);
-void silc_command(SilcClient client, SilcClientConnection conn, 
+void silc_command(SilcClient client, SilcClientConnection conn,
                  SilcClientCommandContext cmd_context, bool success,
                  SilcCommand command, SilcStatus status);
 void silc_command_reply(SilcClient client, SilcClientConnection conn,
@@ -52,13 +55,13 @@ void silc_disconnect(SilcClient client, SilcClientConnection conn,
 void silc_ask_passphrase(SilcClient client, SilcClientConnection conn,
                         SilcAskPassphrase completion, void *context);
 void silc_verify_public_key(SilcClient client, SilcClientConnection conn,
-                           SilcSocketType conn_type, unsigned char *pk, 
+                           SilcSocketType conn_type, unsigned char *pk,
                            SilcUInt32 pk_len, SilcSKEPKType pk_type,
                            SilcVerifyPublicKey completion, void *context);
 void silc_get_auth_method(SilcClient client, SilcClientConnection conn,
                          char *hostname, SilcUInt16 port,
                          SilcGetAuthMeth completion, void *context);
-void silc_failure(SilcClient client, SilcClientConnection conn, 
+void silc_failure(SilcClient client, SilcClientConnection conn,
                  SilcProtocol protocol, void *failure);
 bool silc_key_agreement(SilcClient client, SilcClientConnection conn,
                        SilcClientEntry client_entry, const char *hostname,
@@ -72,7 +75,10 @@ silc_detach(SilcClient client, SilcClientConnection conn,
             const unsigned char *detach_data, SilcUInt32 detach_data_len);
 char *
 silc_unescape_data(const char *escaped_data, SilcUInt32 *length);
-char * 
+char *
 silc_escape_data(const char *data, SilcUInt32 len);
 
+char *
+silc_get_session_filename(SILC_SERVER_REC *server);
+
 #endif