updates. New data types.

[silc.git] / lib / silccore / silcchannel.h

diff --git a/lib/silccore/silcchannel.h b/lib/silccore/silcchannel.h
index 0c6a41e525e040b453b3a73e4443e1a94a4c079f..60a19de9eedfc9692c8a8d0d055496e7cfb12543 100644 (file)
--- a/lib/silccore/silcchannel.h
+++ b/lib/silccore/silcchannel.h
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
 
-  Copyright (C) 1997 - 2000 Pekka Riikonen
+  Copyright (C) 1997 - 2001 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
@@ -21,47 +21,84 @@
 #ifndef SILCCHANNEL_H
 #define SILCCHANNEL_H
 
-/* Forward declaration for Channel Message Payload parsed from packet. The
+#include "silcdlist.h"
+
+/* Forward declaration for Channel Payload parsed from packet. The
    actual structure is defined in source file and is private data. */
 typedef struct SilcChannelPayloadStruct *SilcChannelPayload;
 
+/* Forward declaration for Channel Message Payload parsed from packet. The
+   actual structure is defined in source file and is private data. */
+typedef struct SilcChannelMessagePayloadStruct *SilcChannelMessagePayload;
+
 /* Forward declaration for Channel Key Payload parsed from packet. The
    actual structure is defined in source file and is private data. */
 typedef struct SilcChannelKeyPayloadStruct *SilcChannelKeyPayload;
 
+/* The Message flag type */
+typedef uint16 SilcMessageFlags;
+
+/* The message flags (shared by both channel and private messages) */
+#define SILC_MESSAGE_FLAG_NONE        0x0000
+#define SILC_MESSAGE_FLAG_AUTOREPLY   0x0001
+#define SILC_MESSAGE_FLAG_NOREPLY     0x0002
+#define SILC_MESSAGE_FLAG_ACTION      0x0004
+#define SILC_MESSAGE_FLAG_NOTICE      0x0008
+#define SILC_MESSAGE_FLAG_REQUEST     0x0010
+#define SILC_MESSAGE_FLAG_RESERVED    0x0020 /* to 0x0200 */
+#define SILC_MESSAGE_FLAG_PRIVATE     0x0400 /* to 0x8000 */
+
 /* Prototypes */
-int silc_channel_payload_decrypt(unsigned char *data,
-                                size_t data_len,
-                                SilcCipher cipher,
-                                SilcHmac hmac);
-SilcChannelPayload silc_channel_payload_parse(SilcBuffer buffer,
-                                             SilcCipher cipher,
-                                             SilcHmac hmac);
-SilcBuffer silc_channel_payload_encode(unsigned short data_len,
-                                      unsigned char *data,
-                                      unsigned short iv_len,
-                                      unsigned char *iv,
-                                      SilcCipher cipher,
-                                      SilcHmac hmac,
-                                      SilcRng rng);
+SilcChannelPayload silc_channel_payload_parse(SilcBuffer buffer);
+SilcDList silc_channel_payload_parse_list(SilcBuffer buffer);
+SilcBuffer silc_channel_payload_encode(unsigned char *channel_name,
+                                      uint16 channel_name_len,
+                                      unsigned char *channel_id,
+                                      uint32 channel_id_len,
+                                      uint32 mode);
 void silc_channel_payload_free(SilcChannelPayload payload);
-unsigned char *silc_channel_get_data(SilcChannelPayload payload,
-                                    unsigned int *data_len);
-unsigned char *silc_channel_get_mac(SilcChannelPayload payload);
-unsigned char *silc_channel_get_iv(SilcChannelPayload payload);
+void silc_channel_payload_list_free(SilcDList list);
+unsigned char *silc_channel_get_name(SilcChannelPayload payload,
+                                    uint32 *channel_name_len);
+unsigned char *silc_channel_get_id(SilcChannelPayload payload,
+                                  uint32 *channel_id_len);
+SilcChannelID *silc_channel_get_id_parse(SilcChannelPayload payload);
+uint32 silc_channel_get_mode(SilcChannelPayload payload);
+int silc_channel_message_payload_decrypt(unsigned char *data,
+                                        size_t data_len,
+                                        SilcCipher cipher,
+                                        SilcHmac hmac);
+SilcChannelMessagePayload 
+silc_channel_message_payload_parse(SilcBuffer buffer,
+                                  SilcCipher cipher,
+                                  SilcHmac hmac);
+SilcBuffer silc_channel_message_payload_encode(uint16 flags,
+                                              uint16 data_len,
+                                              unsigned char *data,
+                                              uint16 iv_len,
+                                              unsigned char *iv,
+                                              SilcCipher cipher,
+                                              SilcHmac hmac);
+void silc_channel_message_payload_free(SilcChannelMessagePayload payload);
+uint16 
+silc_channel_message_get_flags(SilcChannelMessagePayload payload);
+unsigned char *silc_channel_message_get_data(SilcChannelMessagePayload payload,
+                                    uint32 *data_len);
+unsigned char *silc_channel_message_get_mac(SilcChannelMessagePayload payload);
+unsigned char *silc_channel_message_get_iv(SilcChannelMessagePayload payload);
 SilcChannelKeyPayload silc_channel_key_payload_parse(SilcBuffer buffer);
-SilcBuffer silc_channel_key_payload_encode(unsigned short id_len,
+SilcBuffer silc_channel_key_payload_encode(uint16 id_len,
                                           unsigned char *id,
-                                          unsigned short cipher_len,
+                                          uint16 cipher_len,
                                           unsigned char *cipher,
-                                          unsigned short key_len,
+                                          uint16 key_len,
                                           unsigned char *key);
 void silc_channel_key_payload_free(SilcChannelKeyPayload payload);
 unsigned char *silc_channel_key_get_id(SilcChannelKeyPayload payload, 
-                                      unsigned int *id_len);
+                                      uint32 *id_len);
 unsigned char *silc_channel_key_get_cipher(SilcChannelKeyPayload payload,
-                                          unsigned int *cipher_len);
+                                          uint32 *cipher_len);
 unsigned char *silc_channel_key_get_key(SilcChannelKeyPayload payload,
-                                       unsigned int *key_len);
+                                       uint32 *key_len);
 
 #endif