Reworked severities adding critical and emergency, thus shifting values down

2 files changed, 26 insertions, 6 deletions

diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
index c83280e0a..01338191b 100644
--- a/src/include/ndpi_typedefs.h
+++ b/src/include/ndpi_typedefs.h
@@ -152,14 +152,18 @@ typedef enum {
   NDPI_RISK_LOW,
   NDPI_RISK_MEDIUM,
   NDPI_RISK_HIGH,
-  NDPI_RISK_SEVERE
+  NDPI_RISK_SEVERE,
+  NDPI_RISK_CRITICAL,
+  NDPI_RISK_EMERGENCY
 } ndpi_risk_severity;
 
 typedef enum {
-  NDPI_SCORE_RISK_LOW    =  10,
-  NDPI_SCORE_RISK_MEDIUM =  50,
-  NDPI_SCORE_RISK_HIGH   = 100,
-  NDPI_SCORE_RISK_SEVERE = 250,
+  NDPI_SCORE_RISK_LOW       =  10,
+  NDPI_SCORE_RISK_MEDIUM    =  50,
+  NDPI_SCORE_RISK_HIGH      = 100,
+  NDPI_SCORE_RISK_SEVERE    = 150,
+  NDPI_SCORE_RISK_CRITICAL  = 200,
+  NDPI_SCORE_RISK_EMERGENCY = 250,
 } ndpi_risk_score;
 
 typedef enum {
@@ -167,7 +171,7 @@ typedef enum {
   CLIENT_LOW_RISK_PERCENTAGE  =  10, /* 90%  server risk */
   CLIENT_FAIR_RISK_PERCENTAGE =  50, /* 50%  server risk */
   CLIENT_HIGH_RISK_PERCENTAGE =  90, /* 10%  server risk */
-  CLIENT_FULL_RISK_PERCENTAGE = 100 /* 0%   server risk */
+  CLIENT_FULL_RISK_PERCENTAGE = 100  /* 0%   server risk */
 } risk_percentage;
 
 typedef enum {
diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c
index 3d56d5b24..ef212cc5f 100644
--- a/src/lib/ndpi_utils.c
+++ b/src/lib/ndpi_utils.c
@@ -2003,6 +2003,14 @@ const char* ndpi_severity2str(ndpi_risk_severity s) {
   case NDPI_RISK_SEVERE:
     return("Severe");
     break;
+
+  case NDPI_RISK_CRITICAL:
+    return("Critical");
+    break;
+    
+  case NDPI_RISK_EMERGENCY:
+    return("Emergency");
+    break;
   }
 
   return("");
@@ -2043,6 +2051,14 @@ u_int16_t ndpi_risk2score(ndpi_risk risk,
       case NDPI_RISK_SEVERE:
 	val = NDPI_SCORE_RISK_SEVERE;
 	break;
+
+      case NDPI_RISK_CRITICAL:
+	val = NDPI_SCORE_RISK_CRITICAL;
+	break;
+
+      case NDPI_RISK_EMERGENCY:
+	val = NDPI_SCORE_RISK_EMERGENCY;
+	break;
       }
 
       score += val;