Cosmetic fixes
This commit is contained in:
+257
-246
@@ -243,38 +243,38 @@ u_int8_t ndpi_ips_match(u_int32_t src, u_int32_t dst,
|
||||
* based upon ascii character sequences.
|
||||
*/
|
||||
static const u_char charmap[] = {
|
||||
'\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
|
||||
'\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
|
||||
'\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
|
||||
'\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
|
||||
'\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
|
||||
'\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
|
||||
'\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
|
||||
'\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
|
||||
'\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
|
||||
'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
|
||||
'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
|
||||
'\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
|
||||
'\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
|
||||
'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
|
||||
'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
|
||||
'\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
|
||||
'\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
|
||||
'\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
|
||||
'\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
|
||||
'\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
|
||||
'\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
|
||||
'\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
|
||||
'\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
|
||||
'\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
|
||||
'\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
|
||||
'\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
|
||||
'\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
|
||||
'\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
|
||||
'\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
|
||||
'\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
|
||||
'\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
|
||||
'\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
|
||||
'\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
|
||||
'\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
|
||||
'\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
|
||||
'\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
|
||||
'\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
|
||||
'\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
|
||||
'\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
|
||||
'\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
|
||||
'\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
|
||||
'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
|
||||
'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
|
||||
'\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
|
||||
'\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
|
||||
'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
|
||||
'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
|
||||
'\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
|
||||
'\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
|
||||
'\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
|
||||
'\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
|
||||
'\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
|
||||
'\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
|
||||
'\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
|
||||
'\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
|
||||
'\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
|
||||
'\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
|
||||
'\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
|
||||
'\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
|
||||
'\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
|
||||
'\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
|
||||
'\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
|
||||
'\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
|
||||
'\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
|
||||
};
|
||||
|
||||
int strcasecmp(const char *s1, const char *s2) {
|
||||
@@ -1442,7 +1442,7 @@ static int ndpi_url_decode(const char *s, char *out) {
|
||||
c = *s++;
|
||||
if(c == '+') c = ' ';
|
||||
else if(c == '%' && (!ishex(*s++)||
|
||||
!ishex(*s++)||
|
||||
!ishex(*s++)||
|
||||
!sscanf(s - 2, "%2x", (unsigned int*)&c)))
|
||||
return(-1);
|
||||
|
||||
@@ -1485,22 +1485,22 @@ static void ndpi_compile_rce_regex() {
|
||||
&pcreErrorOffset, NULL);
|
||||
|
||||
if(comp_rx[i]->compiled == NULL) {
|
||||
#ifdef DEBUG
|
||||
#ifdef DEBUG
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: Could not compile '%s': %s\n", rce_regex[i],
|
||||
pcreErrorStr);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
comp_rx[i]->optimized = pcre_study(comp_rx[i]->compiled, 0, &pcreErrorStr);
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef DEBUG
|
||||
if(pcreErrorStr != NULL) {
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: Could not study '%s': %s\n", rce_regex[i],
|
||||
pcreErrorStr);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
free((void *)pcreErrorStr);
|
||||
@@ -1525,33 +1525,33 @@ static int ndpi_is_rce_injection(char* query) {
|
||||
if (pcreExecRet >= 0) {
|
||||
return 1;
|
||||
}
|
||||
#ifdef DEBUG
|
||||
#ifdef DEBUG
|
||||
else {
|
||||
switch(pcreExecRet) {
|
||||
case PCRE_ERROR_NOMATCH:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: String did not match the pattern\n");
|
||||
break;
|
||||
case PCRE_ERROR_NULL:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: Something was null\n");
|
||||
break;
|
||||
case PCRE_ERROR_BADOPTION:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: A bad option was passed\n");
|
||||
break;
|
||||
case PCRE_ERROR_BADMAGIC:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: Magic number bad (compiled re corrupt?)\n");
|
||||
break;
|
||||
case PCRE_ERROR_UNKNOWN_NODE:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: Something kooky in the compiled re\n");
|
||||
break;
|
||||
case PCRE_ERROR_NOMEMORY:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: Ran out of memory\n");
|
||||
break;
|
||||
default:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: Unknown error\n");
|
||||
break;
|
||||
case PCRE_ERROR_NOMATCH:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: String did not match the pattern\n");
|
||||
break;
|
||||
case PCRE_ERROR_NULL:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: Something was null\n");
|
||||
break;
|
||||
case PCRE_ERROR_BADOPTION:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: A bad option was passed\n");
|
||||
break;
|
||||
case PCRE_ERROR_BADMAGIC:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: Magic number bad (compiled re corrupt?)\n");
|
||||
break;
|
||||
case PCRE_ERROR_UNKNOWN_NODE:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: Something kooky in the compiled re\n");
|
||||
break;
|
||||
case PCRE_ERROR_NOMEMORY:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: Ran out of memory\n");
|
||||
break;
|
||||
default:
|
||||
NDPI_LOG_ERR(ndpi_str, "ERROR: Unknown error\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
size_t ushlen = sizeof(ush_commands) / sizeof(ush_commands[0]);
|
||||
@@ -1793,33 +1793,33 @@ ndpi_http_method ndpi_http_str2method(const char* method, u_int16_t method_len)
|
||||
|
||||
#define ARRAYSZ_255 255
|
||||
void printRawData(const uint8_t *ptr, size_t len) {
|
||||
uint8_t *p=(uint8_t*)ptr;
|
||||
DBGINFO("ptr=%p, len=%llu", ptr, (unsigned long long)len)
|
||||
if (p && len>0) {
|
||||
size_t ctLines=0,i,j;
|
||||
char line1[ARRAYSZ_255]={0}, line2[ARRAYSZ_255]={0}, temp[ARRAYSZ_255];
|
||||
snprintf(line1,sizeof(line1),"\t%05X",(unsigned int)(16*ctLines));
|
||||
for (i=0; i<len; i++) {
|
||||
uint8_t *p=(uint8_t*)ptr;
|
||||
DBGINFO("ptr=%p, len=%llu", ptr, (unsigned long long)len)
|
||||
if (p && len>0) {
|
||||
size_t ctLines=0,i,j;
|
||||
char line1[ARRAYSZ_255]={0}, line2[ARRAYSZ_255]={0}, temp[ARRAYSZ_255];
|
||||
snprintf(line1,sizeof(line1),"\t%05X",(unsigned int)(16*ctLines));
|
||||
for (i=0; i<len; i++) {
|
||||
|
||||
if (i>0 && i%16==0) {
|
||||
printf("%s\t%s\n", line1,line2);
|
||||
ctLines++;
|
||||
snprintf(line1,ARRAYSZ_255,"\t%05X",(unsigned int)(16*ctLines));
|
||||
snprintf(line2,ARRAYSZ_255,"%s","");
|
||||
}
|
||||
snprintf(temp,ARRAYSZ_255," %02X", (uint8_t)*p);
|
||||
strncat(line1, temp, 3);
|
||||
snprintf(temp,ARRAYSZ_255,"%c", (isprint(*p)? *(p):'.'));
|
||||
strncat(line2, temp, 1);
|
||||
p++;
|
||||
}
|
||||
uint8_t exv= i%16;
|
||||
for(j=exv;exv>0 && j<16;j++) {
|
||||
strncat(line1, " ", 3);
|
||||
}
|
||||
printf("%s\t%s\n", line1,line2);
|
||||
}
|
||||
return;
|
||||
if (i>0 && i%16==0) {
|
||||
printf("%s\t%s\n", line1,line2);
|
||||
ctLines++;
|
||||
snprintf(line1,ARRAYSZ_255,"\t%05X",(unsigned int)(16*ctLines));
|
||||
snprintf(line2,ARRAYSZ_255,"%s","");
|
||||
}
|
||||
snprintf(temp,ARRAYSZ_255," %02X", (uint8_t)*p);
|
||||
strncat(line1, temp, 3);
|
||||
snprintf(temp,ARRAYSZ_255,"%c", (isprint(*p)? *(p):'.'));
|
||||
strncat(line2, temp, 1);
|
||||
p++;
|
||||
}
|
||||
uint8_t exv= i%16;
|
||||
for(j=exv;exv>0 && j<16;j++) {
|
||||
strncat(line1, " ", 3);
|
||||
}
|
||||
printf("%s\t%s\n", line1,line2);
|
||||
}
|
||||
return;
|
||||
}
|
||||
/* ******************************************************************** */
|
||||
|
||||
@@ -1827,139 +1827,142 @@ void printRawData(const uint8_t *ptr, size_t len) {
|
||||
|
||||
void ins_sort_array(sorter_index_item_t arr[], int len) {
|
||||
DBGINFO("sorting no. %u items", (unsigned)len)
|
||||
for (int i=1; i<len; i++) {
|
||||
for (int j=i; j>0 && arr[j].sort_value<arr[j-1].sort_value; j--) {
|
||||
sorter_index_item_t temp = arr[j];
|
||||
arr[j] = arr[j-1];
|
||||
arr[j-1] = temp;
|
||||
for (int i=1; i<len; i++) {
|
||||
for (int j=i; j>0 && arr[j].sort_value<arr[j-1].sort_value; j--) {
|
||||
sorter_index_item_t temp = arr[j];
|
||||
arr[j] = arr[j-1];
|
||||
arr[j-1] = temp;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void shell_sort_array(sorter_index_item_t arr[], int n) {
|
||||
// Rearrange elements at each n/2, n/4, n/8, ... intervals
|
||||
DBGINFO("sorting no. %u items", (unsigned)n)
|
||||
for (int interval = n / 2; interval > 0; interval /= 2) {
|
||||
for (int i = interval; i < n; i += 1) {
|
||||
sorter_index_item_t temp = arr[i];
|
||||
int j;
|
||||
for (j = i; j >= interval && arr[j - interval].sort_value > temp.sort_value; j -= interval) {
|
||||
arr[j] = arr[j - interval];
|
||||
DBGTRACER("exchanged item no. %d (%d) with: %d (%d)", j, arr[j].sort_value, j-interval, temp.sort_value)
|
||||
for (int interval = n / 2; interval > 0; interval /= 2) {
|
||||
for (int i = interval; i < n; i += 1) {
|
||||
sorter_index_item_t temp = arr[i];
|
||||
int j;
|
||||
for (j = i; j >= interval && arr[j - interval].sort_value > temp.sort_value; j -= interval) {
|
||||
arr[j] = arr[j - interval];
|
||||
DBGTRACER("exchanged item no. %d (%d) with: %d (%d)", j, arr[j].sort_value, j-interval, temp.sort_value)
|
||||
}
|
||||
DBGTRACER("item no. %d value: %d", j, temp.sort_value)
|
||||
arr[j] = temp;
|
||||
}
|
||||
DBGTRACER("item no. %d value: %d", j, temp.sort_value)
|
||||
arr[j] = temp;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* ******************************************************************** */
|
||||
#ifdef FRAG_MAN
|
||||
|
||||
void free_fragment(fragments_wrapper_t *frag)
|
||||
{ /*
|
||||
void free_fragment(fragments_wrapper_t *frag) {
|
||||
/*
|
||||
*
|
||||
typedef struct fragment_wrapper {
|
||||
uint16_t id;
|
||||
uint8_t l4_protocol;
|
||||
uint8_t ct_frag;
|
||||
uint16_t id;
|
||||
uint8_t l4_protocol;
|
||||
uint8_t ct_frag;
|
||||
#ifdef NDPI_DETECTION_SUPPORT_IPV6
|
||||
char *flow_label; // IP6
|
||||
char *flow_label; // IP6
|
||||
#endif
|
||||
fragment_t **fragments_list;
|
||||
fragment_t **fragments_list;
|
||||
} fragments_wrapper_t;
|
||||
*
|
||||
* */
|
||||
if (frag) {
|
||||
DBGTRACER("(frag:%p) freeing fragments list -> %p",frag, frag->fragments_list)
|
||||
if (frag) {
|
||||
DBGTRACER("(frag:%p) freeing fragments list -> %p",frag, frag->fragments_list)
|
||||
if (frag->fragments_list) {
|
||||
DBGTRACER("fragments are %u.",frag->ct_frag)
|
||||
for ( int y=0;y<frag->ct_frag;y++) {
|
||||
if (frag->fragments_list[y]) {
|
||||
if (frag->fragments_list[y]->data) {
|
||||
DBGPOINTER("freeing fragment item %d -> %p",y, frag->fragments_list[y])
|
||||
ndpi_free(frag->fragments_list[y]->data);
|
||||
}
|
||||
ndpi_free(frag->fragments_list[y]);
|
||||
}
|
||||
}
|
||||
for ( int y=0;y<frag->ct_frag;y++) {
|
||||
if (frag->fragments_list[y]) {
|
||||
if (frag->fragments_list[y]->data) {
|
||||
DBGPOINTER("freeing fragment item %d -> %p",y, frag->fragments_list[y])
|
||||
ndpi_free(frag->fragments_list[y]->data);
|
||||
}
|
||||
ndpi_free(frag->fragments_list[y]);
|
||||
}
|
||||
}
|
||||
DBGPOINTER("freeing fragments list -> %p",frag->fragments_list)
|
||||
ndpi_free(frag->fragments_list);
|
||||
ndpi_free(frag->fragments_list);
|
||||
frag->fragments_list= NULL;
|
||||
}
|
||||
//reset counter and initial offset
|
||||
frag->ct_frag=0;
|
||||
frag->initial_offset=0;
|
||||
}
|
||||
//reset counter and initial offset
|
||||
frag->ct_frag=0;
|
||||
frag->initial_offset=0;
|
||||
}
|
||||
}
|
||||
|
||||
uint8_t add_segment_to_buffer( struct ndpi_flow_struct *flow, struct ndpi_tcphdr const * tcph, uint32_t new_waited_seq) {
|
||||
/* ******************************************************************** */
|
||||
|
||||
uint8_t add_segment_to_buffer( struct ndpi_flow_struct *flow, struct ndpi_tcphdr const * tcph, uint32_t new_expected_seq) {
|
||||
DBGINFO("[flow:%p], dir: %d, seq:%u, ack:%u, len: %ubytes",flow,flow->packet.packet_direction, ntohl(tcph->seq), ntohl(tcph->ack_seq), flow->packet.payload_packet_len)
|
||||
|
||||
if (flow->tcp_segments_management) {
|
||||
fragments_wrapper_t *fragW= &flow->tcp_segments_list[flow->packet.packet_direction];
|
||||
DBGTRACER("tcp segments management enabled (list container: %p)",fragW)
|
||||
if (flow->tcp_segments_management) {
|
||||
fragments_wrapper_t *fragW= &flow->tcp_segments_list[flow->packet.packet_direction];
|
||||
DBGTRACER("tcp segments management enabled (list container: %p)",fragW)
|
||||
|
||||
if ( fragW->ct_frag == 0 ) {
|
||||
if (fragW->fragments_list) { free_fragment(fragW); }
|
||||
// initialize the offset with the first fragment seq number
|
||||
fragW->initial_offset= new_waited_seq;
|
||||
DBGTRACER("initialized initial_offset: %u)",fragW->initial_offset)
|
||||
}
|
||||
if ( fragW->ct_frag == 0 ) {
|
||||
if (fragW->fragments_list) { free_fragment(fragW); }
|
||||
// initialize the offset with the first fragment seq number
|
||||
fragW->initial_offset= new_expected_seq;
|
||||
DBGTRACER("initialized initial_offset: %u)",fragW->initial_offset)
|
||||
}
|
||||
|
||||
if ( flow->packet.payload_packet_len>0 ) {
|
||||
// allocate memory for pointer
|
||||
size_t new_len= (1+fragW->ct_frag) * sizeof(fragment_t*);
|
||||
DBGTRACER("actual fragment list ct=%d, new size: %llu", fragW->ct_frag, (unsigned long long)new_len)
|
||||
//fragW->fragments_list= realloc(fragW->fragments_list,new_len);
|
||||
fragW->fragments_list= ndpi_realloc(fragW->fragments_list,(fragW->ct_frag * sizeof(fragment_t*)),new_len);
|
||||
DBGPOINTER("fragments_list initialized for item no. %u, list->%p i-esimo->%p", fragW->ct_frag, fragW->fragments_list, fragW->fragments_list[fragW->ct_frag])
|
||||
if ( !fragW->fragments_list ) {
|
||||
flow->tcp_segments_management= 0;
|
||||
fprintf(stderr, "[%8u] Not enough memory for new fragment \n", flow->packet_counter);
|
||||
return 0;
|
||||
}
|
||||
if ( flow->packet.payload_packet_len>0 ) {
|
||||
// allocate memory for pointer
|
||||
size_t new_len= (1+fragW->ct_frag) * sizeof(fragment_t*);
|
||||
DBGTRACER("actual fragment list ct=%d, new size: %llu", fragW->ct_frag, (unsigned long long)new_len)
|
||||
//fragW->fragments_list= realloc(fragW->fragments_list,new_len);
|
||||
fragW->fragments_list= ndpi_realloc(fragW->fragments_list,(fragW->ct_frag * sizeof(fragment_t*)),new_len);
|
||||
DBGPOINTER("fragments_list initialized for item no. %u, list->%p i-esimo->%p", fragW->ct_frag, fragW->fragments_list, fragW->fragments_list[fragW->ct_frag])
|
||||
if ( !fragW->fragments_list ) {
|
||||
flow->tcp_segments_management= 0;
|
||||
fprintf(stderr, "[%8u] Not enough memory for new fragment \n", flow->packet_counter);
|
||||
return 0;
|
||||
}
|
||||
|
||||
// allocate memory for item
|
||||
fragment_t *new_frag= (fragment_t*)ndpi_calloc(1, sizeof(fragment_t));
|
||||
DBGPOINTER("new_frag=> %p",new_frag)
|
||||
if ( !new_frag ) {
|
||||
flow->tcp_segments_management= 0;
|
||||
free_fragment(fragW);
|
||||
fprintf(stderr, "[%8u] Not enough memory for new fragment \n", flow->packet_counter);
|
||||
return 0;
|
||||
}
|
||||
// allocate memory for item
|
||||
fragment_t *new_frag= (fragment_t*)ndpi_calloc(1, sizeof(fragment_t));
|
||||
DBGPOINTER("new_frag=> %p",new_frag)
|
||||
if ( !new_frag ) {
|
||||
flow->tcp_segments_management= 0;
|
||||
free_fragment(fragW);
|
||||
fprintf(stderr, "[%8u] Not enough memory for new fragment \n", flow->packet_counter);
|
||||
return 0;
|
||||
}
|
||||
|
||||
// fill item with offsetm len and data fragment/segment
|
||||
new_frag->offset= ( 0xffffffff & ntohl(tcph->seq)) - fragW->initial_offset;
|
||||
DBGTRACER("offset calculation: seq %u, init: %u, offset result: %u", ntohl(tcph->seq), fragW->initial_offset, new_frag->offset)
|
||||
new_frag->len= flow->packet.payload_packet_len;
|
||||
// fill item with offsetm len and data fragment/segment
|
||||
new_frag->offset= ( 0xffffffff & ntohl(tcph->seq)) - fragW->initial_offset;
|
||||
DBGTRACER("offset calculation: seq %u, init: %u, offset result: %u", ntohl(tcph->seq), fragW->initial_offset, new_frag->offset)
|
||||
new_frag->len= flow->packet.payload_packet_len;
|
||||
|
||||
new_frag->data= (void*)ndpi_calloc(new_frag->len, sizeof(char));
|
||||
DBGPOINTER("new_frag->data=> %p",new_frag->data)
|
||||
if ( new_frag->data ) {
|
||||
memcpy(new_frag->data,flow->packet.payload,new_frag->len);
|
||||
fragW->fragments_list[fragW->ct_frag++]= new_frag;
|
||||
} else {
|
||||
flow->tcp_segments_management= 0;
|
||||
ndpi_free(new_frag);
|
||||
free_fragment(fragW);
|
||||
fprintf(stderr, "[%8u] Not enough memory for new fragment data \n", flow->packet_counter);
|
||||
return 0;
|
||||
}
|
||||
new_frag->data= (void*)ndpi_calloc(new_frag->len, sizeof(char));
|
||||
DBGPOINTER("new_frag->data=> %p",new_frag->data)
|
||||
if ( new_frag->data ) {
|
||||
memcpy(new_frag->data,flow->packet.payload,new_frag->len);
|
||||
fragW->fragments_list[fragW->ct_frag++]= new_frag;
|
||||
} else {
|
||||
flow->tcp_segments_management= 0;
|
||||
ndpi_free(new_frag);
|
||||
free_fragment(fragW);
|
||||
fprintf(stderr, "[%8u] Not enough memory for new fragment data \n", flow->packet_counter);
|
||||
return 0;
|
||||
}
|
||||
|
||||
DBGINFO("item no. %u: %p->%p [off:%u, len:%u, data:%p]", fragW->ct_frag, fragW->fragments_list, *fragW->fragments_list, (unsigned int) new_frag->offset, (unsigned int)new_frag->len, new_frag->data)
|
||||
return fragW->ct_frag;
|
||||
DBGINFO("item no. %u: %p->%p [off:%u, len:%u, data:%p]", fragW->ct_frag, fragW->fragments_list, *fragW->fragments_list, (unsigned int) new_frag->offset, (unsigned int)new_frag->len, new_frag->data)
|
||||
return fragW->ct_frag;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
//TODO: manage partial retrasmission
|
||||
|
||||
uint32_t reassembly_fragment(struct ndpi_flow_struct *const flow, struct ndpi_tcphdr const * tcph, uint8_t **ret_buffer, size_t *len_buffer)
|
||||
{
|
||||
DBGTRACER("tcph:%p, ret_buffer:%p, len_buffer:%u",tcph,ret_buffer,len_buffer)
|
||||
/* ******************************************************************** */
|
||||
|
||||
uint32_t reassembly_fragment(struct ndpi_flow_struct *const flow, struct ndpi_tcphdr const * tcph, uint8_t **ret_buffer, size_t *len_buffer) {
|
||||
DBGTRACER("tcph:%p, ret_buffer:%p, len_buffer:%u",tcph,ret_buffer,len_buffer);
|
||||
|
||||
// reassemble the fragments...
|
||||
uint32_t ret_value=0;
|
||||
@@ -1968,15 +1971,16 @@ uint32_t reassembly_fragment(struct ndpi_flow_struct *const flow, struct ndpi_tc
|
||||
fragments_wrapper_t *fragW= &flow->tcp_segments_list[flow->packet.packet_direction];
|
||||
|
||||
// phase 1: calculate the size and fill the indexes array
|
||||
DBGINFO("phase 1: init sorter, calculate the size of buffer to reassemble: %u items", fragW->ct_frag)
|
||||
DBGINFO("phase 1: init sorter, calculate the size of buffer to reassemble: %u items", fragW->ct_frag);
|
||||
sorter_index_item_t *sorted_indexes= ndpi_calloc( fragW->ct_frag, sizeof(sorter_index_item_t) );
|
||||
|
||||
DBGPOINTER("sorted_indexes=> %p",sorted_indexes)
|
||||
if ( !sorted_indexes ) {
|
||||
if ( !sorted_indexes ) {
|
||||
fprintf(stderr, "[%8u] Not enough memory to sort the %u segments \n",
|
||||
flow->packet_counter, fragW->ct_frag);
|
||||
flow->packet_counter, fragW->ct_frag);
|
||||
free_fragment(fragW);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i=0; i<fragW->ct_frag; i++) {
|
||||
fragment_t *item = (fragment_t*)fragW->fragments_list[i];
|
||||
@@ -1984,11 +1988,11 @@ uint32_t reassembly_fragment(struct ndpi_flow_struct *const flow, struct ndpi_tc
|
||||
sorted_indexes[i].sort_value= item->offset;
|
||||
sorted_indexes[i].item_index= i;
|
||||
tot_length += item->len;
|
||||
DBGTRACER("segment (%d): len:%lu, offset: %u => partial buffer len: %lu", i, (long unsigned int)item->len, (unsigned int)item->offset, (long unsigned int)tot_length)
|
||||
DBGTRACER("segment (%d): len:%lu, offset: %u => partial buffer len: %lu", i, (long unsigned int)item->len, (unsigned int)item->offset, (long unsigned int)tot_length);
|
||||
}
|
||||
|
||||
// phase 2: sorts fragments and check fragments and sequences
|
||||
DBGINFO(" phase 2 sorting %d segments and checking",fragW->ct_frag)
|
||||
DBGINFO(" phase 2 sorting %d segments and checking",fragW->ct_frag);
|
||||
if (fragW->ct_frag>1) shell_sort_array(sorted_indexes, fragW->ct_frag);
|
||||
|
||||
// checks
|
||||
@@ -1996,19 +2000,19 @@ uint32_t reassembly_fragment(struct ndpi_flow_struct *const flow, struct ndpi_tc
|
||||
fragment_t *item = (fragment_t*)fragW->fragments_list[ sorted_indexes[i].item_index ];
|
||||
|
||||
// 1: no segment offset can be > tot_length
|
||||
DBGTRACER("checking %d/%d element: offset=%lu vs t_length=%lu",i,sorted_indexes[i].item_index,(unsigned long)item->offset,(unsigned long)tot_length)
|
||||
DBGTRACER("checking %d/%d element: offset=%lu vs t_length=%lu",i,sorted_indexes[i].item_index,(unsigned long)item->offset,(unsigned long)tot_length);
|
||||
if ( (item->offset) > (uint32_t)tot_length ) {
|
||||
// update the last index of elements to elaborate
|
||||
DBGINFO("stop processing at %d/%d element: len= %u; offset= %u",i,sorted_indexes[i].item_index,(unsigned)length,(unsigned)item->offset)
|
||||
|
||||
tot_length= length;
|
||||
tot_length= length;
|
||||
ret_value= (fragW->initial_offset)+(item->offset); // set the first offset to wait for the next segment
|
||||
break;
|
||||
}
|
||||
// 2: for every len(buffer) must exists a offset fragment
|
||||
else if ( (item->offset) != (uint32_t)length ) {
|
||||
// update the last index of elements to elaborate
|
||||
DBGINFO("checking %d/%d element: stop processing! len: %u; n_offset: %u", i,sorted_indexes[i].item_index,(unsigned)length,(unsigned)item->offset)
|
||||
DBGINFO("checking %d/%d element: stop processing! len: %u; n_offset: %u", i,sorted_indexes[i].item_index,(unsigned)length,(unsigned)item->offset);
|
||||
|
||||
tot_length= length;
|
||||
ret_value= (fragW->initial_offset)+(item->offset); // set the first offset to wait for the next segment
|
||||
@@ -2022,9 +2026,11 @@ uint32_t reassembly_fragment(struct ndpi_flow_struct *const flow, struct ndpi_tc
|
||||
last_item++; // index to number aligment
|
||||
|
||||
// phase 3: allocate memory and fill the buffer
|
||||
DBGINFO("phase 3: allocate memory for %u items and fill the buffer tot: %lu", last_item, (unsigned long int)tot_length)
|
||||
DBGINFO("phase 3: allocate memory for %u items and fill the buffer tot: %lu", last_item, (unsigned long int)tot_length);
|
||||
|
||||
uint8_t *buffer= ndpi_calloc(tot_length, sizeof(uint8_t));
|
||||
DBGPOINTER("buffer (len:%lu)=> %p",(unsigned long)tot_length,buffer)
|
||||
|
||||
DBGPOINTER("buffer (len:%lu)=> %p",(unsigned long)tot_length,buffer);
|
||||
if ( !buffer ) {
|
||||
fprintf(stderr, "[%8u] Not enough memory for buffer for %u segments \n", flow->packet_counter,last_item);
|
||||
free_fragment(fragW);
|
||||
@@ -2033,27 +2039,27 @@ uint32_t reassembly_fragment(struct ndpi_flow_struct *const flow, struct ndpi_tc
|
||||
}
|
||||
|
||||
for (uint i=0; i<last_item; i++) {
|
||||
fragment_t *item = (fragment_t*)fragW->fragments_list[sorted_indexes[i].item_index];
|
||||
fragment_t *item = (fragment_t*)fragW->fragments_list[sorted_indexes[i].item_index];
|
||||
|
||||
//uint_t blk_sz= (tot_length - item->offset) > item->len ) ? item->len : tot_length-item->offset
|
||||
DBGINFO("copying data item no:%u of len: %lu to buffer: %p (offset:%lu)", sorted_indexes[i].item_index, (unsigned long int)item->len, buffer, (unsigned long int)item->offset)
|
||||
memcpy((void*)(buffer+item->offset),item->data, item->len);
|
||||
//uint_t blk_sz= (tot_length - item->offset) > item->len ) ? item->len : tot_length-item->offset
|
||||
DBGINFO("copying data item no:%u of len: %lu to buffer: %p (offset:%lu)", sorted_indexes[i].item_index, (unsigned long int)item->len, buffer, (unsigned long int)item->offset);
|
||||
memcpy((void*)(buffer+item->offset),item->data, item->len);
|
||||
|
||||
// free memory item
|
||||
ndpi_free(item->data);
|
||||
item->data=NULL;
|
||||
ndpi_free(item);
|
||||
fragW->fragments_list[sorted_indexes[i].item_index]=NULL;
|
||||
// free memory item
|
||||
ndpi_free(item->data);
|
||||
item->data=NULL;
|
||||
ndpi_free(item);
|
||||
fragW->fragments_list[sorted_indexes[i].item_index]=NULL;
|
||||
}
|
||||
|
||||
if ( last_item==fragW->ct_frag ) {
|
||||
DBGTRACER("all processed: free all memory!")
|
||||
DBGTRACER("all processed: free all memory!");
|
||||
free_fragment(fragW);
|
||||
} else {
|
||||
// phase 4: re-organize the other segments, updating the list
|
||||
fragment_t **fragW_old_list = fragW->fragments_list;
|
||||
fragW->fragments_list= ndpi_calloc((fragW->ct_frag-last_item), sizeof(struct fragment_t*));
|
||||
DBGPOINTER("old segments list: %p, new segments list: %p.",fragW_old_list,fragW->fragments_list)
|
||||
DBGPOINTER("old segments list: %p, new segments list: %p.",fragW_old_list, fragW->fragments_list);
|
||||
if (!fragW->fragments_list) {
|
||||
fprintf(stderr, "[%8u] Not enough memory for new segments list \n", flow->packet_counter);
|
||||
free_fragment(fragW);
|
||||
@@ -2066,108 +2072,113 @@ uint32_t reassembly_fragment(struct ndpi_flow_struct *const flow, struct ndpi_tc
|
||||
for (uint i=last_item; i<fragW->ct_frag; i++) {
|
||||
fragW->fragments_list[i-last_item] = (fragment_t*)fragW_old_list[sorted_indexes[i].item_index];
|
||||
fragW->fragments_list[i-last_item]->offset-= tot_length;
|
||||
DBGTRACER("moving the item (%p), index %u - to position %u of new segments list; new offset: %u.", fragW->fragments_list[i-last_item], sorted_indexes[i].item_index, i-last_item, fragW->fragments_list[i-last_item]->offset )
|
||||
DBGTRACER("moving the item (%p), index %u - to position %u of new segments list; new offset: %u.", fragW->fragments_list[i-last_item], sorted_indexes[i].item_index, i-last_item, fragW->fragments_list[i-last_item]->offset );
|
||||
}
|
||||
|
||||
// update the fragments countes
|
||||
fragW->ct_frag-= last_item;
|
||||
fragW->initial_offset+= tot_length;
|
||||
DBGINFO("updated counter: %d and i_offset: %u.",(unsigned)fragW->ct_frag, (unsigned)fragW->initial_offset)
|
||||
DBGINFO("updated counter: %d and i_offset: %u.",(unsigned)fragW->ct_frag, (unsigned)fragW->initial_offset);
|
||||
|
||||
DBGPOINTER("freeing old segments list: %p ",fragW_old_list)
|
||||
ndpi_free(fragW_old_list);
|
||||
ndpi_free(fragW_old_list);
|
||||
}
|
||||
|
||||
if ( sorted_indexes) {
|
||||
DBGPOINTER("freeing sorter indexes: %p ",sorted_indexes)
|
||||
DBGPOINTER("freeing sorter indexes: %p ",sorted_indexes);
|
||||
ndpi_free(sorted_indexes);
|
||||
}
|
||||
|
||||
if(len_buffer != NULL) {
|
||||
*len_buffer = tot_length;
|
||||
*len_buffer = tot_length;
|
||||
}
|
||||
if(ret_buffer != NULL) {
|
||||
*ret_buffer = (u_int8_t *) buffer;
|
||||
flow->must_free[flow->packet.packet_direction]=1;
|
||||
DBGINFO("retrieved the buffer of segments (len:%lu) %p",*len_buffer,*ret_buffer)
|
||||
*ret_buffer = (u_int8_t *) buffer;
|
||||
flow->must_free[flow->packet.packet_direction]=1;
|
||||
DBGINFO("retrieved the buffer of segments (len:%lu) %p",*len_buffer,*ret_buffer);
|
||||
} else {
|
||||
DBGPOINTER("freeing buffer=> %p",buffer)
|
||||
DBGPOINTER("freeing buffer=> %p",buffer);
|
||||
ndpi_free(buffer);
|
||||
}
|
||||
DBGINFO("returning: %d",ret_value)
|
||||
DBGINFO("returning: %d",ret_value);
|
||||
return ret_value;
|
||||
}
|
||||
|
||||
uint8_t check_for_sequence( struct ndpi_flow_struct *flow, struct ndpi_tcphdr const * tcph)
|
||||
{
|
||||
/* ******************************************************************** */
|
||||
|
||||
uint8_t check_for_sequence( struct ndpi_flow_struct *flow, struct ndpi_tcphdr const * tcph) {
|
||||
uint8_t *ret_buffer=NULL;
|
||||
size_t len_buffer=0;
|
||||
|
||||
DBGINFO("## sorted flags: %d/%d ",flow->not_sorted[0],flow->not_sorted[1])
|
||||
DBGINFO("## sorted flags: %d/%d ",flow->not_sorted[0],flow->not_sorted[1]);
|
||||
if ( flow->next_tcp_seq_nr[flow->packet.packet_direction] ) {
|
||||
uint32_t *trigger;
|
||||
uint32_t *trigger, expected;
|
||||
uint8_t *not_sorted;
|
||||
|
||||
// use pointers to allow the modification
|
||||
not_sorted = &flow->not_sorted[flow->packet.packet_direction];
|
||||
trigger = &flow->trigger[flow->packet.packet_direction];
|
||||
|
||||
DBGTRACER("dir:%d, trg:%u, next:%u", flow->packet.packet_direction,*trigger, flow->next_tcp_seq_nr[flow->packet.packet_direction])
|
||||
DBGTRACER("dir:%d, trg:%u, next:%u", flow->packet.packet_direction,*trigger, flow->next_tcp_seq_nr[flow->packet.packet_direction]);
|
||||
|
||||
uint32_t waited= (*not_sorted && *trigger) ? ndpi_min(*trigger,flow->next_tcp_seq_nr[flow->packet.packet_direction]) : flow->next_tcp_seq_nr[flow->packet.packet_direction];
|
||||
if ( waited<(0xffffffff & ntohl(tcph->seq))) {
|
||||
expected = (*not_sorted && *trigger) ? ndpi_min(*trigger,flow->next_tcp_seq_nr[flow->packet.packet_direction]) : flow->next_tcp_seq_nr[flow->packet.packet_direction];
|
||||
|
||||
if ( expected< (0xffffffff & ntohl(tcph->seq))) {
|
||||
// segment not in order... almost 1 has been skipped! add this fragment to buffer
|
||||
DBGINFO("received a segment (seq:%u) over the waited (next:%u)", (0xffffffff & ntohl(tcph->seq)), waited)
|
||||
DBGINFO("received a segment (seq:%u) over the expected (next:%u)", (0xffffffff & ntohl(tcph->seq)), expected);
|
||||
|
||||
if ( add_segment_to_buffer(flow, tcph, waited) ) {
|
||||
DBGTRACER("segment (seq:%u) bufferized, waiting for (next:%u)", (0xffffffff & ntohl(tcph->seq)), waited)
|
||||
if ( add_segment_to_buffer(flow, tcph, expected) ) {
|
||||
DBGTRACER("segment (seq:%u) bufferized, waiting for (next:%u)", (0xffffffff & ntohl(tcph->seq)), expected);
|
||||
|
||||
// set flag a save the waited sequence number
|
||||
*not_sorted=1;
|
||||
*trigger= *trigger ? ndpi_min(flow->next_tcp_seq_nr[flow->packet.packet_direction],*trigger):flow->next_tcp_seq_nr[flow->packet.packet_direction];
|
||||
DBGINFO("set flag and trigger[%d]: %u",flow->packet.packet_direction,*trigger)
|
||||
// set flag a save the expected sequence number
|
||||
*not_sorted=1;
|
||||
*trigger= *trigger ? ndpi_min(flow->next_tcp_seq_nr[flow->packet.packet_direction],*trigger):flow->next_tcp_seq_nr[flow->packet.packet_direction];
|
||||
DBGINFO("set flag and trigger[%d]: %u",flow->packet.packet_direction,*trigger);
|
||||
}
|
||||
return 1;
|
||||
|
||||
} else if (waited>(0xffffffff & ntohl(tcph->seq))) {
|
||||
DBGINFO("received a segment (seq:%u) minus than the waited (next:%u): retransmission!!", (0xffffffff & ntohl(tcph->seq)), flow->next_tcp_seq_nr[flow->packet.packet_direction])
|
||||
} else if (expected>(0xffffffff & ntohl(tcph->seq))) {
|
||||
DBGINFO("received a segment (seq:%u) minus than the expected (next:%u): retransmission!!", (0xffffffff & ntohl(tcph->seq)), flow->next_tcp_seq_nr[flow->packet.packet_direction]);
|
||||
|
||||
flow->packet.tcp_retransmission = 1;
|
||||
|
||||
/* CHECK IF PARTIAL RETRY IS HAPPENING */
|
||||
if((flow->next_tcp_seq_nr[flow->packet.packet_direction] - ntohl(tcph->seq) <
|
||||
flow->packet.payload_packet_len)) {
|
||||
/* num_retried_bytes actual_payload_len hold info about the partial retry
|
||||
analyzer which require this info can make use of this info
|
||||
Other analyzer can use packet->payload_packet_len */
|
||||
flow->packet.num_retried_bytes = (u_int16_t)(flow->next_tcp_seq_nr[flow->packet.packet_direction] - ntohl(tcph->seq));
|
||||
flow->packet.actual_payload_len = flow->packet.payload_packet_len - flow->packet.num_retried_bytes;
|
||||
flow->next_tcp_seq_nr[flow->packet.packet_direction] = ntohl(tcph->seq) + flow->packet.payload_packet_len;
|
||||
DBGINFO("partial_bytes:%u",flow->packet.num_retried_bytes)
|
||||
flow->packet.payload_packet_len)) {
|
||||
/* num_retried_bytes actual_payload_len hold info about the partial retry
|
||||
analyzer which require this info can make use of this info
|
||||
Other analyzer can use packet->payload_packet_len */
|
||||
flow->packet.num_retried_bytes = (u_int16_t)(flow->next_tcp_seq_nr[flow->packet.packet_direction] - ntohl(tcph->seq));
|
||||
flow->packet.actual_payload_len = flow->packet.payload_packet_len - flow->packet.num_retried_bytes;
|
||||
flow->next_tcp_seq_nr[flow->packet.packet_direction] = ntohl(tcph->seq) + flow->packet.payload_packet_len;
|
||||
DBGINFO("partial_bytes:%u",flow->packet.num_retried_bytes);
|
||||
|
||||
//TODO: manage this!!
|
||||
//TODO: manage this!!
|
||||
}
|
||||
|
||||
} else {
|
||||
DBGTRACER("seq (%u) and waited (%u) matched! sorted flag: %d", (0xffffffff & ntohl(tcph->seq)), flow->next_tcp_seq_nr[flow->packet.packet_direction], *not_sorted)
|
||||
if ( *not_sorted ) {
|
||||
if ( add_segment_to_buffer(flow, tcph, 0) ) {
|
||||
*trigger= reassembly_fragment(flow,tcph,&ret_buffer,&len_buffer);
|
||||
*not_sorted=(*trigger>0);
|
||||
DBGTRACER("seq (%u) and expected (%u) matched! sorted flag: %d", (0xffffffff & ntohl(tcph->seq)), flow->next_tcp_seq_nr[flow->packet.packet_direction], *not_sorted);
|
||||
|
||||
if (len_buffer>0) {
|
||||
// the previous pointers must not be free, because managed in other part
|
||||
flow->packet.payload_packet_len= len_buffer;
|
||||
flow->packet.payload= ret_buffer;
|
||||
}
|
||||
}
|
||||
if ( *not_sorted ) {
|
||||
if ( add_segment_to_buffer(flow, tcph, 0) ) {
|
||||
*trigger= reassembly_fragment(flow,tcph,&ret_buffer,&len_buffer);
|
||||
*not_sorted=(*trigger>0);
|
||||
|
||||
if (len_buffer>0) {
|
||||
// the previous pointers must not be free, because managed in other part
|
||||
flow->packet.payload_packet_len= len_buffer;
|
||||
flow->packet.payload= ret_buffer;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif // FRAG_MAN
|
||||
|
||||
/* ******************************************************************** */
|
||||
|
||||
#define ROR64(x,r) (((x)>>(r))|((x)<<(64-(r))))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user