aboutsummaryrefslogtreecommitdiff
path: root/src/lib/ndpi_utils.c
diff options
context:
space:
mode:
authorLuca Deri <deri@ntop.org>2021-09-27 10:29:03 +0200
committerLuca Deri <deri@ntop.org>2021-09-27 10:29:03 +0200
commit519c69c5cc1d70d06707cc53e048fd3fe8079550 (patch)
tree5f85f41be096ecae808c9d2e0eda770dc7cd7815 /src/lib/ndpi_utils.c
parent72df138a7d110d4df23e458ad1b24a0db75e1ad5 (diff)
Reworked bitmap code
Diffstat (limited to 'src/lib/ndpi_utils.c')
-rw-r--r--src/lib/ndpi_utils.c63
1 files changed, 0 insertions, 63 deletions
diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c
index 5f5f87665..bb36de761 100644
--- a/src/lib/ndpi_utils.c
+++ b/src/lib/ndpi_utils.c
@@ -53,8 +53,6 @@
#include "third_party/include/libinjection_xss.h"
#include "third_party/include/rce_injection.h"
-#include "third_party/include/roaring.h"
-
#define NDPI_CONST_GENERIC_PROTOCOL_NAME "GenericProtocol"
// #define MATCH_DEBUG 1
@@ -2262,64 +2260,3 @@ u_int8_t ndpi_is_encrypted_proto(struct ndpi_detection_module_struct *ndpi_str,
return(0);
}
-/* ******************************************* */
-
-ndpi_bitmap* ndpi_bitmap_alloc() {
- return((ndpi_bitmap*)roaring_bitmap_create());
-}
-
-/* ******************************************* */
-
-void ndpi_bitmap_free(ndpi_bitmap* b) {
- roaring_bitmap_free((const roaring_bitmap_t *)b);
-}
-
-/* ******************************************* */
-
-u_int64_t ndpi_bitmap_cardinality(ndpi_bitmap* b) {
- return(roaring_bitmap_get_cardinality((const roaring_bitmap_t *)b));
-}
-
-/* ******************************************* */
-
-void ndpi_bitmap_set(ndpi_bitmap* b, u_int32_t value) {
- roaring_bitmap_add((roaring_bitmap_t *)b, value);
-}
-
-/* ******************************************* */
-
-void ndpi_bitmap_unset(ndpi_bitmap* b, u_int32_t value) {
- roaring_bitmap_remove((roaring_bitmap_t *)b, value);
-}
-
-/* ******************************************* */
-
-bool ndpi_bitmap_isset(ndpi_bitmap* b, u_int32_t value) {
- return(roaring_bitmap_contains((const roaring_bitmap_t *)b, value));
-}
-
-/* ******************************************* */
-
-void ndpi_bitmap_clear(ndpi_bitmap* b) {
- roaring_bitmap_clear((roaring_bitmap_t *)b);
-}
-
-/* ******************************************* */
-
-size_t ndpi_bitmap_serialize(ndpi_bitmap* b, char **buf) {
- const roaring_bitmap_t *r = (const roaring_bitmap_t *)b;
- size_t s = roaring_bitmap_size_in_bytes(r);
-
- *buf = (char*)ndpi_malloc(s);
-
- if((*buf) == NULL) return(0);
-
- return(roaring_bitmap_serialize(r, *buf));
-
-}
-
-/* ******************************************* */
-
-ndpi_bitmap* ndpi_bitmap_deserialize(char *buf) {
- return((ndpi_bitmap*)roaring_bitmap_deserialize(buf));
-}