the cache. */
typedef struct {
SilcIDCache cache;
- void *timeout_queue;
+ SilcSchedule schedule;
+ SilcUInt32 timeout;
} *SilcIDListPurge;
+/* Channel key re-key context. */
+typedef struct {
+ void *context;
+ SilcChannelEntry channel;
+ SilcUInt32 key_len;
+ SilcTask task;
+} *SilcServerChannelRekey;
+
+/* Generic rekey context for connections */
+typedef struct {
+ /* Current sending encryption key, provided for re-key. The `pfs'
+ is TRUE if the Perfect Forward Secrecy is performed in re-key. */
+ unsigned char *send_enc_key;
+ SilcUInt32 enc_key_len;
+ int ske_group;
+ bool pfs;
+ SilcUInt32 timeout;
+ void *context;
+} *SilcServerRekey;
+
+/* ID List Entry status type and all the types. */
+typedef SilcUInt8 SilcIDListStatus;
+#define SILC_IDLIST_STATUS_NONE 0x00 /* No status */
+#define SILC_IDLIST_STATUS_REGISTERED 0x01 /* Entry is registered */
+#define SILC_IDLIST_STATUS_RESOLVED 0x02 /* Entry info is resolved */
+#define SILC_IDLIST_STATUS_RESOLVING 0x04 /* Entry is being resolved
+ with WHOIS or IDENTIFY */
+#define SILC_IDLIST_STATUS_DISABLED 0x08 /* Entry is disabled */
+
/*
Generic ID list data structure.
This structure is included in all ID list entries and it includes data
pointers that are common to all ID entries. This structure is always
defined to the first field in the ID entries and is used to explicitly
- cast to this type without first explicitly casting to correct ID entry
- type. Hence, the ID list entry is casted to this type to get this data
- from the ID entry (which is usually opaque pointer).
+ type cast to this type without first explicitly casting to correct ID
+ entry type. Hence, the ID list entry is type casted to this type to
+ get this data from the ID entry (which is usually opaque pointer).
Note that some of the fields may be NULL.
SilcCipher send_key;
SilcCipher receive_key;
+ /* HMAC */
+ SilcHmac hmac_send;
+ SilcHmac hmac_receive;
+
+ /* Packet sequence numbers */
+ SilcUInt32 psn_send;
+ SilcUInt32 psn_receive;
+
/* Hash selected in the SKE protocol, NULL if not needed at all */
SilcHash hash;
- /* HMAC and raw key data */
- SilcHmac hmac;
- unsigned char *hmac_key;
- unsigned int hmac_key_len;
-
- /* PKCS and public key */
- SilcPKCS pkcs;
+ /* Public key */
SilcPublicKey public_key;
+ unsigned char fingerprint[20];
+
+ /* Re-key context */
+ SilcServerRekey rekey;
- long last_receive; /* Time last received data */
- long last_sent; /* Time last sent data */
- unsigned char registered; /* Boolean whether connection is registered */
+ long last_receive; /* Time last received data */
+ long last_sent; /* Time last sent data */
+
+ unsigned long created; /* Time when entry was created */
+
+ SilcIDListStatus status; /* Status mask of the entry */
} *SilcIDListData, SilcIDListDataStruct;
/*
Logical name of the server. There is no limit of the length of the
server name. This is usually the same name as defined in DNS.
- int server_type
+ SilcUInt8 server_type
Type of the server. SILC_SERVER or SILC_ROUTER are the possible
choices for this.
SilcIDListDataStruct data;
char *server_name;
- int server_type;
+ SilcUInt8 server_type;
SilcServerID *id;
char *server_info;
char *motd;
This entry used only by the SilcChannelEntry object and it holds
information about current clients (ie. users) on channel. Following
- short description of the fields:
+ short description of the fields:
SilcClientEntry client
Pointer to the client list. This is the client currently on channel.
- unsigned int mode
+ SilcUInt32 mode
Client's current mode on the channel.
SilcClientEntry we have this here for fast access to the channel when
used by SilcClientEntry.
- struct SilcChannelClientEntryStruct *client_list
- struct SilcChannelClientEntryStruct *channel_list
-
- List member pointers. This structure is used by channel entry and
- client entry thus we must have separate list member pointers for
- them since we are using same entry for both lists (the entry is not
- duplicated). SilcList requires this.
-
*/
typedef struct SilcChannelClientEntryStruct {
SilcClientEntry client;
- unsigned int mode;
+ SilcUInt32 mode;
SilcChannelEntry channel;
- struct SilcChannelClientEntryStruct *client_list;
- struct SilcChannelClientEntryStruct *channel_list;
} *SilcChannelClientEntry;
/*
Generic data structure to hold data common to all ID entries.
+ unsigned char *nickname
+
+ The nickname of the client.
+
+ char *servername
+
+ The name of the server where the client is from. MAy be NULL.
+
char username
Client's usename. This is defined in the following manner:
nickname. Nickname is not relevant information that would need to be
saved as plain.
- int mode
+ SilcUInt32 mode
Client's mode. Client maybe for example server operator or
router operator (SILC operator).
not allow any command to be exeucted more than once in about
2 seconds. This is result of normal time().
- char fast_command
+ SilcUInt8 fast_command
Counter to check command bursts. By default, up to 5 commands
are allowed before limiting the execution. See command flags
cell this client is coming from. This is used to route messages to
this client.
- SilcList channels
+ SilcHashTable channels;
- List of channels this client has joined.
+ All the channels this client has joined. The context saved in the
+ hash table shares memory with the channel entrys `user_list' hash
+ table.
void *connection
but as just said, this is usually pointer to the socket connection
list.
+ SilcUInt16 resolve_cmd_ident
+
+ Command identifier for the entry when the entry's data.status
+ is SILC_IDLIST_STATUS_RESOLVING. If this entry is asked to be
+ resolved when the status is set then the resolver may attach to
+ this command identifier and handle the process after the resolving
+ is over.
+
*/
struct SilcClientEntryStruct {
/* Generic data structure. DO NOT add anything before this! */
SilcIDListDataStruct data;
unsigned char *nickname;
+ char *servername;
char *username;
char *userinfo;
SilcClientID *id;
- int mode;
+ SilcUInt32 mode;
long last_command;
- char fast_command;
+ SilcUInt8 fast_command;
/* Pointer to the router */
SilcServerEntry router;
- /* List of channels client has joined to */
- SilcList channels;
+ /* All channels this client has joined */
+ SilcHashTable channels;
/* Connection data */
void *connection;
+
+ /* data.status is RESOLVING and this includes the resolving command
+ reply identifier. */
+ SilcUInt16 resolve_cmd_ident;
};
/*
Logical name of the channel.
- unsigned int mode
+ SilcUInt32 mode
Current mode of the channel. See lib/silccore/silcchannel.h for
all modes.
ID of the channel. This includes all the information SILC will ever
need.
- int global_users
+ bool global_users
Boolean value to tell whether there are users outside this server
on this channel. This is set to TRUE if router sends message to
Default cipher of the channel. If this is NULL then server picks
the cipher to be used. This can be set at SILC_COMMAND_JOIN.
+ char *hmac_name
+
+ Default hmac of the channel. If this is NULL then server picks
+ the cipher to be used. This can be set at SILC_COMMAND_JOIN.
+
+ SilcPublicKey founder_key
+ SilcAuthMethod founder_method
+ unsigned char *founder_passwd
+ SilcUInt32 founder_passwd_len
+
+ If the SILC_CMODE_FOUNDER_AUTH has been set then these will include
+ the founder's public key, authentication method and the password
+ if the method is SILC_AUTH_PASSWORD. If it is SILC_AUTH_PUBLIC_KEY
+ then the `founder_passwd' is NULL.
+
+ SilcHashTable user_list
+
+ All users joined on this channel. Note that the context saved to
+ this entry shares memory with the client entrys `channels' hash
+ table.
+
SilcServerEntry router
This is a pointer to the server list. This is the router server
The key of the channel (the cipher actually).
unsigned char *key
- unsigned int key_len
+ SilcUInt32 key_len
Raw key data of the channel key.
HMAC of the channel.
+ SilcServerChannelRekey rekey
+
+ Channel key re-key context.
+
*/
struct SilcChannelEntryStruct {
char *channel_name;
- unsigned int mode;
+ SilcUInt32 mode;
SilcChannelID *id;
- int global_users;
+ bool global_users;
char *topic;
char *cipher;
+ char *hmac_name;
+
+ SilcPublicKey founder_key;
+ SilcAuthMethod founder_method;
+ unsigned char *founder_passwd;
+ SilcUInt32 founder_passwd_len;
- unsigned int user_limit;
+ SilcUInt32 user_limit;
unsigned char *passphrase;
char *invite_list;
char *ban_list;
- /* List of users on channel */
- SilcList user_list;
+ /* All users on this channel */
+ SilcHashTable user_list;
+ SilcUInt32 user_count;
/* Pointer to the router */
SilcServerEntry router;
/* Channel keys */
SilcCipher channel_key;
unsigned char *key;
- unsigned int key_len;
+ SilcUInt32 key_len;
unsigned char iv[SILC_CIPHER_MAX_IV_SIZE];
SilcHmac hmac;
+
+ SilcServerChannelRekey rekey;
+
+ unsigned long created;
+ bool disabled;
};
/*
void *connection);
SilcServerEntry
silc_idlist_find_server_by_id(SilcIDList id_list, SilcServerID *id,
- SilcIDCacheEntry *ret_entry);
+ bool registered, SilcIDCacheEntry *ret_entry);
SilcServerEntry
silc_idlist_find_server_by_name(SilcIDList id_list, char *name,
- SilcIDCacheEntry *ret_entry);
+ bool registered, SilcIDCacheEntry *ret_entry);
SilcServerEntry
silc_idlist_find_server_by_conn(SilcIDList id_list, char *hostname,
- int port, SilcIDCacheEntry *ret_entry);
+ int port, bool registered,
+ SilcIDCacheEntry *ret_entry);
SilcServerEntry
silc_idlist_replace_server_id(SilcIDList id_list, SilcServerID *old_id,
SilcServerID *new_id);
-void silc_idlist_del_server(SilcIDList id_list, SilcServerEntry entry);
+int silc_idlist_del_server(SilcIDList id_list, SilcServerEntry entry);
SilcClientEntry
-silc_idlist_add_client(SilcIDList id_list, unsigned char *nickname,
- unsigned int nickname_len, char *username,
+silc_idlist_add_client(SilcIDList id_list, char *nickname, char *username,
char *userinfo, SilcClientID *id,
- SilcServerEntry router, void *connection);
+ SilcServerEntry router, void *connection,
+ int expire);
int silc_idlist_del_client(SilcIDList id_list, SilcClientEntry entry);
-SilcClientEntry *
-silc_idlist_get_clients_by_nickname(SilcIDList id_list, char *nickname,
- char *server, unsigned int *clients_count);
-SilcClientEntry *
-silc_idlist_get_clients_by_hash(SilcIDList id_list, char *nickname,
- SilcHash md5hash,
- unsigned int *clients_count);
-SilcClientEntry
-silc_idlist_find_client_by_nickname(SilcIDList id_list, char *nickname,
- char *server,
- SilcIDCacheEntry *ret_entry);
-SilcClientEntry
-silc_idlist_find_client_by_hash(SilcIDList id_list, char *nickname,
- SilcHash md5hash, SilcIDCacheEntry *ret_entry);
+int silc_idlist_get_clients_by_nickname(SilcIDList id_list, char *nickname,
+ char *server,
+ SilcClientEntry **clients,
+ SilcUInt32 *clients_count);
+int silc_idlist_get_clients_by_hash(SilcIDList id_list, char *nickname,
+ SilcHash md5hash,
+ SilcClientEntry **clients,
+ SilcUInt32 *clients_count);
SilcClientEntry
silc_idlist_find_client_by_id(SilcIDList id_list, SilcClientID *id,
- SilcIDCacheEntry *ret_entry);
+ bool registered, SilcIDCacheEntry *ret_entry);
SilcClientEntry
silc_idlist_replace_client_id(SilcIDList id_list, SilcClientID *old_id,
SilcClientID *new_id);
SilcChannelEntry
silc_idlist_add_channel(SilcIDList id_list, char *channel_name, int mode,
SilcChannelID *id, SilcServerEntry router,
- SilcCipher channel_key, SilcHmac hmac);
+ SilcCipher channel_key, SilcHmac hmac,
+ int expire);
int silc_idlist_del_channel(SilcIDList id_list, SilcChannelEntry entry);
SilcChannelEntry
silc_idlist_find_channel_by_name(SilcIDList id_list, char *name,
SilcChannelID *new_id);
SilcChannelEntry *
silc_idlist_get_channels(SilcIDList id_list, SilcChannelID *channel_id,
- unsigned int *channels_count);
+ SilcUInt32 *channels_count);
#endif