diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ndpi_main.c | 4 | ||||
| -rw-r--r-- | src/lib/ndpi_utils.c | 12 | ||||
| -rw-r--r-- | src/lib/protocols/http.c | 16 |
3 files changed, 22 insertions, 10 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 942dfb46b..2748f65ad 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1508,8 +1508,8 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "WorldOfKungFu", NDPI_PROTOCOL_CATEGORY_GAME, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_RPC, - "RPC", NDPI_PROTOCOL_CATEGORY_RPC, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_MS_RPCH, + "MS-RPCH", NDPI_PROTOCOL_CATEGORY_RPC, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_NETFLOW, diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c index ff56bb61d..3c7fb3f25 100644 --- a/src/lib/ndpi_utils.c +++ b/src/lib/ndpi_utils.c @@ -2157,6 +2157,7 @@ const char* ndpi_http_method2str(ndpi_http_method m) { case NDPI_HTTP_METHOD_DELETE: return("DELETE"); case NDPI_HTTP_METHOD_TRACE: return("TRACE"); case NDPI_HTTP_METHOD_CONNECT: return("CONNECT"); + case NDPI_HTTP_METHOD_RPC_CONNECT: return("RPC_CONNECT"); case NDPI_HTTP_METHOD_RPC_IN_DATA: return("RPC_IN_DATA"); case NDPI_HTTP_METHOD_RPC_OUT_DATA: return("RPC_OUT_DATA"); } @@ -2188,10 +2189,13 @@ ndpi_http_method ndpi_http_str2method(const char* method, u_int16_t method_len) case 'C': return(NDPI_HTTP_METHOD_CONNECT); case 'R': if(method_len >= 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"; |