Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HTTP: remove useless code about XBOX #1958

Merged
merged 1 commit into from
May 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/lib/protocols/http.c
Original file line number Diff line number Diff line change
Expand Up @@ -1006,11 +1006,6 @@ static u_int16_t http_request_url_offset(struct ndpi_detection_module_struct *nd
return 0;
}

static void http_bitmask_exclude_other(struct ndpi_flow_struct *flow)
{
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_XBOX);
}

/* *********************************************************************************************** */

/* Trick to speed-up detection */
Expand Down Expand Up @@ -1243,7 +1238,6 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
}

NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
http_bitmask_exclude_other(flow);
return;
} else {
/* This check is required as RTSP is pretty similiar to HTTP (prevent false-positives). */
Expand Down Expand Up @@ -1347,7 +1341,6 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct

check_content_type_and_change_protocol(ndpi_struct, flow);
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
http_bitmask_exclude_other(flow);
} else if((flow->l4.tcp.http_stage == 1) || (flow->l4.tcp.http_stage == 2)) {
NDPI_LOG_DBG2(ndpi_struct, "HTTP stage %u: \n", flow->l4.tcp.http_stage);

Expand Down Expand Up @@ -1375,7 +1368,6 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
/* stop parsing here */
NDPI_LOG_DBG2(ndpi_struct, "exclude HTTP: PACKET DOES NOT HAVE A LINE STRUCTURE\n");
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
http_bitmask_exclude_other(flow);
return;
}
}
Expand Down Expand Up @@ -1432,7 +1424,6 @@ static void ndpi_search_http_tcp(struct ndpi_detection_module_struct *ndpi_struc
/* Break after 20 packets. */
if(flow->packet_counter > 20) {
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
http_bitmask_exclude_other(flow);
return;
}

Expand Down
1 change: 0 additions & 1 deletion src/lib/protocols/xbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ static void ndpi_search_xbox(struct ndpi_detection_module_struct *ndpi_struct, s

/*
* XBOX UDP DETCTION ONLY
* the xbox TCP detection is done by http code
* this detection also works for asymmetric xbox udp traffic
*/
if(packet->udp != NULL) {
Expand Down