Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 2003 Pekka Riikonen
+ Copyright (C) 1997 - 2005 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
}
} else {
if (left)
- *left = strdup(string);
+ *left = silc_memdup(string, strlen(string));
}
return TRUE;
return h;
}
+/* Hash UTF-8 string */
+
+SilcUInt32 silc_hash_utf8_string(void *key, void *user_context)
+{
+ unsigned char *s = (unsigned char *)key;
+ SilcUInt32 h = 0, g;
+
+ while (*s != '\0') {
+ h = (h << 4) + *s;
+ if ((g = h & 0xf0000000)) {
+ h = h ^ (g >> 24);
+ h = h ^ g;
+ }
+ s++;
+ }
+
+ return h;
+}
+
/* Basic hash function to hash integers. May be used with the SilcHashTable. */
SilcUInt32 silc_hash_uint(void *key, void *user_context)
SilcUInt32 silc_hash_ptr(void *key, void *user_context)
{
- return (SilcUInt32)key;
+ return SILC_PTR_TO_32(key);
}
/* Hash a ID. The `user_context' is the ID type. */
SilcUInt32 silc_hash_id(void *key, void *user_context)
{
- SilcIdType id_type = (SilcIdType)(SilcUInt32)user_context;
+ SilcIdType id_type = (SilcIdType)SILC_PTR_TO_32(user_context);
SilcUInt32 h = 0;
int i;
SilcUInt32 silc_hash_data(void *key, void *user_context)
{
- SilcUInt32 len = (SilcUInt32)user_context, h = 0;
+ SilcUInt32 len = SILC_PTR_TO_32(user_context), h = 0;
unsigned char *data = (unsigned char *)key;
int i;
SilcUInt32 silc_hash_public_key(void *key, void *user_context)
{
SilcPublicKey pk = (SilcPublicKey)key;
- return (pk->len + silc_hash_string(pk->name, NULL) +
- silc_hash_string(pk->identifier, NULL) +
- silc_hash_data(pk->pk, (void *)pk->pk_len));
+ return (pk->len + (silc_hash_string(pk->name, NULL) ^
+ silc_hash_string(pk->identifier, NULL) ^
+ silc_hash_data(pk->pk, SILC_32_TO_PTR(pk->pk_len))));
}
/* Compares two strings. It may be used as SilcHashTable comparison
bool silc_hash_id_compare(void *key1, void *key2, void *user_context)
{
- SilcIdType id_type = (SilcIdType)(SilcUInt32)user_context;
+ SilcIdType id_type = (SilcIdType)SILC_PTR_TO_32(user_context);
return (id_type == SILC_ID_CLIENT ?
SILC_ID_COMPARE_HASH((SilcClientID *)key1, (SilcClientID *)key2) :
SILC_ID_COMPARE_TYPE(key1, key2, id_type));
bool silc_hash_data_compare(void *key1, void *key2, void *user_context)
{
- SilcUInt32 len = (SilcUInt32)user_context;
+ SilcUInt32 len = SILC_PTR_TO_32(user_context);
return !memcmp(key1, key2, len);
}
+/* Compares UTF-8 string. */
+
+bool silc_hash_utf8_compare(void *key1, void *key2, void *user_context)
+{
+ int l1 = strlen((char *)key1);
+ int l2 = strlen((char *)key2);
+ if (l1 > l2)
+ l2 = l1;
+ return !memcmp(key1, key2, l2);
+}
+
/* Compares two SILC Public keys. It may be used as SilcHashTable
comparison function. */
{ STAT(TIMEDOUT), "Service timed out" },
{ STAT(UNSUPPORTED_PUBLIC_KEY), "Unsupported public key type" },
{ STAT(OPERATION_ALLOWED), "Operation is not allowed" },
+ { STAT(BAD_SERVER), "Bad server name" },
+ { STAT(BAD_USERNAME), "Bad user name" },
{ 0, NULL }
};