Fix compilation on Windows

For some unknown reasons, `MurmurHash` name doesn't work on Window
ntop · Aug 14, 2023 · b473f88 · b473f88
1 parent cfbb7a4
commit b473f88
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/src/lib/ndpi_filter.c b/src/lib/ndpi_filter.c
@@ -58,7 +58,7 @@ bool ndpi_filter_add(ndpi_filter *f, u_int32_t value) {
 /* ******************************************* */
 
 bool ndpi_filter_add_string(ndpi_filter *f, char *string) {
-  return(ndpi_filter_add(f, MurmurHash(string, strlen(string), 0xD6DFE7)));
+  return(ndpi_filter_add(f, MurmurHash3(string, strlen(string), 0xD6DFE7)));
 }
 
 /* ******************************************* */
@@ -76,7 +76,7 @@ bool ndpi_filter_contains(ndpi_filter *f, u_int32_t value) {
 /* ******************************************* */
 
 bool ndpi_filter_contains_string(ndpi_filter *f, char *string) {
-  return(ndpi_filter_contains(f, MurmurHash(string, strlen(string), 0xD6DFE7)));
+  return(ndpi_filter_contains(f, MurmurHash3(string, strlen(string), 0xD6DFE7)));
 }
 
 /* ******************************************* */

diff --git a/src/lib/third_party/include/MurmurHash3.h b/src/lib/third_party/include/MurmurHash3.h
@@ -3,6 +3,6 @@
 
 #include <stdint.h>
 
-uint32_t MurmurHash(const void * key, uint32_t len, uint32_t seed);
+uint32_t MurmurHash3(const void * key, uint32_t len, uint32_t seed);
 
 #endif
diff --git a/src/lib/third_party/src/hll/MurmurHash3.c b/src/lib/third_party/src/hll/MurmurHash3.c
@@ -7,7 +7,7 @@ xo*/
 
 #define	ROTL32(x, r)	((x) << (r)) | ((x) >> (32 - (r)))
 
-u_int32_t MurmurHash(const void *key, u_int32_t len, u_int32_t seed) {
+u_int32_t MurmurHash3(const void *key, u_int32_t len, u_int32_t seed) {
   const u_int8_t *data = (const u_int8_t *)key;
   const int32_t nblocks = (int32_t)len / 4;
 

diff --git a/src/lib/third_party/src/hll/hll.c b/src/lib/third_party/src/hll/hll.c
@@ -117,7 +117,7 @@ static __inline int _hll_add_hash(struct ndpi_hll *hll, u_int32_t hash) {
 
 /* Return: 0 = nothing changed, 1 = ranking changed */
 int hll_add(struct ndpi_hll *hll, const void *buf, size_t size) {
-  u_int32_t hash = MurmurHash((const char *)buf, (u_int32_t)size, 0x5f61767a);
+  u_int32_t hash = MurmurHash3((const char *)buf, (u_int32_t)size, 0x5f61767a);
 
   return(_hll_add_hash(hll, hash));
 }

diff --git a/windows/nDPI.vcxproj b/windows/nDPI.vcxproj
@@ -331,6 +331,7 @@
     <ClCompile Include="..\src\lib\third_party\src\ndpi_sha1.c" />
     <ClCompile Include="..\src\lib\third_party\src\sha1-fast.c" />
     <ClCompile Include="..\src\lib\third_party\src\strptime.c" />
+    <ClCompile Include="..\src\lib\third_party\src\hll\MurmurHash3.c" />
     <ClCompile Include="src\getopt.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>

diff --git a/windows/nDPI.vcxproj.filters b/windows/nDPI.vcxproj.filters
@@ -202,6 +202,9 @@
     <ClCompile Include="..\src\lib\third_party\src\strptime.c">
       <Filter>third_party</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\lib\third_party\src\hll\MurmurHash3.c" />
+      <Filter>third_party</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\lib\protocols\tocaboca.c" />
     <ClCompile Include="..\src\lib\protocols\raknet.c" />
     <ClCompile Include="..\src\lib\protocols\sd_rtn.c" />