Reworked human readeable string search in flows

Removed fragment manager code
This commit is contained in:
Luca Deri
2021-05-17 20:55:06 +02:00
parent 1ec621c85b
commit 43a8576efb
19 changed files with 93 additions and 770 deletions
-8
View File
@@ -1247,14 +1247,6 @@ struct ndpi_flow_struct {
*/
u_int32_t next_tcp_seq_nr[2];
#ifdef FRAG_MAN
/* tcp_segments lists */
u_int8_t tcp_segments_management:1;
u_int8_t not_sorted[2],must_free[2]; // 0: client->server and 1: server->client
uint32_t trigger[2]; // the seq waited number to start to reassembly
fragments_wrapper_t tcp_segments_list[2];
#endif // FRAG_MAN
// -----------------------------------------
u_int8_t max_extra_packets_to_check;
-57
View File
@@ -12,63 +12,6 @@
// #define NDPI_ENABLE_DEBUG_INFO_MESSAGES
// #define NDPI_ENABLE_DEBUG_TRACE_MESSAGES
#ifdef FRAG_MAN
#ifdef NDPI_ENABLE_DEBUG_POINTER_MESSAGES
#define DBGPOINTER(m, args...) MYDBG(m, ##args)
#else
#define DBGPOINTER(m, args...)
#endif
#ifdef NDPI_ENABLE_DEBUG_INFO_MESSAGES
#define DBGINFO(m, args...) MYDBG(m, ##args)
#else
#define DBGINFO(m, args...)
#endif
#ifdef NDPI_ENABLE_DEBUG_TRACE_MESSAGES
#define DBGTRACER(m, args...) MYDBG(m, ##args)
#else
#define DBGTRACER(m, args...)
#endif
// FRAGMENTATION
typedef struct {
uint32_t offset;
size_t len;
void *data;
} fragment_t;
typedef struct fragment_wrapper {
uint16_t id;
uint8_t l4_protocol;
uint32_t initial_offset;
uint16_t ct_frag;
char *flow_label; // IP6
char gap[200];
fragment_t **fragments_list;
} fragments_wrapper_t;
typedef struct fragments_buffer {
u_int8_t *buffer;
u_int buffer_len, buffer_used;
} fragments_buffer_t;
// SORTING
typedef struct {
int sort_value;
int item_index;
} sorter_index_item_t;
/* ***************************************************** */
extern void ins_sort_array(sorter_index_item_t arr[], int len);
extern void shell_sort_array(sorter_index_item_t arr[], int len);
extern void free_fragment(fragments_wrapper_t *frag);
#endif
extern void printRawData(const uint8_t *ptr, size_t len);
//extern uint8_t add_segment_to_buffer( struct ndpi_flow_struct *flow, struct ndpi_tcphdr const * tcph, uint32_t waited);
//extern uint8_t check_for_sequence( struct ndpi_flow_struct *flow, struct ndpi_tcphdr const * tcph);