From 90c81e845964b9bddf1a90e19bf4344a5bd10180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=E3=81=AE=E3=81=8B=E3=81=88=E3=81=A7?=
 <autmaple@protonmail.com>
Date: Fri, 2 Apr 2021 16:57:31 +0800
Subject: [PATCH] fix: fix clientIP config

---
 infra/conf/dns.go      | 11 +++++++++++
 infra/conf/dns_test.go |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/infra/conf/dns.go b/infra/conf/dns.go
index b1c98825..15402a23 100644
--- a/infra/conf/dns.go
+++ b/infra/conf/dns.go
@@ -12,6 +12,7 @@ import (
 
 type NameServerConfig struct {
 	Address   *Address
+	ClientIP  *Address
 	Port      uint16
 	Domains   []string
 	ExpectIPs StringList
@@ -26,12 +27,14 @@ func (c *NameServerConfig) UnmarshalJSON(data []byte) error {
 
 	var advanced struct {
 		Address   *Address   `json:"address"`
+		ClientIP  *Address   `json:"clientIp"`
 		Port      uint16     `json:"port"`
 		Domains   []string   `json:"domains"`
 		ExpectIPs StringList `json:"expectIps"`
 	}
 	if err := json.Unmarshal(data, &advanced); err == nil {
 		c.Address = advanced.Address
+		c.ClientIP = advanced.ClientIP
 		c.Port = advanced.Port
 		c.Domains = advanced.Domains
 		c.ExpectIPs = advanced.ExpectIPs
@@ -87,12 +90,20 @@ func (c *NameServerConfig) Build() (*dns.NameServer, error) {
 		return nil, newError("invalid IP rule: ", c.ExpectIPs).Base(err)
 	}
 
+	var myClientIP []byte
+	if c.ClientIP != nil {
+		if !c.ClientIP.Family().IsIP() {
+			return nil, newError("not an IP address:", c.ClientIP.String())
+		}
+		myClientIP = []byte(c.ClientIP.IP())
+	}
 	return &dns.NameServer{
 		Address: &net.Endpoint{
 			Network: net.Network_UDP,
 			Address: c.Address.Build(),
 			Port:    uint32(c.Port),
 		},
+		ClientIp:          myClientIP,
 		PrioritizedDomain: domains,
 		Geoip:             geoipList,
 		OriginalRules:     originalRules,
diff --git a/infra/conf/dns_test.go b/infra/conf/dns_test.go
index 00284fbb..c3025726 100644
--- a/infra/conf/dns_test.go
+++ b/infra/conf/dns_test.go
@@ -67,6 +67,7 @@ func TestDNSConfigParsing(t *testing.T) {
 			Input: `{
 				"servers": [{
 					"address": "8.8.8.8",
+					"clientIp": "10.0.0.1",
 					"port": 5353,
 					"domains": ["domain:example.com"]
 				}],
@@ -94,6 +95,7 @@ func TestDNSConfigParsing(t *testing.T) {
 							Network: net.Network_UDP,
 							Port:    5353,
 						},
+						ClientIp: []byte{10, 0, 0, 1},
 						PrioritizedDomain: []*dns.NameServer_PriorityDomain{
 							{
 								Type:   dns.DomainMatchingType_Subdomain,