misc: add hashfun, and use it

misc/hashfun.h

@@ -0,0 +1,48 @@
+/**
+ * @file hashfun.h
+ * @author Ambroz Bizjak <ambrop7@gmail.com>
+ * 
+ * @section LICENSE
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the author nor the
+ *    names of its contributors may be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef BADVPN_HASHFUN_H
+#define BADVPN_HASHFUN_H
+
+#include <stdint.h>
+#include <stddef.h>
+
+static size_t badvpn_djb2_hash (const uint8_t *str)
+{
+    size_t hash = 5381;
+    int c;
+    
+    while (c = *str++) {
+        hash = ((hash << 5) + hash) + c;
+    }
+    
+    return hash;
+}
+
+#endif

ncd/NCDInterpBlock.c

@@ -34,24 +34,13 @@
 
 #include <misc/balloc.h>
 #include <misc/split_string.h>
+#include <misc/hashfun.h>
 #include <base/BLog.h>
 
 #include "NCDInterpBlock.h"
 
 #include <generated/blog_channel_ncd.h>
 
-static size_t djb2_hash (const unsigned char *str)
-{
-    size_t hash = 5381;
-    int c;
-    
-    while (c = *str++) {
-        hash = ((hash << 5) + hash) + c;
-    }
-    
-    return hash;
-}
-
 #include "NCDInterpBlock_hash.h"
 #include <structure/CHash_impl.h>
 

ncd/NCDInterpBlock_hash.h

@@ -5,7 +5,7 @@
 #define CHASH_PARAM_ARG NCDInterpBlock__hasharg
 #define CHASH_PARAM_NULL ((int)-1)
 #define CHASH_PARAM_DEREF(arg, link) (&(arg)[(link)])
-#define CHASH_PARAM_HASHFUN(arg, key) (djb2_hash((const unsigned char *)(key)))
+#define CHASH_PARAM_HASHFUN(arg, key) (badvpn_djb2_hash((const uint8_t *)(key)))
 #define CHASH_PARAM_KEYSEQUAL(arg, key1, key2) (!strcmp((key1), (key2)))
 #define CHASH_PARAM_GETKEY(arg, entry) ((entry).ptr->name)
 #define CHASH_PARAM_ENTRY_NEXT hash_next

ncd/NCDInterpProg.c

@@ -32,24 +32,13 @@
 #include <string.h>
 
 #include <misc/balloc.h>
+#include <misc/hashfun.h>
 #include <base/BLog.h>
 
 #include "NCDInterpProg.h"
 
 #include <generated/blog_channel_ncd.h>
 
-static size_t djb2_hash (const unsigned char *str)
-{
-    size_t hash = 5381;
-    int c;
-    
-    while (c = *str++) {
-        hash = ((hash << 5) + hash) + c;
-    }
-    
-    return hash;
-}
-
 #include "NCDInterpProg_hash.h"
 #include <structure/CHash_impl.h>
 

ncd/NCDInterpProg_hash.h

@@ -5,7 +5,7 @@
 #define CHASH_PARAM_ARG NCDInterpProg__hasharg
 #define CHASH_PARAM_NULL ((int)-1)
 #define CHASH_PARAM_DEREF(arg, link) (&(arg)[(link)])
-#define CHASH_PARAM_HASHFUN(arg, key) (djb2_hash((const unsigned char *)(key)))
+#define CHASH_PARAM_HASHFUN(arg, key) (badvpn_djb2_hash((const uint8_t *)(key)))
 #define CHASH_PARAM_KEYSEQUAL(arg, key1, key2) (!strcmp((key1), (key2)))
 #define CHASH_PARAM_GETKEY(arg, entry) ((entry).ptr->name)
 #define CHASH_PARAM_ENTRY_NEXT hash_next