From 6af93c09c86743fb9b819c7f01b6aa18f03fdf46 Mon Sep 17 00:00:00 2001 From: Vladimir Gavrilov <105977161+0xA50C1A1@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:56:26 +0300 Subject: Rename NDPI_PROTOCOL_RPC to NDPI_PROTOCOL_MS_RPCH (#2218) * Rename NDPI_PROTOCOL_RPC to NDPI_PROTOCOL_MS_RPCH * Add protocol description * Improve MS-RPCH detection --- doc/protocols.rst | 8 ++++++++ src/include/ndpi_protocol_ids.h | 2 +- src/include/ndpi_typedefs.h | 1 + src/lib/ndpi_main.c | 4 ++-- src/lib/ndpi_utils.c | 12 ++++++++---- src/lib/protocols/http.c | 16 ++++++++++++---- 6 files changed, 32 insertions(+), 11 deletions(-) diff --git a/doc/protocols.rst b/doc/protocols.rst index d36dd8126..5e165287b 100644 --- a/doc/protocols.rst +++ b/doc/protocols.rst @@ -23,6 +23,14 @@ TFTP is a very simple protocol used to transfer files. It is from this that its References: `RFC1350 `_ and `RFC2347 `_ and `RFC2349 `_ +.. _Proto 127: + +`NDPI_PROTOCOL_MS_RPCH` +==================== +A Remote Procedure Call protocol over HTTP from Microsoft. + +References: `Protocol Specs: = 11) { - if(strncmp(method, "RPC_IN_DATA", 11) == 0) - return(NDPI_HTTP_METHOD_RPC_IN_DATA); - else if(strncmp(method, "RPC_OUT_DATA", 11) == 0) - return(NDPI_HTTP_METHOD_RPC_OUT_DATA); + if(strncmp(method, "RPC_CONNECT", 11) == 0) { + return(NDPI_HTTP_METHOD_RPC_CONNECT); + } else if(strncmp(method, "RPC_IN_DATA", 11) == 0) { + return(NDPI_HTTP_METHOD_RPC_IN_DATA); + } else if(strncmp(method, "RPC_OUT_DATA", 11) == 0) { + return(NDPI_HTTP_METHOD_RPC_OUT_DATA); + } } break; } diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c index 2d894f345..fe9737d24 100644 --- a/src/lib/protocols/http.c +++ b/src/lib/protocols/http.c @@ -435,9 +435,10 @@ static void ndpi_http_parse_subprotocol(struct ndpi_detection_module_struct *ndp ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OCSP, master_protocol, NDPI_CONFIDENCE_DPI); } - if(flow->http.method == NDPI_HTTP_METHOD_RPC_IN_DATA || - flow->http.method == NDPI_HTTP_METHOD_RPC_OUT_DATA) { - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_RPC, master_protocol, NDPI_CONFIDENCE_DPI); + if((flow->http.method == NDPI_HTTP_METHOD_RPC_CONNECT) || + (flow->http.method == NDPI_HTTP_METHOD_RPC_IN_DATA) || + (flow->http.method == NDPI_HTTP_METHOD_RPC_OUT_DATA)) { + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MS_RPCH, master_protocol, NDPI_CONFIDENCE_DPI); } if(flow->detected_protocol_stack[1] == NDPI_PROTOCOL_UNKNOWN && @@ -526,6 +527,11 @@ static void ndpi_http_parse_subprotocol(struct ndpi_detection_module_struct *ndp ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OOKLA, master_protocol, NDPI_CONFIDENCE_DPI); ookla_add_to_cache(ndpi_struct, flow); } + + if ((flow->detected_protocol_stack[1] == NDPI_PROTOCOL_UNKNOWN) && + flow->http.user_agent && strstr(flow->http.user_agent, "MSRPC")) { + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MS_RPCH, master_protocol, NDPI_CONFIDENCE_DPI); + } } /* ************************************************************* */ @@ -1002,7 +1008,9 @@ static struct l_string { STATIC_STRING_L("CONNECT "), STATIC_STRING_L("PROPFIND "), STATIC_STRING_L("REPORT "), - STATIC_STRING_L("RPC_IN_DATA "), STATIC_STRING_L("RPC_OUT_DATA ") + STATIC_STRING_L("RPC_CONNECT "), + STATIC_STRING_L("RPC_IN_DATA "), + STATIC_STRING_L("RPC_OUT_DATA ") }; static const char *http_fs = "CDGHOPR"; -- cgit v1.2.3