Fix for #560
This commit is contained in:
+6
-3
@@ -1883,9 +1883,9 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
|
||||
|
||||
/* ****************************************************** */
|
||||
|
||||
static int ac_match_handler(AC_MATCH_t *m, void *param) {
|
||||
static int ac_match_handler(AC_MATCH_t *m, AC_TEXT_t *txt, void *param) {
|
||||
int *matching_protocol_id = (int*)param;
|
||||
|
||||
int min_len = (txt->length < m->patterns->length) ? txt->length : m->patterns->length;
|
||||
/*
|
||||
Return 1 for stopping to the first match.
|
||||
We might consider searching for the more
|
||||
@@ -1893,7 +1893,10 @@ static int ac_match_handler(AC_MATCH_t *m, void *param) {
|
||||
*/
|
||||
*matching_protocol_id = m->patterns[0].rep.number;
|
||||
|
||||
return 0; /* 0 to continue searching, !0 to stop */
|
||||
if(strncmp(txt->astring, m->patterns->astring, min_len) == 0)
|
||||
return(1); /* If the pattern found matches the string at the beginning we stop here */
|
||||
else
|
||||
return 0; /* 0 to continue searching, !0 to stop */
|
||||
}
|
||||
|
||||
/* ******************************************************************** */
|
||||
|
||||
+1
-1
@@ -125,7 +125,7 @@ typedef enum
|
||||
* continue searching, otherwise it will return from ac_automata_search()
|
||||
* to your calling function.
|
||||
**/
|
||||
typedef int (*MATCH_CALBACK_f)(AC_MATCH_t *, void *);
|
||||
typedef int (*MATCH_CALBACK_f)(AC_MATCH_t *, AC_TEXT_t *, void *);
|
||||
|
||||
/* AC_PATTRN_MAX_LENGTH:
|
||||
* Maximum acceptable pattern length in AC_PATTERN_t.length
|
||||
|
||||
+2
-3
@@ -189,16 +189,15 @@ int ac_automata_search (AC_AUTOMATA_t * thiz, AC_TEXT_t * txt, void * param)
|
||||
position++;
|
||||
}
|
||||
|
||||
if(curr->final && next)
|
||||
if(curr->final && next) {
|
||||
/* We check 'next' to find out if we came here after a alphabet
|
||||
* transition or due to a fail. in second case we should not report
|
||||
* matching because it was reported in previous node */
|
||||
{
|
||||
thiz->match.position = position + thiz->base_position;
|
||||
thiz->match.match_num = curr->matched_patterns_num;
|
||||
thiz->match.patterns = curr->matched_patterns;
|
||||
/* we found a match! do call-back */
|
||||
if (thiz->match_callback(&thiz->match, param))
|
||||
if (thiz->match_callback(&thiz->match, txt, param))
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user