3 files changed, 1 insertions, 51 deletions
diff --git a/example/ndpiReader.c b/example/ndpiReader.c
index 925592de9..72e27baa7 100644
--- a/example/ndpiReader.c
+++ b/example/ndpiReader.c
@@ -4034,7 +4034,7 @@ static void ndpi_process_packet(u_char *args,
     trailer->master_protocol = htons(p.master_protocol), trailer->app_protocol = htons(p.app_protocol);
     ndpi_protocol2name(ndpi_thread_info[thread_id].workflow->ndpi_struct, p, trailer->name, sizeof(trailer->name));
     crc = (uint32_t*)&extcap_buf[h.caplen+sizeof(struct ndpi_packet_trailer)];
-    *crc = ethernet_crc32((const void*)extcap_buf, h.caplen+sizeof(struct ndpi_packet_trailer));
+    *crc = ndpi_crc32((const void*)extcap_buf, h.caplen+sizeof(struct ndpi_packet_trailer));
     h.caplen += delta, h.len += delta;
 
 #ifdef DEBUG_TRACE
diff --git a/example/reader_util.c b/example/reader_util.c
index 62fa3046a..b1f72c650 100644
--- a/example/reader_util.c
+++ b/example/reader_util.c
@@ -2253,55 +2253,6 @@ struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow,
 			   flow_risk));
 }
 
-/* ********************************************************** */
-/*       http://home.thep.lu.se/~bjorn/crc/crc32_fast.c       */
-/* ********************************************************** */
-
-static uint32_t crc32_for_byte(uint32_t r) {
-  int j;
-  for(j = 0; j < 8; ++j)
-    r = ((r & 1) ? 0 : (uint32_t)0xEDB88320L) ^ r >> 1;
-  return r ^ (uint32_t)0xFF000000L;
-}
-
-/* Any unsigned integer type with at least 32 bits may be used as
- * accumulator type for fast crc32-calulation, but unsigned long is
- * probably the optimal choice for most systems. */
-typedef unsigned long accum_t;
-
-static void init_tables(uint32_t* table, uint32_t* wtable) {
-  size_t i, j, k, w;
-  for(i = 0; i < 0x100; ++i)
-    table[i] = crc32_for_byte(i);
-  for(k = 0; k < sizeof(accum_t); ++k)
-    for(i = 0; i < 0x100; ++i) {
-      for(j = w = 0; j < sizeof(accum_t); ++j)
-	w = table[(uint8_t)(j == k? w ^ i: w)] ^ w >> 8;
-      wtable[(k << 8) + i] = w ^ (k? wtable[0]: 0);
-    }
-}
-
-static void __crc32(const void* data, size_t n_bytes, uint32_t* crc) {
-  static uint32_t table[0x100], wtable[0x100*sizeof(accum_t)];
-  size_t n_accum = n_bytes/sizeof(accum_t);
-  size_t i, j;
-  if(!*table)
-    init_tables(table, wtable);
-  for(i = 0; i < n_accum; ++i) {
-    accum_t a = *crc ^ ((accum_t*)data)[i];
-    for(j = *crc = 0; j < sizeof(accum_t); ++j)
-      *crc ^= wtable[(j << 8) + (uint8_t)(a >> 8*j)];
-  }
-  for(i = n_accum*sizeof(accum_t); i < n_bytes; ++i)
-    *crc = table[(uint8_t)*crc ^ ((uint8_t*)data)[i]] ^ *crc >> 8;
-}
-
-u_int32_t ethernet_crc32(const void* data, size_t n_bytes) {
-  u_int32_t crc = 0;
-  __crc32(data, n_bytes, &crc);
-  return crc;
-}
-
 /* *********************************************** */
 
 #ifdef USE_DPDK
diff --git a/example/reader_util.h b/example/reader_util.h
index b8b249afe..6f8e8ba20 100644
--- a/example/reader_util.h
+++ b/example/reader_util.h
@@ -392,7 +392,6 @@ int ndpi_is_datalink_supported(int datalink_type);
 /* compare two nodes in workflow */
 int ndpi_workflow_node_cmp(const void *a, const void *b);
 void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_flow_info *flow);
-u_int32_t ethernet_crc32(const void* data, size_t n_bytes);
 void ndpi_flow_info_free_data(struct ndpi_flow_info *flow);
 void ndpi_flow_info_freer(void *node);
 const char* print_cipher_id(u_int32_t cipher);