* Revert "Fix return value of ndpi_match_string_subprotocol() (#1230)"

This reverts commit 58665e93a9.

* Checking the return code after calling ndpi_match_string_subprotocol()

ndpi_api.h: Description of the returned error codes for
the ndpi_match_string_subprotocol() function.

If the ndpi_match_string_subprotocol() function returned an error,
then return NDPI_PROTOCOL_UNKNOWN.

http: The "Content-type" header is only checked if it is not empty.
This commit is contained in:
Vitaly Lavrov
2021-07-07 14:32:57 +02:00
committed by GitHub
parent 34d0718bca
commit 398ad8e5ff
3 changed files with 9 additions and 4 deletions
+3 -1
View File
@@ -425,7 +425,9 @@ extern "C" {
* @par string_to_match_len = the length of the string
* @par ret_match = completed returned match information
* @par is_host_match = value of the second field of struct ndpi_automa
* @return the ID of the matched subprotocol
* @return the ID of the matched subprotocol;
* -1 if automa is not finalized;
* -2 if automa==NULL or string_to_match==NULL or empty string_to_match
*
*/
int ndpi_match_string_subprotocol(struct ndpi_detection_module_struct *ndpi_struct,
+5 -2
View File
@@ -6682,7 +6682,7 @@ int ndpi_match_string_subprotocol(struct ndpi_detection_module_struct *ndpi_str,
rc = ndpi_match_string_common(((AC_AUTOMATA_t *) automa->ac_automa),
string_to_match,string_to_match_len, &ret_match->protocol_id,
&ret_match->protocol_category, &ret_match->protocol_breed);
return rc < 0 ? NDPI_PROTOCOL_UNKNOWN : ret_match->protocol_id;
return rc < 0 ? rc : ret_match->protocol_id;
}
/* **************************************** */
@@ -6709,12 +6709,15 @@ static u_int16_t ndpi_automa_match_string_subprotocol(struct ndpi_detection_modu
struct ndpi_flow_struct *flow, char *string_to_match,
u_int string_to_match_len, u_int16_t master_protocol_id,
ndpi_protocol_match_result *ret_match, u_int8_t is_host_match) {
uint16_t matching_protocol_id;
int matching_protocol_id;
struct ndpi_packet_struct *packet = &flow->packet;
matching_protocol_id =
ndpi_match_string_subprotocol(ndpi_str, string_to_match, string_to_match_len, ret_match, is_host_match);
if(matching_protocol_id < 0)
return NDPI_PROTOCOL_UNKNOWN;
#ifdef DEBUG
{
char m[256];
+1 -1
View File
@@ -656,7 +656,7 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
}
}
if(flow->http_detected) {
if(flow->http_detected && packet->content_line.ptr && *(char*)packet->content_line.ptr) {
ndpi_protocol_match_result ret_match;
ndpi_match_content_subprotocol(ndpi_struct, flow,