Add EDE 15 from upstream => Blocked detection + new query type repres…

…enting this Signed-off-by: DL6ER <[email protected]>
pi-hole · Aug 21, 2024 · 6760ca6 · 6760ca6
1 parent 6650e23
commit 6760ca6
Show file tree

Hide file tree

Showing 11 changed files with 274 additions and 91 deletions.
diff --git a/src/api/docs/content/specs/stats.yaml b/src/api/docs/content/specs/stats.yaml
@@ -482,6 +482,10 @@ components:
                   type: integer
                   description: Type CACHE_STALE queries
                   example: 0
+                EXTERNAL_BLOCKED_EDE15:
+                  type: integer
+                  description: Type EXTERNAL_BLOCKED_EDE15 queries
+                  example: 0
             replies:
               type: object
               description: Number of individual replies

diff --git a/src/api/queries.c b/src/api/queries.c
@@ -1015,6 +1015,7 @@ int api_queries(struct ftl_conn *api)
 			case QUERY_EXTERNAL_BLOCKED_IP:
 			case QUERY_EXTERNAL_BLOCKED_NULL:
 			case QUERY_EXTERNAL_BLOCKED_NXRA:
+			case QUERY_EXTERNAL_BLOCKED_EDE15:
 			case QUERY_RETRIED:
 			case QUERY_RETRIED_DNSSEC:
 			case QUERY_IN_PROGRESS:

diff --git a/src/database/query-table.c b/src/database/query-table.c
@@ -1256,9 +1256,10 @@ void DB_read_queries(void)
 			case QUERY_GRAVITY: // Blocked by gravity
 			case QUERY_REGEX: // Blocked by regex denylist
 			case QUERY_DENYLIST: // Blocked by exact denylist
-			case QUERY_EXTERNAL_BLOCKED_IP: // Blocked by external provider
-			case QUERY_EXTERNAL_BLOCKED_NULL: // Blocked by external provider
-			case QUERY_EXTERNAL_BLOCKED_NXRA: // Blocked by external provider
+			case QUERY_EXTERNAL_BLOCKED_IP: // Blocked upstream
+			case QUERY_EXTERNAL_BLOCKED_NULL: // Blocked upstream
+			case QUERY_EXTERNAL_BLOCKED_NXRA: // Blocked upstream
+			case QUERY_EXTERNAL_BLOCKED_EDE15: // Blocked upstream
 			case QUERY_GRAVITY_CNAME: // Blocked by gravity (inside CNAME path)
 			case QUERY_REGEX_CNAME: // Blocked by regex denylist (inside CNAME path)
 			case QUERY_DENYLIST_CNAME: // Blocked by exact denylist (inside CNAME path)

diff --git a/src/datastructure.c b/src/datastructure.c
@@ -700,6 +700,8 @@ const char * __attribute__ ((const)) get_query_status_str(const enum query_statu
 			return "SPECIAL_DOMAIN";
 		case QUERY_CACHE_STALE:
 			return "CACHE_STALE";
+		case QUERY_EXTERNAL_BLOCKED_EDE15:
+			return "EXTERNAL_BLOCKED_EDE15";
 		case QUERY_STATUS_MAX:
 		default:
 			return "INVALID";
@@ -872,6 +874,7 @@ bool __attribute__ ((const)) is_blocked(const enum query_status status)
 		case QUERY_EXTERNAL_BLOCKED_IP:
 		case QUERY_EXTERNAL_BLOCKED_NULL:
 		case QUERY_EXTERNAL_BLOCKED_NXRA:
+		case QUERY_EXTERNAL_BLOCKED_EDE15:
 		case QUERY_GRAVITY_CNAME:
 		case QUERY_REGEX_CNAME:
 		case QUERY_DENYLIST_CNAME:
@@ -969,6 +972,7 @@ bool __attribute__ ((const)) is_cached(const enum query_status status)
 		case QUERY_EXTERNAL_BLOCKED_IP:
 		case QUERY_EXTERNAL_BLOCKED_NULL:
 		case QUERY_EXTERNAL_BLOCKED_NXRA:
+		case QUERY_EXTERNAL_BLOCKED_EDE15:
 		case QUERY_GRAVITY_CNAME:
 		case QUERY_REGEX_CNAME:
 		case QUERY_DENYLIST_CNAME:
@@ -1019,6 +1023,8 @@ static const char* __attribute__ ((const)) query_status_str(const enum query_sta
 			return "SPECIAL_DOMAIN";
 		case QUERY_CACHE_STALE:
 			return "CACHE_STALE";
+		case QUERY_EXTERNAL_BLOCKED_EDE15:
+			return "EXTERNAL_BLOCKED_EDE15";
 		case QUERY_STATUS_MAX:
 			return NULL;
 	}