diff options
| author | Luca Deri <deri@ntop.org> | 2021-10-16 12:01:47 +0200 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2021-10-16 12:02:04 +0200 |
| commit | b08b6a6a280ffd8122532c3f743d706ce0fe9cef (patch) | |
| tree | 72d094002d6d02d0d2ffa29e8bd076e099a38bfa | |
| parent | c2e7fbce942fc7f8e8f878945151b4b285017927 (diff) | |
Fixed cleartext protocol assignment
| -rw-r--r-- | src/lib/ndpi_utils.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c index 18e9f424a..652107a19 100644 --- a/src/lib/ndpi_utils.c +++ b/src/lib/ndpi_utils.c @@ -2262,9 +2262,13 @@ 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)) { - return((ndpi_str->proto_defaults[proto.master_protocol].isClearTextProto - && ndpi_str->proto_defaults[proto.app_protocol].isClearTextProto) ? 0 : 1); + 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); + else + return((ndpi_str->proto_defaults[proto.master_protocol].isClearTextProto + && ndpi_str->proto_defaults[proto.app_protocol].isClearTextProto) ? 0 : 1); } else return(0); } |