From a4daa772c3186cdf9ba0283d937f49f48b11646a Mon Sep 17 00:00:00 2001 From: cyberman54 Date: Sun, 27 Dec 2020 00:36:23 +0100 Subject: [PATCH] generalize hash() function --- include/hash.h | 2 +- src/hash.cpp | 4 ++++ src/macsniff.cpp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/hash.h b/include/hash.h index b86e7b2e..2caa6133 100644 --- a/include/hash.h +++ b/include/hash.h @@ -4,6 +4,6 @@ #include #include -uint32_t IRAM_ATTR rokkit(const char *data, int len); +uint32_t IRAM_ATTR hash(const char *data, int len); #endif \ No newline at end of file diff --git a/src/hash.cpp b/src/hash.cpp index e5d268f9..137e98a5 100644 --- a/src/hash.cpp +++ b/src/hash.cpp @@ -85,3 +85,7 @@ uint32_t IRAM_ATTR rokkit(const char *data, int len) { return hash; } + +uint32_t IRAM_ATTR hash(const char *data, int len) { + return rokkit(data, len); +} diff --git a/src/macsniff.cpp b/src/macsniff.cpp index 6fefc07c..3e5e8210 100644 --- a/src/macsniff.cpp +++ b/src/macsniff.cpp @@ -141,7 +141,7 @@ uint16_t mac_analyze(MacBuffer_t MacBuffer) { snprintf(buff, sizeof(buff), "%08X", *mac + (uint32_t)salt); // convert unsigned 32-bit salted MAC // to 8 digit hex string - uint16_t hashedmac = rokkit(&buff[3], 5); // hash MAC 8 digit -> 5 digit + uint16_t hashedmac = hash(&buff[3], 5); // hash MAC 8 digit -> 5 digit auto newmac = macs.insert(hashedmac); // add hashed MAC, if new unique bool added = newmac.second ? true : false; // true if hashed MAC is unique in container