- New functions Channel_[Set]Key(), Channel_[Set]MaxUsers.

[ngircd-alex.git] / src / ngircd / hash.c

diff --git a/src/ngircd/hash.c b/src/ngircd/hash.c
index 511dba15274c17edfd335f50562f6b59866208d0..dff84a67801f435de9484622cbf1964e257f553b 100644 (file)
--- a/src/ngircd/hash.c
+++ b/src/ngircd/hash.c
@@ -2,28 +2,49 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: hash.c,v 1.1 2002/03/14 15:31:22 alex Exp $
- *
- * hash.c: Hash-Werte berechnen
+ * Hash calculation
  */
 
 
 #include "portab.h"
 
+static char UNUSED id[] = "$Id: hash.c,v 1.6 2002/12/12 12:24:18 alex Exp $";
+
 #include "imp.h"
 #include <assert.h>
+#include <string.h>
+
+#include "defines.h"
+#include "log.h"
+#include "tool.h"
 
 #include "exp.h"
 #include "hash.h"
 
 
+LOCAL UINT32 jenkins_hash PARAMS(( register UINT8 *k, register UINT32 length, register UINT32 initval ));
+
+
+GLOBAL UINT32
+Hash( CHAR *String )
+{
+       /* Hash-Wert ueber String berechnen */
+
+       CHAR buffer[LINE_LEN];
+
+       strncpy( buffer, String, LINE_LEN - 1 );
+       buffer[LINE_LEN - 1] = '\0';
+       
+       return jenkins_hash( (UINT8 *)ngt_LowerStr( buffer ), strlen( buffer ), 42 );
+} /* Hash */
+
+
 /*
  * Die hier verwendete Hash-Funktion stammt aus lookup2.c von Bob Jenkins
  * (URL: <http://burtleburtle.net/bob/c/lookup2.c>). Aus dem Header:
@@ -37,11 +58,7 @@
  */
 
 
-typedef unsigned long int ub4;
-typedef unsigned char ub1;
-
-
-#define hashsize(n) ((ub4)1<<(n))
+#define hashsize(n) ((UINT32)1<<(n))
 #define hashmask(n) (hashsize(n)-1)
 
 #define mix(a,b,c) \
@@ -55,17 +72,18 @@ typedef unsigned char ub1;
        a -= b; a -= c; a ^= (c>>3);  \
        b -= c; b -= a; b ^= (a<<10); \
        c -= a; c -= b; c ^= (b>>15); \
-}
+} /* mix */
 
 
-ub4 hash( register ub1 *k, register ub4 length, register ub4 initval)
+LOCAL UINT32
+jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval )
 {
        /* k: the key
         * length: length of the key
         * initval: the previous hash, or an arbitrary value
         */
 
-       register ub4 a,b,c,len;
+       register UINT32 a,b,c,len;
 
        /* Set up the internal state */
        len = length;
@@ -75,9 +93,9 @@ ub4 hash( register ub1 *k, register ub4 length, register ub4 initval)
        /* handle most of the key */
        while (len >= 12)
        {
-               a += (k[0] +((ub4)k[1]<<8) +((ub4)k[2]<<16) +((ub4)k[3]<<24));
-               b += (k[4] +((ub4)k[5]<<8) +((ub4)k[6]<<16) +((ub4)k[7]<<24));
-               c += (k[8] +((ub4)k[9]<<8) +((ub4)k[10]<<16)+((ub4)k[11]<<24));
+               a += (k[0] +((UINT32)k[1]<<8) +((UINT32)k[2]<<16) +((UINT32)k[3]<<24));
+               b += (k[4] +((UINT32)k[5]<<8) +((UINT32)k[6]<<16) +((UINT32)k[7]<<24));
+               c += (k[8] +((UINT32)k[9]<<8) +((UINT32)k[10]<<16)+((UINT32)k[11]<<24));
                mix(a,b,c);
                k += 12; len -= 12;
        }
@@ -86,17 +104,17 @@ ub4 hash( register ub1 *k, register ub4 length, register ub4 initval)
        c += length;
        switch(len)             /* all the case statements fall through */
        {
-               case 11: c+=((ub4)k[10]<<24);
-               case 10: c+=((ub4)k[9]<<16);
-               case 9 : c+=((ub4)k[8]<<8);
+               case 11: c+=((UINT32)k[10]<<24);
+               case 10: c+=((UINT32)k[9]<<16);
+               case 9 : c+=((UINT32)k[8]<<8);
                /* the first byte of c is reserved for the length */
-               case 8 : b+=((ub4)k[7]<<24);
-               case 7 : b+=((ub4)k[6]<<16);
-               case 6 : b+=((ub4)k[5]<<8);
+               case 8 : b+=((UINT32)k[7]<<24);
+               case 7 : b+=((UINT32)k[6]<<16);
+               case 6 : b+=((UINT32)k[5]<<8);
                case 5 : b+=k[4];
-               case 4 : a+=((ub4)k[3]<<24);
-               case 3 : a+=((ub4)k[2]<<16);
-               case 2 : a+=((ub4)k[1]<<8);
+               case 4 : a+=((UINT32)k[3]<<24);
+               case 3 : a+=((UINT32)k[2]<<16);
+               case 2 : a+=((UINT32)k[1]<<8);
                case 1 : a+=k[0];
                /* case 0: nothing left to add */
        }
@@ -104,7 +122,7 @@ ub4 hash( register ub1 *k, register ub4 length, register ub4 initval)
 
        /* report the result */
        return c;
-} /* hash */
+} /* jenkins_hash */
 
 
 /* -eof- */