From 0b3d627185db10c690026a32828d76d4db52eeef Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Mon, 17 May 2021 22:39:07 +0200 Subject: Updated API for ndpi_risk2score() Added ndpi_get_upper_proto() API call --- src/lib/ndpi_main.c | 6 ++++++ src/lib/ndpi_utils.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 8776b2912..d517e7540 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -6183,6 +6183,12 @@ static int ndpi_init_packet_header(struct ndpi_detection_module_struct *ndpi_str return((proto.master_protocol != NDPI_PROTOCOL_UNKNOWN) ? proto.master_protocol : proto.app_protocol); } + /* ****************************************************** */ + + u_int16_t ndpi_get_upper_proto(ndpi_protocol proto) { + return((proto.app_protocol != NDPI_PROTOCOL_UNKNOWN) ? proto.app_protocol : proto.master_protocol); + } + /* ****************************************************** */ ndpi_protocol ndpi_guess_undetected_protocol(struct ndpi_detection_module_struct *ndpi_str, diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c index 642b5cac3..12140cdc9 100644 --- a/src/lib/ndpi_utils.c +++ b/src/lib/ndpi_utils.c @@ -1781,7 +1781,7 @@ ndpi_risk_severity ndpi_risk2severity(ndpi_risk_enum risk) { /* ******************************************************************** */ -u_int16_t ndpi_risk2score(ndpi_risk_enum risk) { +u_int16_t ndpi_risk2score(ndpi_risk risk) { u_int16_t score = 0; u_int32_t i; -- cgit v1.2.3