diff --git a/src/lib/ndpi_filter.c b/src/lib/ndpi_filter.c index 7917639d09b..e9dd3cfa2ad 100644 --- 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 index 43dc5fd92b9..ca551ba8947 100644 --- a/src/lib/third_party/include/MurmurHash3.h +++ b/src/lib/third_party/include/MurmurHash3.h @@ -3,6 +3,6 @@ #include -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 index f8bf0d88151..e4160101028 100644 --- 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 index c4ed5988542..45a86b8b30e 100644 --- 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)); }