* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
- *
- * $Id: hash.h 3177 2007-02-01 00:19:14Z jilles $
*/
#ifndef INCLUDED_hash_h
#define INCLUDED_hash_h
-struct Dictionary;
-
-extern rb_dlink_list *clientTable;
-extern rb_dlink_list *channelTable;
-extern rb_dlink_list *idTable;
-extern rb_dlink_list *resvTable;
-extern rb_dlink_list *hostTable;
-extern rb_dlink_list *helpTable;
+#include "rb_dictionary.h"
+#include "rb_radixtree.h"
-extern struct Dictionary *nd_dict;
+extern rb_dictionary *nd_dict;
+extern rb_radixtree *resv_tree;
+extern rb_radixtree *channel_tree;
/* Magic value for FNV hash functions */
#define FNV1_32_INIT 0x811c9dc5UL
#define U_MAX_BITS 17
#define U_MAX 131072 /* 2^17 */
+/* Client connid hash table size, used in hash.c */
+#define CLI_CONNID_MAX 4096
+
/* Channel hash table size, hash.c/s_debug.c */
#define CH_MAX_BITS 16
#define CH_MAX 65536 /* 2^16 */
struct cachefile;
struct nd_entry;
-extern u_int32_t fnv_hash_upper(const unsigned char *s, int bits);
-extern u_int32_t fnv_hash(const unsigned char *s, int bits);
-extern u_int32_t fnv_hash_len(const unsigned char *s, int bits, int len);
-extern u_int32_t fnv_hash_upper_len(const unsigned char *s, int bits, int len);
+extern uint32_t fnv_hash_upper(const unsigned char *s, int bits);
+extern uint32_t fnv_hash(const unsigned char *s, int bits);
+extern uint32_t fnv_hash_len(const unsigned char *s, int bits, int len);
+extern uint32_t fnv_hash_upper_len(const unsigned char *s, int bits, int len);
extern void init_hash(void);
extern void del_from_id_hash(const char *name, struct Client *client);
extern struct Client *find_id(const char *name);
-extern struct Channel *get_or_create_channel(struct Client *client_p, const char *chname, int *isnew);
+extern struct Channel *get_or_create_channel(struct Client *client_p, const char *chname, bool *isnew);
extern void del_from_channel_hash(const char *name, struct Channel *chan);
extern struct Channel *find_channel(const char *name);
extern struct ConfItem *hash_find_resv(const char *name);
extern void clear_resv_hash(void);
-void add_to_cli_fd_hash(struct Client *client_p);\r
-void del_from_cli_fd_hash(struct Client *client_p);\r
-struct Client *find_cli_fd_hash(int fd);
-
-extern void hash_stats(struct Client *);
+void add_to_cli_connid_hash(struct Client *client_p, uint32_t id);
+void del_from_cli_connid_hash(uint32_t id);
+struct Client *find_cli_connid_hash(uint32_t connid);
#endif /* INCLUDED_hash_h */