aboutsummaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorIvan Nardi <12729895+IvanNardi@users.noreply.github.com>2021-10-25 15:04:04 +0200
committerGitHub <noreply@github.com>2021-10-25 15:04:04 +0200
commitb6d9536533cad12e6c04edccead26aaea693b0e1 (patch)
tree3c8d73a05b15544781eb10cd7332d12315d3ca1c /src/lib
parent333a6d60e8ab9c9cd5479a058f8b0c482c5cd2d9 (diff)
Fixed cleartext protocol assignment (#1357)
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ndpi_utils.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c
index c8206a066..602e4c145 100644
--- a/src/lib/ndpi_utils.c
+++ b/src/lib/ndpi_utils.c
@@ -2261,7 +2261,9 @@ u_int8_t ndpi_is_valid_protoId(u_int16_t protoId) {
u_int8_t ndpi_is_encrypted_proto(struct ndpi_detection_module_struct *ndpi_str,
ndpi_protocol proto) {
- if(ndpi_is_valid_protoId(proto.master_protocol) && ndpi_is_valid_protoId(proto.app_protocol)) {
+ if(proto.master_protocol == NDPI_PROTOCOL_UNKNOWN && ndpi_is_valid_protoId(proto.app_protocol)) {
+ return(!ndpi_str->proto_defaults[proto.app_protocol].isClearTextProto);
+ } else if(ndpi_is_valid_protoId(proto.master_protocol) && ndpi_is_valid_protoId(proto.app_protocol)) {
if(ndpi_str->proto_defaults[proto.master_protocol].isClearTextProto
&& (!ndpi_str->proto_defaults[proto.app_protocol].isClearTextProto))
return(0);