Merge pull request #2740 from Manakuremati/master

Add dns.cache.rrtype

Author: DL6ER

src/api/docs/content/specs/config.yaml

@@ -252,6 +252,8 @@ components:
                       type: integer
                     upstreamBlockedTTL:
                       type: integer
+                    rrtype:
+                      type: string
                 revServers:
                   type: array
                   items:
@@ -706,6 +708,7 @@ components:
               size: 10000
               optimizer: 3600
               upstreamBlockedTTL: 86400
+              rrtype: "ANY"
             revServers:
               - "true,192.168.0.0/24,192.168.0.1,lan"
             blocking:

src/config/config.c

@@ -635,6 +635,14 @@ void initConfig(struct config *conf)
 	conf->dns.cache.upstreamBlockedTTL.d.ui = 86400;
 	conf->dns.cache.upstreamBlockedTTL.c = validate_stub; // Only type-based checking
 
+	conf->dns.cache.rrtype.k = "dns.cache.rrtype";
+	conf->dns.cache.rrtype.h = "This is dnsmasq's --cache-rr option, which allows you to define which DNS record types should be cached by PiHole. This option can take a comma-separated list of RR-types as input. The default value ANY caches all record types.";
+	conf->dns.cache.rrtype.a = cJSON_CreateStringReference("Valid DNS record types in the following form: <rrtype>[,<rrtype>...]");
+	conf->dns.cache.rrtype.t = CONF_STRING;
+	conf->dns.cache.rrtype.f = FLAG_RESTART_FTL;
+	conf->dns.cache.rrtype.d.s = (char*)"ANY";
+	conf->dns.cache.rrtype.c = validate_stub; // Only type-based checking
+	
 	// sub-struct dns.blocking
 	conf->dns.blocking.active.k = "dns.blocking.active";
 	conf->dns.blocking.active.h = "Should FTL block queries?";

src/config/config.h

@@ -160,6 +160,7 @@ struct config {
 			struct conf_item size;
 			struct conf_item optimizer;
 			struct conf_item upstreamBlockedTTL;
+			struct conf_item rrtype;
 		} cache;
 		struct {
 			struct conf_item active;

src/config/dnsmasq_config.c

@@ -775,9 +775,9 @@ bool __attribute__((nonnull(1,3))) write_dnsmasq_config(struct config *conf, boo
 		fputs("\n", pihole_conf);
 	}
 
-	// Add option for caching all DNS records
+	// Add option for which DNS records types to cache
 	fputs("# Cache all DNS records\n", pihole_conf);
-	fputs("cache-rr=ANY\n", pihole_conf);
+	fprintf(pihole_conf, "cache-rr=%s\n\n", conf->dns.cache.rrtype.v.s);
 	fputs("\n", pihole_conf);
 
 	// Add option for PCAP file recording

test/pihole.toml

@@ -355,6 +355,14 @@
     #     blocked queries
     upstreamBlockedTTL = 86400
 
+    # This is dnsmasq's --cache-rr option, which allows you to define which DNS record
+    # types should be cached by PiHole. This option can take a comma-separated list of
+    # RR-types as input. The default value ANY caches all record types.
+    #
+    # Allowed values are:
+    #     Valid DNS record types in the following form: <rrtype>[,<rrtype>...]
+    rrtype = "ANY"
+
   [dns.blocking]
     # Should FTL block queries?
     #
@@ -1679,7 +1687,7 @@
   all = true ### CHANGED, default = false
 
 # Configuration statistics:
-# 162 total entries out of which 108 entries are default
+# 163 total entries out of which 109 entries are default
 # --> 54 entries are modified
 # 3 entries are forced through environment:
 #   - misc.nice