Added report on score cli/srv breakdown

1 files changed, 9 insertions, 24 deletions

diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 2596b03eb..8220ea71e 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -6551,36 +6551,21 @@ void ndpi_dump_protocols(struct ndpi_detection_module_struct *ndpi_str) {
 void ndpi_dump_risks_score() {
   u_int i;
 
-  printf("%3s %-48s %-8s %s\n",
-	 "Id", "Risk", "Severity", "Score");
+  printf("%3s %-48s %-8s %s %-8s %-8s\n",
+	 "Id", "Risk", "Severity", "Score", "CliScore", "SrvScore");
 	 
   for(i = 1; i < NDPI_MAX_RISK; i++) {
     ndpi_risk_enum r = (ndpi_risk_enum)i;
+    ndpi_risk risk   = 2 << (r-1);
     ndpi_risk_severity s = ndpi_risk2severity(r)->severity;
-    u_int16_t score = 0;
-    
-    switch(s) {
-    case NDPI_RISK_LOW:
-      score = NDPI_SCORE_RISK_LOW;
-      break;
-      
-    case NDPI_RISK_MEDIUM:
-      score = NDPI_SCORE_RISK_MEDIUM;
-      break;
-      
-    case NDPI_RISK_HIGH:
-      score = NDPI_SCORE_RISK_HIGH;
-      break;
-      
-    case NDPI_RISK_SEVERE:
-      score = NDPI_SCORE_RISK_SEVERE;
-      break;
-    }
-        
-    printf("%3d %-48s %-8s %u\n",
+    u_int16_t client_score, server_score;
+    u_int16_t score = ndpi_risk2score(risk, &client_score, &server_score);
+
+    printf("%3d %-48s %-8s %-8u %-8u %-8u\n",
 	   i, ndpi_risk2str(r),
 	   ndpi_severity2str(s),
-	   score);
+	   score,
+	   client_score, server_score);
   }
 }