From c8f1112d4ec8b6c6590c79f8ae6ebfebd81aeda6 Mon Sep 17 00:00:00 2001
From: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon, 20 Nov 2023 15:28:08 +0300
Subject: [PATCH] Pull request home: fix client dns cache

Merge in DNS/adguard-home from custom-ups-cache-conf-fix to master

Squashed commit of the following:

commit 01a728e74b2e2e709c496794ca7ceb90703a02fc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Nov 20 11:48:01 2023 +0200

    home: fix client dns cache
---
 internal/home/clients.go     | 2 ++
 internal/home/clientshttp.go | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/internal/home/clients.go b/internal/home/clients.go
index d99bd632..6d3a6d23 100644
--- a/internal/home/clients.go
+++ b/internal/home/clients.go
@@ -294,6 +294,8 @@ func (clients *clientsContainer) forConfig() (objs []*clientObject) {
 			UseGlobalBlockedServices: !cli.UseOwnBlockedServices,
 			IgnoreQueryLog:           cli.IgnoreQueryLog,
 			IgnoreStatistics:         cli.IgnoreStatistics,
+			UpstreamsCacheEnabled:    cli.UpstreamsCacheEnabled,
+			UpstreamsCacheSize:       cli.UpstreamsCacheSize,
 		}
 
 		objs = append(objs, o)
diff --git a/internal/home/clientshttp.go b/internal/home/clientshttp.go
index 62a46e78..d6fc2fc9 100644
--- a/internal/home/clientshttp.go
+++ b/internal/home/clientshttp.go
@@ -174,6 +174,12 @@ func (clients *clientsContainer) jsonToClient(cj clientJSON, prev *Client) (c *C
 		return nil, fmt.Errorf("validating blocked services: %w", err)
 	}
 
+	var upsCacheEnabled bool
+	var upsCacheSize uint32
+	if prev != nil {
+		upsCacheEnabled, upsCacheSize = prev.UpstreamsCacheEnabled, prev.UpstreamsCacheSize
+	}
+
 	c = &Client{
 		safeSearchConf: safeSearchConf,
 
@@ -192,6 +198,8 @@ func (clients *clientsContainer) jsonToClient(cj clientJSON, prev *Client) (c *C
 		UseOwnBlockedServices: !cj.UseGlobalBlockedServices,
 		IgnoreQueryLog:        ignoreQueryLog,
 		IgnoreStatistics:      ignoreStatistics,
+		UpstreamsCacheEnabled: upsCacheEnabled,
+		UpstreamsCacheSize:    upsCacheSize,
 	}
 
 	if safeSearchConf.Enabled {