-
Notifications
You must be signed in to change notification settings - Fork 887
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added MPEG-DASH dissector. Fixes #1223.
* Improved HTTP POST detection * Refactored subprotocol detection Signed-off-by: lns <matzeton@googlemail.com>
- Loading branch information
Showing
10 changed files
with
177 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| * mpegdash.c | ||
| * | ||
| * Copyright (C) 2022 - ntop.org | ||
| * | ||
| * This file is part of nDPI, an open source deep packet inspection | ||
| * library based on the OpenDPI and PACE technology by ipoque GmbH | ||
| * | ||
| * nDPI is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * nDPI is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with nDPI. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| #include "ndpi_protocol_ids.h" | ||
|
|
||
| #define NDPI_CURRENT_PROTO NDPI_PROTOCOL_MPEGDASH | ||
|
|
||
| #include "ndpi_api.h" | ||
|
|
||
|
|
||
| static void ndpi_int_mpegdash_add_connection(struct ndpi_detection_module_struct *ndpi_struct, | ||
| struct ndpi_flow_struct *flow) | ||
| { | ||
| ndpi_set_detected_protocol(ndpi_struct, flow, flow->guessed_host_protocol_id, | ||
| NDPI_PROTOCOL_MPEGDASH, NDPI_CONFIDENCE_DPI); | ||
| } | ||
|
|
||
| void ndpi_search_mpegdash_http(struct ndpi_detection_module_struct *ndpi_struct, | ||
| struct ndpi_flow_struct *flow) | ||
| { | ||
| struct ndpi_packet_struct *packet = &ndpi_struct->packet; | ||
|
|
||
| NDPI_LOG_DBG(ndpi_struct, "search MpegDash\n"); | ||
|
|
||
| if (flow->detected_protocol_stack[0] != NDPI_PROTOCOL_HTTP && | ||
| flow->detected_protocol_stack[1] != NDPI_PROTOCOL_HTTP) | ||
| { | ||
| if (flow->packet_counter > 2) | ||
| { | ||
| NDPI_EXCLUDE_PROTO(ndpi_struct, flow); | ||
| } | ||
| return; | ||
| } | ||
|
|
||
| if (packet->parsed_lines == 0) | ||
| { | ||
| ndpi_parse_packet_line_info(ndpi_struct, flow); | ||
| } | ||
|
|
||
| if (packet->parsed_lines > 0) | ||
| { | ||
| if (LINE_ENDS(packet->line[0], "RTSP/1.0") != 0 || | ||
| LINE_ENDS(packet->line[0], ".mp4 HTTP/1.1") != 0 || | ||
| LINE_ENDS(packet->line[0], ".m4s HTTP/1.1") != 0) | ||
| { | ||
| ndpi_int_mpegdash_add_connection(ndpi_struct, flow); | ||
| return; | ||
| } | ||
|
|
||
| for (size_t i = 0; i < packet->parsed_lines && packet->line[i].len > 0; ++i) | ||
| { | ||
| if ((LINE_STARTS(packet->line[i], "Content-Type:") != 0 && | ||
| LINE_ENDS(packet->line[i], "video/mp4") != 0) || | ||
| LINE_STARTS(packet->line[i], "DASH") != 0) | ||
| { | ||
| ndpi_int_mpegdash_add_connection(ndpi_struct, flow); | ||
| return; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| NDPI_EXCLUDE_PROTO(ndpi_struct, flow); | ||
| return; | ||
| } | ||
|
|
||
| void init_mpegdash_dissector(struct ndpi_detection_module_struct *ndpi_struct, | ||
| u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) | ||
| { | ||
| ndpi_set_bitmask_protocol_detection("MpegDash", ndpi_struct, detection_bitmask, *id, | ||
| NDPI_PROTOCOL_MPEGDASH, | ||
| ndpi_search_mpegdash_http, | ||
| NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, | ||
| SAVE_DETECTION_BITMASK_AS_UNKNOWN, | ||
| ADD_TO_DETECTION_BITMASK); | ||
| *id += 1; | ||
| } |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| Guessed flow protos: 0 | ||
|
|
||
| DPI Packets (TCP): 6 (2.00 pkts/flow) | ||
| Confidence DPI : 3 (flows) | ||
|
|
||
| AmazonAWS 9 2693 3 | ||
|
|
||
| 1 TCP 54.161.101.85:80 <-> 192.168.2.105:59144 [proto: 291.265/MpegDash.AmazonAWS][ClearText][Confidence: DPI][cat: Media/1][2 pkts/1649 bytes <-> 2 pkts/323 bytes][Goodput ratio: 92/59][0.01 sec][Risk: ** Known Proto on Non Std Port **][Risk Score: 50][PLAIN TEXT (OHTTP/1.1 200 OK)][Plen Bins: 0,0,33,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0] | ||
| 2 TCP 192.168.2.105:59142 <-> 54.161.101.85:80 [proto: 291.265/MpegDash.AmazonAWS][ClearText][Confidence: DPI][cat: Cloud/13][3 pkts/390 bytes <-> 1 pkts/74 bytes][Goodput ratio: 47/0][0.10 sec][Hostname/SNI: livesim.dashif.org][User-Agent: VLC/3.0.16 LibVLC/3.0.16][Risk: ** Known Proto on Non Std Port **][Risk Score: 50][PLAIN TEXT (IGET /livesim/sts)][Plen Bins: 0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] | ||
| 3 TCP 192.168.2.105:59146 -> 54.161.101.85:80 [proto: 291.265/MpegDash.AmazonAWS][ClearText][Confidence: DPI][cat: Cloud/13][1 pkts/257 bytes -> 0 pkts/0 bytes][Goodput ratio: 74/0][< 1 sec][Hostname/SNI: livesim.dashif.org][User-Agent: VLC/3.0.16 LibVLC/3.0.16][Risk: ** Known Proto on Non Std Port **][Risk Score: 50][PLAIN TEXT (GET /livesim/sts)][Plen Bins: 0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] |
Oops, something went wrong.